Forráskód Böngészése

修改内转零星

zx 3 éve
szülő
commit
0a58d922c3

+ 4 - 0
src/main/java/com/steerinfo/dil/service/impl/AmstruckSporadicOrderServiceImpl.java

@@ -249,6 +249,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             case 13:
             case 15:
             case 16:
+            case 20:
                 addSporadicOrdersForCoke(map);
 
         }
@@ -338,6 +339,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                     if (type.intValue() == 13) {
                         orderType += "内转零星出厂";
                     }
+                    if (type.intValue() == 20) {
+                        orderType += "内转零星(新区-老区)进厂";
+                    }
                     if (tranStatus.intValue() == 0){
                         Status += "禁用";
                     }

+ 1 - 1
src/main/resources/bootstrap.yml

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

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/AmstruckSporadicMaterialMapper.xml

@@ -475,7 +475,7 @@
   OOM.ORDER_ID = OO.ORDER_ID
   LEFT JOIN RMS_MATERIAL RM
   ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-  WHERE OO.ORDER_TYPE in (12,13)
+  WHERE OO.ORDER_TYPE in (12,13,20)
   AND ASO.ISSUE_STATUS = #{issueStatus}
   AND ASO.DELETED = 0
   AND ASO.TRANS_STATUS=1

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/AmstruckSporadicOrderMapper.xml

@@ -542,7 +542,7 @@
         OOM.ORDER_ID = OO.ORDER_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-        WHERE OO.ORDER_TYPE in (12,13)
+        WHERE OO.ORDER_TYPE in (12,13,20)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
         and   ASO.TRANS_STATUS =1