3.14

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

@@ -130,4 +130,5 @@ public interface OmstruckOrderSeparateMapper {
 
     int closeInwardOrder(@Param("orderId") Integer orderId, @Param("sqe") Integer sqe);
 
+    int  getInward(Object orderType);
 }

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

@@ -1973,6 +1973,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(Map<String, Object> map){
         String capacityNumber = (String) map.get("capacityNumber");
+
         //通过车牌号查询所有未下发的订单ID
          List<Map<String, Object>> orderMesList = omstruckOrderMapper.getOrderIdListByCapacityNumber(capacityNumber);
         List<Map<String, Object>> mesMapList = new ArrayList<>();
@@ -1990,6 +1991,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue()==11){
+                int result = omstruckOrderSeparateMapper.getInward(orderMesMap.get("orderId"));
+                if(result == 0){
+                    continue;
+                }
+            }
+
             Map<String, Object> mesMap = getMessageToApp(orderMesMap);
             mesMapList.add(mesMap);
         }

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

@@ -2934,14 +2934,21 @@
     </select>
 
     <!--  通过车牌匹配所有已下发的 的订单Id -->
-    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="map">
+    <select id="getOrderIdListByCapacityNumber" resultType="map">
         SELECT OO.ORDER_ID "orderId",
-               OO.ORDER_TYPE    "orderType"
+               OO.ORDER_TYPE  "orderType"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        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 RC.CAPACITY_NUMBER = #{capacityNumber}
           AND OO.ORDER_STATUS = 4
+        order by AIR.REQUIREMENT_TRUCK_TIME
     </select>
 
     <!--  根据车牌号匹配所有已接收的运输订单Id  -->
@@ -3224,6 +3231,7 @@
                RS.SHIPPER_NAME        "shipperUnitName",
                AIR.REQUIREMENT_ID     "requirementId",
                AIR.DUE_DATE             "saleDateOfReceipt",
+               AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
                RW1.WAREHOUSE_NAME       "loadName",
                RW.WAREHOUSE_NAME        "unloadName"
         FROM OMSTRUCK_ORDER OO

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

@@ -759,5 +759,15 @@
         </where>
     </select>
 
+    <select id="getInward" resultType="java.lang.Integer">
+        select count(*) 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 AIR.DUE_DATE	&gt;= sysdate and OO.ORDER_ID = #{orderId}
+    </select>
 
 </mapper>