das

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

@@ -1966,9 +1966,10 @@ public class TMSController extends BaseRESTfulController {
                                               String con,
                                               String  userId,
                                               String startTime,
-                                              String endTime
+                                              String endTime,
+                                              Integer orderType
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime,orderType);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -2683,4 +2684,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId){
         return tmsTruckFeign.getSteelReportDetailsBySmId(saleOrderMaterialId);
     }
+
+//    @ApiOperation(value="测试-新增计费详单")
+//    @PostMapping("/genernateInwardTime")
+//    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map){
+//        return  tmsTruckFeign.genernateInwardTime(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/TmsTruckFeign.java

@@ -350,7 +350,8 @@ public interface TmsTruckFeign {
                                               @RequestParam("con") String con,
                                               @RequestParam("userId") String userId,
                                               @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime);
+                                              @RequestParam("endTime") String endTime,
+                                              @RequestParam("orderType")Integer orderType);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -754,6 +755,9 @@ public interface TmsTruckFeign {
     @PostMapping("/api/v1/truckTms/statisticalReport/getSteelReportDetailsBySmId")
     Map<String, Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId);
 
+  /* @PostMapping("/api/v1/truckTms/tmstrucktimetaskresults/genernateInwardTime")
+    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map);*/
+
 }
 
 

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前端点击出库
      *