Merge remote-tracking branch 'origin/master'

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

@@ -1068,11 +1068,12 @@ public class AMScontroller{
                                                 Integer apiId,
                                                 Integer planStatus,
                                                 String carrierId,
-                                                Integer planId) {
+                                                Integer planId,
+                                                String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
+        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId,con);
     }
 
     @ApiModelProperty(value = "展示运输计划")

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

@@ -651,11 +651,12 @@ public class OMSController {
                                                   Integer orderStatus,
                                                   String carrierId,
                                                   String con,
-                                                     Integer planEnableStatus) {
+                                                     Integer planEnableStatus,
+                                                     String userId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus);
+        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus,userId);
         return map;
     }
 

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

@@ -117,6 +117,18 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
 
+    @PostMapping("/wmspoutboundscanresults/copyWmspOutboundScanResult")
+    public Map<String, Object> copyWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.copyWmspOutboundScanResult(map);
+        return resTfulResult;
+    }
+
+    @PostMapping("/wmspoutboundscanresults/deleteWmspOutboundScanResult")
+    public Map<String, Object> deleteWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.deleteWmspOutboundScanResult(map);
+        return resTfulResult;
+    }
+
     @PostMapping("/wmspoutboundresults/outbountResultToSuccess")
     public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
         return wmsFeign.outbountResultToSuccess(resultId);

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

@@ -1142,7 +1142,8 @@ public interface AmsFeign {
                                          @RequestParam Integer apiId,
                                          @RequestParam Integer planStatus,
                                          @RequestParam String carrierId,
-                                         @RequestParam Integer planId);
+                                         @RequestParam Integer planId,
+                                         @RequestParam String con);
 
     @ApiOperation(value="展示运输计划下的运输订单")
     @ApiImplicitParams({

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

@@ -449,7 +449,8 @@ public interface OmsFeign {
                                            @RequestParam Integer orderStatus,
                                            @RequestParam String carrierId,
                                            @RequestParam String con,
-                                              @RequestParam Integer planEnableStatus);
+                                              @RequestParam Integer planEnableStatus,
+                                              @RequestParam String userId);
 
 
     @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")

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

@@ -120,6 +120,24 @@ public interface WMSFeign {
     @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
     Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
 
+    /**
+     * 复制新增出库扫描
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/copyWmspOutboundScanResult")
+    Map<String, Object> copyWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 删除出库扫描
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/deleteWmspOutboundScanResult")
+    Map<String, Object> deleteWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * 装卸工PDA前端点击出库
      *