Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -130,4 +130,6 @@ public interface OmstruckOrderSeparateMapper {
 
     Map<String, Object> getPriceInfo(Integer orderId);
 
+    //查询订单发货日期（订单类型为1）
+    Integer getDeliveryDatePass(Object orderId);
 }

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

@@ -2082,6 +2082,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            if (orderType == 1) {
+                Integer judgeDate = omstruckOrderSeparateMapper.getDeliveryDatePass(orderMesMap.get("orderId"));
+                if(judgeDate == null){ // 数据为空则是已过截止日期 关闭订单
+                    omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
+                    continue;
+                }
+            }
             if(orderType == 10|| orderType == 20 || orderType == 15 || orderType == 16 || orderType == 23 || orderType == 24){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 if(planEnable == 0){ // 数据为0则失效

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

@@ -1908,7 +1908,8 @@
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel",
         OO.DRIVER_TEL "drivelTel",
-        ASM.SALE_WAREHOUSE "saleWarehouse"
+        ASM.SALE_WAREHOUSE "saleWarehouse",
+        ASM.MATERIAL_NUMBER "materialNumber"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1935,7 +1936,7 @@
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
         ON OO.PRICE_ID=ACTP.PRICE_ID
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-        ON OOM.ORDER_ID=ASO.SALE_ORDER_ID
+        ON OOM.ORDER_ID=OO.ORDER_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         <where>

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

@@ -881,4 +881,14 @@
                 (select MAX(RLS.SEGMENT_SQE) - 1 from RMS_LINE_SEGEMNT RLS where OO.LINE_ID = RLS.LINE_ID)
         where OO.ORDER_ID = #{orderId}
     </update>
+
+    <!--  查询订单发货日期 （订单类型为1） -->
+    <select id="getDeliveryDatePass" parameterType="object" resultType="int">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+                 join AMS_SALE_ORDER_MATERIAL ASOM
+                      on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        where OO.ORDER_ID = #{orderId}
+          and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD hh24:mi:ss') >= TO_CHAR(SYSDATE - 1, 'YYYY-MM-DD hh24:mi:ss')
+    </select>
 </mapper>