提交

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -135,4 +135,6 @@ public interface OmstruckOrderSeparateMapper {
 
     BigDecimal getWeightTask(BigDecimal orderId);
 
+    Map<String, Object> getDueTime(Object orderId);
+
 }

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

@@ -2217,8 +2217,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             }
             //如果订单类型为11 当订单大于截止日期时，不显示订单
             if(orderType == 11 || orderType == 21){
+                //根据运输订单id,查询需求里面是否有截止时间
+                Map<String,Object> dueTime = omstruckOrderSeparateMapper.getDueTime(orderMesMap.get("orderId"));
                 int result = omstruckOrderSeparateMapper.getInward(orderMesMap.get("orderId"));
-                if(result == 0){
+                if(result == 0 && dueTime != null){
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
                     continue;
                 }

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

@@ -2930,7 +2930,7 @@
         CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
         (case
         when OOM.ORDER_MATERIAL_NUMBER is not null
-        then OOM.ORDER_MATERIAL_NUMBER || '件'
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
         when OOM.ORDER_MATERIAL_WEIGHT is not null
         then OOM.ORDER_MATERIAL_WEIGHT  || '吨'
         end

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

@@ -755,7 +755,6 @@
         where AIR.DUE_DATE	>= sysdate and OO.ORDER_ID = #{orderId}
     </select>
 
-
     <select id="getOrderMesByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select OO.ORDER_TYPE    "orderType",
                OO.ORDER_PLAN_ID "orderPlanId",
@@ -912,4 +911,14 @@
         ORDER BY TWR.RESULT_TARE_WEIGHT DESC)
         WHERE ROWNUM = 1
     </select>
+    <select id="getDueTime" resultType="java.util.Map" parameterType="decimal">
+        select AIR.DUE_DATE from  OMSTRUCK_ORDER OO
+                                  LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                                            ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+                                  LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                                            ON ARP.PLAN_ID = AIP.PLAN_ID
+                                  LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                                            ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        where  OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>