tijiaio

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

@@ -2017,12 +2017,17 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 15:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
-                mesMap.put("loadName","铁专线—五线");
                 mesMap.put("inwardType","拼装车皮进厂");
                 break;
             case 16:
+            case 23:
+            case 24:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
-                mesMap.put("loadName","一焦化");
+                if (DataChange.dataToBigDecimal(mesMap.get("organizationId")).intValue()==1){
+                    mesMap.put("organizationCode","一厂");
+                }else if (DataChange.dataToBigDecimal(mesMap.get("organizationId")).intValue()==2){
+                    mesMap.put("organizationCode","二厂");
+                }
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
@@ -2067,7 +2072,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
-            if(orderType == 10|| orderType == 20 || orderType == 15 || orderType == 16){
+            if(orderType == 10|| orderType == 20 || orderType == 15 || orderType == 16 || orderType == 23 || orderType == 24){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 if(planEnable == 0){ // 数据为0则失效
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));

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

@@ -3185,7 +3185,8 @@
         RS.SUPPLIER_NAME "shipperName",
         RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         APO.PURCHASING_ORGANIZATION_ID "organizationId",
-        DB.RESULT_FOREIGN_SHIP_NAME "shipName"
+        DB.RESULT_FOREIGN_SHIP_NAME "shipName",
+        RW1.WAREHOUSE_NAME      "loadName"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -3203,6 +3204,8 @@
         ON RCG.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_ID
         LEFT JOIN RMS_CAPACITY RC
         ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
@@ -3463,7 +3466,7 @@
         LEFT JOIN RMS_CONSIGNEE RCE
         ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (10,20,15,16)
+        AND OO.ORDER_TYPE IN (10,20,15,16,23,24)
         AND OO.ORDER_STATUS = #{orderStatus}
         <if test="carrierId !=null">
             AND AIP.CARRIER_ID = (SELECT RCR.CARRIER_ID FROM RMS_CARRIER RCR WHERE RCR.CARRIER_SSO_ID = #{carrierId})