修改化工材料类型

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

@@ -112,6 +112,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 5:
             case 6:
             case 7:
+            case 17:
+            case 18:
                 i = addCGPurOrders(map);
                 break;
             case 8:
@@ -228,6 +230,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 if (map.get("purchaseOrderId") != null)
                     omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
                 if (map.get("unloadPointId") != null) // 添加卸货点
@@ -318,6 +322,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 //生成子表主键
                 omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
                 omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
@@ -392,6 +398,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 //修改运输订单子表物资重量
                 OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
                 //添加子表主键 通过订单ID查询出子表主键
@@ -561,7 +569,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             //判断订单是否是一车多单
 
             BigDecimal orderType= (BigDecimal) orderMessage.get("orderType");
-            if (orderType.equals(15)||orderType.equals(16)){
+            if (orderType.intValue() == 15||orderType.intValue() == 16){
                 //通过订单查询趟次
                Integer sporadicOrderTimes  =omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 //生成作业实绩之后、更改订单数量
@@ -1651,6 +1659,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 6:
             case 7:
             case 8:
+            case 17:
+            case 18:
                 mesMap = omstruckOrderMapper.getCGOrderMessageToApp(map);
                 break;
             case 9:

src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@ openfeign:
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8015}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8018}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 server:
   port: 8016

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

@@ -702,9 +702,12 @@
             <if test="orderTypee != null">
                 and OO.ORDER_TYPE = #{orderTypee}
             </if>
-            <if test="fuelOrder != null">
+            <if test="fuelOrder == 1">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
@@ -1308,9 +1311,12 @@
             <if test="orderTypee != null">
                 and OO.ORDER_TYPE = #{orderTypee}
             </if>
-            <if test="fuelOrder != null">
+            <if test="fuelOrder == 1">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>