修改

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

@@ -249,7 +249,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //判断当前订单是否可出厂
                 Integer canWork = tmstruckLeaveFactoryResultMapper.getCanWorkStatus(DataChange.dataToBigDecimal(mesMap.get("orderId")));
                 if (allNetWeight + nowNetWeight > saleWeight && canWork == null) {
-                    throw new Exception("该销售订单吨位已超额,不允许出厂,请司机走流程卸货!");
+                    throw new Exception("该销售订单吨位已超额,不允许出厂,请司机联系销售公司走流程卸货!");
                 }
             }
         }

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

@@ -103,6 +103,7 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
             map.put("orderId",orderId);
             map.put("orderReceiveStatus",1);
             map.put("capacityNumber","capacityNumber");
+            //根据旧的总实绩ID判断有没有
             omsFeign.driverReceiveOrRefuse(map);
             //进厂
             serachMap.put("resultTotalId",maxId);

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

@@ -1780,8 +1780,8 @@
         distinct
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
-        RW1.WAREHOUSE_NAME "reciveName",
-        RW2.WAREHOUSE_NAME "sendName",
+        rw3.WAREHOUSE_NAME "reciveName",
+        rw4.WAREHOUSE_NAME "sendName",
         RM.MATERIAL_NAME "materialName",
         TWR.RESULT_NET_WEIGHT "resultNetWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
@@ -1809,6 +1809,8 @@
         left join AMSTRUCK_INWARD_REQUIREMENT AIR on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         left join RMS_SHIPPER RS on AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
         left join AMSTRUCK_REQUIREMENT_MATERIAL ARM on AIR.REQUIREMENT_ID = ARM.REQUIREMENT_ID
+        left join RMS_WAREHOUSE rw3 on rw3.WAREHOUSE_ID = arm.REQUIREMENT_UNLOAD_UNIT_ID
+        left join RMS_WAREHOUSE rw4 on rw4.WAREHOUSE_ID = arm.REQUIREMENT_PLATFORM_ID
         left join RMS_MATERIAL RM on ARM.MATERIAL_ID = RM.MATERIAL_ID
         left join RMS_WAREHOUSE RW1 on TUR.RESULT_UNLOAD_PLACE_ID = RW1.WAREHOUSE_ID
         left join RMS_WAREHOUSE RW2 on TLR.LOADING_ID = RW2.WAREHOUSE_ID