1

src/main/java/com/chinaitop/depot/business/controller/ReceiveNoticeController.java

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.business.controller;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -10,8 +9,6 @@ import javax.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -168,19 +165,19 @@ public class ReceiveNoticeController {
 	@RequestMapping(value="/scRkxzzbd", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value="增加性质转变单数据(入库)", notes = "")
 	@ApiImplicitParams({
-        @ApiImplicitParam(name = "hwbm", value = "货位编码", paramType = "query")
+        @ApiImplicitParam(name = "sptId", value = "市库对接的货位ID", paramType = "query")
     })
-	public Map<String, Object> scRkxzzbd(String hwbm) {
+	public Map<String, Object> scRkxzzbd(String sptId) {
 		Map<String, Object> map = new HashMap<>();
 		try {
-			map = receiveNoticeService.scRkxzzbd(hwbm);
-			systemOutsideDataService.addlogger("rkxzzbd", hwbm, map.toString());
+			map = receiveNoticeService.scRkxzzbd(sptId);
+			systemOutsideDataService.addlogger("rkxzzbd", sptId, map.toString());
 		} catch (Exception e) {
 			logger.error("性质转变单生成异常");
 			logger.error(e.getMessage());
 			map.put("status", "error");
 			map.put("msg", "接口异常，请联系管理员！");
-			systemOutsideDataService.addlogger("rkxzzbd", hwbm, map.toString());
+			systemOutsideDataService.addlogger("rkxzzbd", sptId, map.toString());
 		}
 		return map;
 	}

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -639,30 +639,28 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
 
 
+	@SuppressWarnings("unused")
 	@Override
-	public Map<String, Object> scRkxzzbd(String datas) {
+	public Map<String, Object> scRkxzzbd(String sptId) {
 		Map<String, Object> result_map = new HashMap<>();
 		
-		if (datas != null) {
-            // JSON字符串转对象
-            JSONObject jsonObject = JSONObject.parseObject(datas);
+		if (sptId != null) {
 
             BusinessNoticeReceive businessNoticeReceive = new BusinessNoticeReceive();
 
             businessNoticeReceive.setCrktype("1"); //默认值：入库
         	businessNoticeReceive.setYwtype("1");//默认值：竞价入库
 
-        	String hwbm = jsonObject.getString("hwbm");//货位国标编码
-            if (hwbm != null) {
+            if (sptId != null) {
             	//查询仓房ID、货位ID、orgId
-                Map<String, Object> basicMap = feignBasicService.getWareOrTankObj(hwbm);
-                logger.info("根据值"+hwbm+"获取到的货位数据如下：");
+                Map<String, Object> basicMap = feignBasicService.getWareOrTankObj(sptId);
+                logger.info("根据值"+sptId+"获取到的货位数据如下：");
                 logger.info(basicMap+"");
                 if ("0".equals(basicMap.get("houseId").toString()) 
                 		|| "0".equals(basicMap.get("warehouseId").toString()) 
                 		|| "0".equals(basicMap.get("orgId").toString())) {
 
-                	result_map.put("msg", "根据值"+hwbm+"未获取到对应仓房货位信息，请核对数据");
+                	result_map.put("msg", "根据值"+sptId+"未获取到对应仓房货位信息，请核对数据");
                 	result_map.put("status", "error");
                     return result_map;
                 } else {