修改

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

@@ -1213,5 +1213,11 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.getZtZxShiji(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "匹配装车与大车实绩")
+    @PostMapping("matchZcDcResult")
+    public Map<String,Object> matchZcDcResult(@RequestBody Map<String,Object> map) {
+        return tmsFeign.matchZcDcResult(map);
+    }
+
 
 }

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

@@ -175,6 +175,13 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getGridMaterialList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+    @PostMapping(value = "/getMaterialInventoryList")
+    public Map<String, Object> getMaterialInventoryList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return wmsFeign.getMaterialInventoryList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
     @PostMapping(value = "/getGridMaterialInfo")
     public Map<String, Object> getGridMaterialInfo(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.getGridMaterialInfo(map == null ? new HashMap<>() : map);

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

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

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

@@ -117,4 +117,9 @@ public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsgridmaterials/getGridMaterialInfo")
     Map<String, Object> getGridMaterialInfo(Map<String, Object> objectMap);
+
+    @PostMapping("api/v1/wms/wmsgridmaterials/getMaterialInventoryList")
+    Map<String, Object> getMaterialInventoryList(@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:172.16.90.202 :8093}
+    url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.90.202:8060}
 #      url: ${RMSFEIGN_URL:localhost:8060}

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

@@ -1187,6 +1187,14 @@
                 AND ( REGEXP_LIKE(t.prod_code, #{prodCode})
                 OR REGEXP_LIKE(RC.MATERIAL_CODE, #{prodCode}) )
             </if>
+            <if test="weightMaterial != null and weightMaterial != ''">
+                AND RC.MATERIAL_ID IN (SELECT DISTINCT
+                MATERIAL_ID
+                FROM
+                OMS_ORDER_CHILD
+                WHERE
+                NET_WEIGHT IS NOT NULL)
+            </if>
         </where>
         order by length("text")
         FETCH NEXT 10 ROWS ONLY