提交

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

@@ -1231,11 +1231,12 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer orderType,
-                                               String con,
+                                               String startTime,
+                                               String endTime,
                                                String userId,
                                                String userIds
     ){
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, startTime,endTime,userId,userIds);
     }
 
     @ApiOperation(value="通过运输订单id查询物资信息")

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

@@ -227,7 +227,12 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
         return resTfulResult;
     }
-
+    //获取已下发的钢材的每个炉号的数量
+    @PostMapping("/getFurnaceNoAmount")
+    public Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getFurnaceNoAmount(map);
+        return resTfulResult;
+    }
     //更新状态
     @PostMapping("/updateStatus")
     public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -103,7 +103,8 @@ public interface TmsTruckFeign {
                                                      @RequestParam("pageNum")   Integer pageNum,
                                                      @RequestParam("pageSize")  Integer pageSize,
                                                      @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("con")       String con,
+                                                     @RequestParam("startTime") String startTime,
+                                                     @RequestParam("endTime") String endTime,
                                                      @RequestParam("userId")    String userId,
                                                      @RequestParam("userIds")   String userIds
     );

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

@@ -453,6 +453,9 @@ public interface WMSFeign {
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
     Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/wms/inboundResult/getFurnaceNoAmount")
+    Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * 库管员下发倒垛单
      *