2.14收发存

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

@@ -465,8 +465,10 @@ public class WMSController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
-                                        String con) {
-        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+                                        String con,
+                                        String startTime,
+                                        String endTime) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 
     /**
@@ -771,5 +773,9 @@ public class WMSController extends BaseRESTfulController {
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
         return wmsFeign.getNewDistribute(personnelWorkshopid);
     }
-
+    //收发存
+    @PostMapping("/addSendReceive")
+    public RESTfulResult addSendReceive(){
+        return  wmsFeign.addSendReceive();
+    }
 }

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

@@ -459,7 +459,9 @@ public interface WMSFeign {
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
-                                 @RequestParam String con);
+                                 @RequestParam String con,
+                                 @RequestParam String startTime,
+                                 @RequestParam String endTime);
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
@@ -630,5 +632,8 @@ public interface WMSFeign {
     //抢单
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
+    //收发存定时器
+    @PostMapping("/api/v1/wms/sendReceive/addSendReceive")
+    public RESTfulResult addSendReceive();
 }
 

src/main/resources/application-dev.yml

@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -32,7 +32,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:localhost:8014}
 
 server:
   port: 8019