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

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

@@ -265,6 +265,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //通过订单查询趟次
     Map<String,Object> getSporadicOrderTimes(BigDecimal orderId);
 
+
+
     //根据运输订单id查找所有实绩id
     List<Map<String,Object>> getAllResultId(BigDecimal orderId);
 

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

@@ -539,6 +539,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         switch (orderType) {
             case 13:
             case 12:
+            case 20:
                 if (transStatus.intValue()==1){
                     amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
                 }
@@ -587,8 +588,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //删除所有实绩
         Integer orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(new BigDecimal(orderId));
         switch (orderType){
-            case 12:
-            case 13:
+//            case 12:
+//            case 13:
+//            case 20:
             case 15:
             case 16:
                     Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(new BigDecimal(orderId));
@@ -1912,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);
@@ -1948,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/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:

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
@@ -2811,7 +2813,12 @@
                RS.SUPPLIER_NAME   "shipperName",
                RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
                RW.WAREHOUSE_NAME  "unloadName",
-               OO.ORDER_TYPE      "orderType"
+               OO.ORDER_TYPE      "orderType",
+               (case when APO.PURCHASING_ORGANIZATION_ID = 1
+                     then '一厂'
+                     when APO.PURCHASING_ORGANIZATION_ID = 2
+                     then '二厂'
+               end) "organizationCode"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -2876,7 +2883,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
@@ -3151,7 +3159,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})

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

@@ -424,7 +424,7 @@
            </if>
 
             <if test="type == 1">
-                and OO.ORDER_TYPE in (12, 13)
+                and OO.ORDER_TYPE in (12, 13 , 20)
             </if>
             <if test="type == 2">
                 and OO.ORDER_TYPE = 14