Merge branch 'dev'

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

@@ -252,7 +252,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             case 13:
             case 15:
             case 16:
-            case 20:
+            case 19:
                 addSporadicOrdersForCoke(map);
 
         }
@@ -342,9 +342,6 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                     if (type.intValue() == 13) {
                         orderType += "内转零星出厂";
                     }
-                    if (type.intValue() == 20) {
-                        orderType += "内转零星(新区-老区)进厂";
-                    }
                     if (tranStatus.intValue() == 0){
                         Status += "禁用";
                     }
@@ -377,9 +374,13 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                     if (type.intValue() == 16) {
                         orderType += "普通零星出厂";
                     }
+                    if (type.intValue() == 19) {
+                        orderType += "普通零星退货";
+                    }
                     map1.put("orderType", orderType);
                 }
             case 16:
+            case 19:
                 break;
         }
         return mapList;

src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8018}
 

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

@@ -400,7 +400,7 @@
     RMS_MATERIAL RM
     ON
     OOM.MATERIAL_ID = RM.MATERIAL_ID
-    WHERE OO.ORDER_TYPE in (15,16)
+    WHERE OO.ORDER_TYPE in (15,16,19)
     AND ASO.ISSUE_STATUS =1
     AND ASO.DELETED = 0
     <if test="dispatchStatus != null">
@@ -553,7 +553,7 @@
     RMS_MATERIAL RM
     ON
     OOM.MATERIAL_ID = RM.MATERIAL_ID
-    WHERE OO.ORDER_TYPE in (15,16)
+    WHERE OO.ORDER_TYPE in (15,16,19)
     AND ASO.ISSUE_STATUS =1
     AND ASO.DELETED = 0
     AND  ASO.CARRIER_ID IS  NULL

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

@@ -624,7 +624,7 @@
         RMS_MATERIAL RM
         ON
         OOM.MATERIAL_ID = RM.MATERIAL_ID
-        WHERE OO.ORDER_TYPE in (15,16)
+        WHERE OO.ORDER_TYPE in (15,16,19)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
         <if test="dispatchStatus != null">