'仓储'

src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -482,7 +482,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public String addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -490,15 +490,15 @@ public class WMSController extends BaseRESTfulController {
         /*
         获取入库垛位
          */
-        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
-        String stackNo = (String) map1.get("stackNo");
-        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
-        for (Map<String, Object> map : mapList
-        ) {
-            map.put("stackingId", stackId);
-        }
-        wmsFeign.insertInboundResult(mapList);
-        return stackNo;
+//        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+//        String stackNo = (String) map1.get("stackNo");
+//        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+//        for (Map<String, Object> map : mapList
+//        ) {
+//            map.put("stackingId", stackId);
+//        }
+
+        return wmsFeign.insertInboundResult(mapList);
     }
 
     /**
@@ -630,4 +630,17 @@ public class WMSController extends BaseRESTfulController {
     }
 
 
+    @PostMapping("/selectScanResultByIboundResultId")
+    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize) {
+        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
+    }
+
+
 }

src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -445,7 +445,7 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
-    String insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+    Map<String,Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 新增退库实绩，返回选择垛位
@@ -511,5 +511,11 @@ public interface WMSFeign {
      */
     @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
     Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
 }