Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1793,11 +1793,13 @@ public class AMScontroller{
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
-                                             @RequestParam(required = false) String con) {
+                                             @RequestParam(required = false) String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false)String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSteelTruckNoList(mapValue,apiId,pageNum,pageSize,con);
+        return amsFeign.getSteelTruckNoList(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
     }
 
     @ApiModelProperty(value = "展示未匹配承运商的车序号详情")
@@ -1812,11 +1814,13 @@ public class AMScontroller{
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
-                                             @RequestParam(required = false) String con) {
+                                             @RequestParam(required = false) String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false)String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getNoCarTruckNoList(mapValue,apiId,pageNum,pageSize,con);
+        return amsFeign.getNoCarTruckNoList(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
     }
 
     @ApiModelProperty(value = "展示已派车的车序号")
@@ -1961,4 +1965,10 @@ public class AMScontroller{
         return amsFeign.getCarrierTruckNoAndMaterialList(map);
     }
 
+    @ApiModelProperty(value = "关闭单个钢材物资分录")
+    @PostMapping("/closeSteelMaterialId")
+    public Map<String, Object> closeSteelMaterialId(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.closeSteelMaterialId(mapValue);
+    }
+
 }

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

@@ -1594,7 +1594,9 @@ public interface AmsFeign {
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
-                                      @RequestParam String con);
+                                      @RequestParam String con,
+                                      @RequestParam(required = false) String startTime,
+                                      @RequestParam(required = false)String endTime);
 
     @PostMapping(value = "/api/v1/ams/amssaleorders/getTruckNoMaterial")
     RESTfulResult getTruckNoMaterial(@RequestParam Integer saleOrderMaterialId);
@@ -1604,7 +1606,9 @@ public interface AmsFeign {
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
-                                      @RequestParam String con);
+                                      @RequestParam String con,
+                                      @RequestParam(required = false) String startTime,
+                                      @RequestParam(required = false)String endTime);
 
     @PostMapping(value = "/api/v1/ams/amssaleorders/getHaveCarTruckNoList")
     RESTfulResult getHaveCarTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1713,4 +1717,8 @@ public interface AmsFeign {
     // 展示下发给承运商的车序号和物资
     @PostMapping(value = "/api/v1/ams/amssaleorders/getCarrierTruckNoAndMaterialList")
     Map<String, Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String, Object> map);
+
+    // 展示下发给承运商的车序号和物资
+    @PostMapping(value = "/api/v1/ams/amssaleorders/closeSteelMaterialId")
+    Map<String, Object> closeSteelMaterialId(@RequestBody Map<String, Object> mapValue);
 }