x

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

@@ -1084,6 +1084,12 @@ public class AMScontroller extends BaseRESTfulController {
         return amsFeign.updateBindRequirement(params);
     }
 
+    @ApiOperation("进入物流调度派车证")
+    @PostMapping("/addDispatchCard")
+    public Map<String, Object> addDispatchCard(@RequestBody Map<String, Object> params) throws Exception {
+        return amsFeign.addDispatchCard(params);
+    }
+
     @ApiOperation("汽运传火运清洁能源")
     @PostMapping("/qjnyChange")
     public Map<String, Object> qjnyChange(@RequestBody Map<String, Object> params) throws Exception {

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

@@ -1203,4 +1203,15 @@ public class TMSController extends BaseRESTfulController {
         return success(tmsFeign.getDispatchRules(params));
     }
 
+
+    @ApiOperation(value = "查询站台装卸实绩")
+    @PostMapping("/getZtZxShiji")
+    public Map<String, Object> getZtZxShiji(@RequestBody(required = false) Map<String, Object> map,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
+        return tmsFeign.getZtZxShiji(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
 }

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

@@ -398,4 +398,8 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/qjnyChange")
     Map<String, Object> qjnyChange(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/addDispatchCard")
+    Map<String, Object> addDispatchCard(@RequestBody Map<String, Object> params);
+
 }

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

@@ -430,6 +430,12 @@ public interface TmsFeign {
 
     @PostMapping("/api/v1/tms/omstransorders/getDispatchRules")
     Map<String, Object> getDispatchRules(@RequestBody Map<String, Object> params);
+
+    @PostMapping("/api/v1/tms/omstransorders/getZtZxShiji")
+    Map<String, Object> getZtZxShiji(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize);
 }
 
 

src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ openfeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8086}
 #    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:
 #    url: ${RMSFEIGN_URL:172.16.90.202:8060}
       url: ${RMSFEIGN_URL:172.16.90.202:8060}

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -2283,6 +2283,7 @@
         FROM WMS_GRID_MATERIAL WGM
         LEFT JOIN RMS_OPERATION_POINT ROP ON ROP.OPERATION_POINT_ID = WGM.GRID_ID
         LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = WGM.MATERIAL_ID
+        WHERE WGM.DELETED = 0
     )
     <where>
         <if test="index != null and index != ''">