Bläddra i källkod

修改排队以及内转钢材到异地库

luobang 2 år sedan
förälder
incheckning
952683e4ed

+ 1 - 1
src/main/resources/application-dev.yml

@@ -14,7 +14,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}
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
 

+ 4 - 2
src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -882,9 +882,10 @@
             LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
             LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
             LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
+            where oo.ORDER_STATUS = 5
         <where>
             <if test="capacityNumber != null">
-                instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
+                and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
             </if>
             <if test="materialList != null">
                 and RM.MATERIAL_ID in
@@ -948,9 +949,10 @@
             LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
             LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
             LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
+            where oo.ORDER_STATUS = 5
         <where>
             <if test="capacityNumber != null">
-                instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
+                and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
             </if>
             <if test="materialList != null">
                 and