火车发运明细查询移库数据不显示计量单号

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

@@ -224,6 +224,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
     })
     @PostMapping("/driverReceiveOrRefuse")
     public RESTfulResult driverReceiveOrRefuse(@RequestBody Map<String, Object> map) {
+        System.out.println("接单数据：" + JSONUtils.toJSONString(map));
         try {
             int i = omstruckOrderService.driverReceiveOrRefuse(map);
             return success(i);

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

@@ -29,5 +29,5 @@ public interface AmsFeign {
     Map<String,Object> getInwardPriceBy(@RequestBody(required = false) Map<String, Object> priceMap);
 
     @PostMapping(value = "/api/v1/ams/amssaleorders/pushCarNumberToEas")
-    Map<String,Object> pushCarNumberToEas(@RequestBody(required = false) Map<String, Object> priceMap);
+    Map<String,Object> pushCarNumberToEas(@RequestBody(required = false) Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1043,6 +1043,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     //同步金蝶车号
                     Map<String, Object> result = amsFeign.pushCarNumberToEas(toEasMap);
                     if(result == null || !("succeed").equals(result.get("result").toString())){
+                        System.out.println("接单同步车号失败：" + result.get("errMsg"));
                         throw new RuntimeException("同步车号失败");
                     }
                 }

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

@@ -643,7 +643,7 @@
                           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TWR.MATERIAL_ID = RM.MATERIAL_ID
-                                    AND TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
+                                    AND NVL(TWR.SALE_MATERIAL_ID, ASM.SALE_MATERIAL_ID) = ASM.SALE_MATERIAL_ID
                           LEFT JOIN TMSTRUCK_UNLOAD_RESULT  TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TUR.MATERIAL_ID = RM.MATERIAL_ID
                           LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID