Merge branch 'master' into dev

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

@@ -1944,8 +1944,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
-                mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
-                mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;
             case 12:
             case 13:
@@ -1975,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<>();
@@ -1992,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  -->
@@ -3223,7 +3230,10 @@
                OO.ORDER_STATUS        "orderStatus",
                RS.SHIPPER_NAME        "shipperUnitName",
                AIR.REQUIREMENT_ID     "requirementId",
-               AIR.DUE_DATE             "saleDateOfReceipt"
+               AIR.DUE_DATE             "saleDateOfReceipt",
+               AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+               RW1.WAREHOUSE_NAME       "loadName",
+               RW.WAREHOUSE_NAME        "unloadName"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
                            ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -3235,7 +3245,13 @@
                            ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        where oo.order_id = #{orderId}
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW1
+                           ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+         where oo.order_id = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>

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

@@ -595,12 +595,18 @@
     <select id="getAllLoaderLoadingOrder" parameterType="map" resultType="java.util.Map">
         select OO.ORDER_ID  "orderId",
                OO.ORDER_NUMBER "orderNumber",
-               RC.CAPACITY_NUMBER   "capacityNumber"
+               RC.CAPACITY_NUMBER   "capacityNumber",
+               TWR.RESULT_NET_WEIGHT "netWeight",
+               RM.MATERIAL_NAME "materialName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
         left join RMS_CAPACITY RC
             on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_MATERIAL RM
+            on RM.MATERIAL_ID = TWR.MATERIAL_ID
         <if test="loaderSsoId != null">
             left join TMSTRUCK_LOAD_RESULT TLR
             on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -753,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>