tj

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

@@ -105,4 +105,7 @@ public interface OmstruckOrderSeparateMapper {
 
     //通过装卸工SSOID查询装过的订单信息
     List<Map<String, Object>> getAllLoaderLoadingOrder(Map<String, Object> map);
+
+    Integer getOrderPlanEnable(Object orderId);
+
 }

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

@@ -1884,9 +1884,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 9:
             case 10:
-                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
-                mesMap.get("orderStatus");
-                map.put("orderStatus",mesMap.get("orderStatus"));
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
                 mesMap.put("loadName","化工园区铁专线");
                 break;
@@ -1900,6 +1897,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
+
         return mesMap;
     }
 
@@ -1922,6 +1920,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10){
+                Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
+                if(planEnable == 0){ // 数据为0则失效
+                    continue;
+                }
+            }
             Map<String, Object> mesMap = getMessageToApp(orderMesMap);
             mesMapList.add(mesMap);
         }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -2790,7 +2790,6 @@
                 OO.ORDER_TYPE      "orderType",
                 RS.SUPPLIER_NAME  "shipperName",
                 RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
-
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID

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

@@ -623,4 +623,12 @@
             </if>
         </where>
     </select>
+    <select id="getOrderPlanEnable" resultType="java.lang.Integer">
+        SELECT  AIP.PLAN_EABLE_STATUS
+        FROM
+	    OMSTRUCK_ORDER oo
+	    LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+	    ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        WHERE	OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>