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

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

@@ -1914,8 +1914,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 9:
             case 10:
+            case 20:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
                 mesMap.put("loadName","化工园区铁专线");
+                BigDecimal organizationId =(BigDecimal) mesMap.get("organizationId");
+                if (organizationId.intValue()==1){
+//                    mesMap.remove(organizationId);
+                    mesMap.put("organizationCode","一厂");
+                }else if (organizationId.intValue()==2){
+                    mesMap.put("organizationCode","二厂");
+                }
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
@@ -1924,7 +1932,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 13:
             case 15:
             case 16:
-            case 20:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
@@ -1951,7 +1958,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
-            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10){
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10||DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 20){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 if(planEnable == 0){ // 数据为0则失效
                     continue;

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

@@ -1604,13 +1604,15 @@
         select *
         from (
         select apo.PURCHASE_ORDER_NO "purchaseOrderNo",
-                apo.PURCHASE_ORDER_ID "purchaseOrderId",
-                db.RESULT_FOREIGN_SHIP_NAME "remark",
-                apo.RECEIVE_UNIT_ID     "receiveUnitId"
+        apo.PURCHASE_ORDER_ID "purchaseOrderId",
+        db.RESULT_FOREIGN_SHIP_NAME "remark",
+        apo.RECEIVE_UNIT_ID     "receiveUnitId",
+        apo.purchasing_organization_id "purchaseOrgId"
         from AMS_PURCHASE_ORDER APO
         join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
         where db.MATERIAL_ID = #{materialId}
         and apo.SUPPLIER_UNIT_ID = #{supplierId}
+        and apo.purchasing_organization_id = #{purchaseOrgId}
         and apo.deleted = 0
         <if test="remark != null">
             and instr(db.RESULT_FOREIGN_SHIP_NAME, #{remark}) > 0
@@ -2884,7 +2886,8 @@
         OO.ORDER_TYPE "orderType",
         OO.ORDER_STATUS "orderStatus",
         RS.SUPPLIER_NAME "shipperName",
-        RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        APO.PURCHASING_ORGANIZATION_ID "organizationId"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -3159,7 +3162,7 @@
         LEFT JOIN RMS_CONSIGNEE RCE
         ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4, 9, 10, 11)
+        AND OO.ORDER_TYPE IN (4, 9, 10, 11 , 20)
         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})