Tiroble 3 năm trước cách đây
mục cha
commit
9625a93d17

+ 4 - 1
src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -118,6 +118,9 @@ public class OTMSController {
         return tmsTruckFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
     }
 
-
+    @PostMapping("/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception{
+        return tmsTruckFeign.fullPathVisualizationByCarNumber(mapValue);
+    }
 
 }

+ 3 - 1
src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -989,8 +989,10 @@ public class WMSController extends BaseRESTfulController {
                                                         @RequestParam(value = "apiId") Integer apiId,
                                                         @RequestParam(value = "warehouseId") Integer warehouseId,
                                                         @RequestParam(value = "status") Integer status,
+                                                        @RequestParam(value = "startTime",required = false)String startTime,
+                                                        @RequestParam(value = "endTime",required = false)String endTime,
                                                         @RequestParam(value = "con") String con) {
-        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
+        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,startTime,endTime,con);
     }
 //    根据对应的入库实绩id修改入库状态为预留
     @PostMapping("/changeReserved")

+ 3 - 1
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -544,7 +545,8 @@ public interface TmsTruckFeign {
 
     @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
     Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
-
+    @PostMapping("/api/v1/truckTms/pathDisplay/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
     @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
     public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
     @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")

+ 2 - 0
src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -858,6 +858,8 @@ public interface WMSFeign {
                                                 @RequestParam(value = "apiId") Integer apiId,
                                                  @RequestParam(value = "warehouseId") Integer warehouseId,
                                                  @RequestParam(value = "status") Integer status,
+                                                 @RequestParam(value = "startTime",required = false)String startTime,
+                                                 @RequestParam(value = "endTime",required = false)String endTime,
                                                  @RequestParam(value = "con") String con);
 
 

+ 3 - 3
src/main/resources/application-dev.yml

@@ -20,9 +20,9 @@ openfeign:
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:localhost:8004}
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign: