修改

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

@@ -1214,9 +1214,9 @@ public class TMSController extends BaseRESTfulController {
     }
 
     @ApiOperation(value = "匹配装车与大车实绩")
-    @PostMapping("matchZcDcResult")
-    public Map<String,Object> matchZcDcResult(@RequestBody Map<String,Object> map) {
-        return tmsFeign.matchZcDcResult(map);
+    @PostMapping("disposeMatchLoadData")
+    public Map<String,Object> disposeMatchLoadData(@RequestBody Map<String,Object> map) {
+        return tmsFeign.disposeMatchLoadData(map);
     }
 
 

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

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

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

@@ -2269,7 +2269,7 @@
         WGM.GRID_MATERIAL_ID                         "value",
         WGM.GRID_MATERIAL_ID                        "gridMaterialId",
         WGM.MATERIAL_ID                             "materialId",
-        WGM.MATERIAL_NUMBER                         "inventoryNumber",
+        WGM.MATERIAL_NUMBER + NVL(WIR."inboundNumber",0) - NVL(WOR."outboundNumber",0)                         "inventoryNumber",
         WGM.GRID_ID                                 "gridId",
         RM.MATERIAL_NAME                            "materialName",
         ROP.OPERATION_POINT_NAME                    "gridName",
@@ -2279,6 +2279,38 @@
         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
+        LEFT JOIN (SELECT WIR.GRID_MATERIAL_ID "gridMaterialId",
+        SUM(WIR.INBOUND_NUMBER) "inboundNumber"
+        FROM WMS_INBOUND_RESULT WIR
+        LEFT JOIN WMS_GRID_MATERIAL WRM
+        ON WRM.GRID_MATERIAL_ID = WIR.GRID_MATERIAL_ID
+        WHERE WIR.DELETED = 0
+        <if test="boundTime == null">
+            AND TO_CHAR(WIR.INBOUND_TIME,'yyyy-MM-dd HH24:mi:ss') >= CASE WHEN WRM.ALTERNATE_FIELDS1 = '原料在途库' THEN '2025-01-10 00:00:00'
+            WHEN WRM.ALTERNATE_FIELDS1 = '原料仓储库' THEN '2025-01-09 08:00:00'
+            ELSE '2025-01-10 08:00:00' END
+        </if>
+        <if test="boundTime != null">
+            AND TO_CHAR(WIR.INBOUND_TIME,'yyyy-MM-dd HH24:mi:ss') >= CASE WHEN WRM.ALTERNATE_FIELDS1 = '原料在途库' THEN '2025-01-10 00:00:00' WHEN WRM.ALTERNATE_FIELDS1 = '原料仓储库' THEN '2025-01-09 08:00:00' ELSE '2025-01-10 08:00:00' END
+            AND WIR.INBOUND_TIME &lt;= to_date(#{boundTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        GROUP BY WIR.GRID_MATERIAL_ID) WIR
+        ON WIR."gridMaterialId" = WGM.GRID_MATERIAL_ID
+        LEFT JOIN (SELECT WOR.GRID_MATERIAL_ID "gridMaterialId",
+        SUM(WOR.OUTBOUND_NUMBER) "outboundNumber"
+        FROM WMS_OUTBOUND_RESULT WOR
+        LEFT JOIN WMS_GRID_MATERIAL WRM
+        ON WRM.GRID_MATERIAL_ID = WOR.GRID_MATERIAL_ID
+        WHERE WOR.DELETED = 0
+        <if test="boundTime == null">
+            AND TO_CHAR(WOR.OUTBOUND_TIME,'yyyy-MM-dd HH24:mi:ss') >= CASE WHEN WRM.ALTERNATE_FIELDS1 = '原料在途库' THEN '2025-01-10 00:00:00' WHEN WRM.ALTERNATE_FIELDS1 = '原料仓储库' THEN '2025-01-09 08:00:00' ELSE '2025-01-10 08:00:00' END
+        </if>
+        <if test="boundTime != null">
+            AND TO_CHAR(WOR.OUTBOUND_TIME,'yyyy-MM-dd HH24:mi:ss') >= CASE WHEN WRM.ALTERNATE_FIELDS1 = '原料在途库' THEN '2025-01-10 00:00:00' WHEN WRM.ALTERNATE_FIELDS1 = '原料仓储库' THEN '2025-01-09 08:00:00' ELSE '2025-01-10 08:00:00' END
+            AND WOR.OUTBOUND_TIME &lt;= to_date(#{boundTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        GROUP BY WOR.GRID_MATERIAL_ID) WOR
+        on WOR."gridMaterialId" = WGM.GRID_MATERIAL_ID
         WHERE WGM.DELETED = 0
     )
     <where>