钢材承运商派车，新增展示派车失败原因

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

@@ -764,6 +764,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         try {
             result = amsSaleOrderService.dispatchSteelOrder(mapList);
         } catch (Exception e) {
+            e.printStackTrace();
             return failed(e.getMessage());
         }
         if (result == 0) {

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

@@ -829,6 +829,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             String capacityNumber = (String) map.get("capacityNumber");
             Map<String,Object> details = amsSaleOrderMapper.getOrderIdByCapacity(map);
             if(details!=null && details.get("orderId")!=null){
+                if(details.get("isEn")==null){
+                    throw new Exception(capacityNumber+"有未进厂的运输订单任务，无法派单");
+                }else if(details.get("isLeave")==null){
+                    throw new Exception(capacityNumber+"有未出厂的运输订单任务，无法派单");
+                }else if(details.get("isArrival")==null){
+                    throw new Exception(capacityNumber+"有未抵达的运输订单任务，无法派单");
+                }else if(details.get("isReceipt")==null){
+                    throw new Exception(capacityNumber+"有未签收的运输订单任务，无法派单");
+                }
                 throw new Exception(capacityNumber+"有未完成的运输订单任务，无法派单");
             }
             // 得到车序号表主键

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

@@ -4572,13 +4572,18 @@
   <select id="getOrderIdByCapacity" resultType="java.util.Map">
     select OO.order_ID "orderId",
            RC.CAPACITY_NUMBER "capacityNumber",
-           OO.ORDER_STATUS "orderStatus",
-           OO.ORDER_LINE_SEQUENCE "orderLineSequence"
+           TTR.RESULT_TOTAL_ID "resultTotalId",
+           TER.RESULT_ENTRY_GATE_TIME "isEn",
+           TLFR.RESULT_OUT_GATE_TIME "isLeave",
+           TAR.RESULT_ID "isArrival",
+           TRR.RESULT_ID "isReceipt"
     from OMSTRUCK_ORDER OO
            LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID =RC.CAPACITY_ID
-           LEFT JOIN RMS_CARRIER RCA ON OO.CARRIER_ID=RCA.CARRIER_ID
-           LEFT JOIN OMSTRAIN_ORDER_MATERIAL OOM ON OOM.ORDER_ID=OO.ORDER_ID
-           LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID=OOM.MATERIAL_ID
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID=OO.ORDER_ID
+           LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+           LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+           LEFT JOIN TMSTRUCK_ARRIVAL_RESULT  TAR ON TAR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+           LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR ON TRR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
     where RC.CAPACITY_NUMBER=#{capacityNumber} and OO.order_status=5
       fetch next 1 rows only
   </select>