修改

pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.example</groupId>
-    <artifactId>dil-api</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>dil-qms-api</artifactId>
+    <version>1.4</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -898,6 +898,7 @@
         LEFT JOIN QMS_QUEUE_RESULT QQR ON QQL.QUEUE_RESULT_ID = QQR.RESULT_ID
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON TTR.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = OOM.MATERIAL_PRIORITY
         LEFT JOIN RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
         LEFT JOIN RMS_CAPACITY RC ON QQL.CAPACITY_ID = RC.CAPACITY_ID
         LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
@@ -928,6 +929,9 @@
         <if test="capacityNumber != null">
             and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
+        <if test="inboundWarehouse != null and inboundWarehouse != ''">
+            and RW.WAREHOUSE_NAME = #{inboundWarehouse}
+        </if>
         <if test="materialList != null and materialList.size > 0">
             and RM.MATERIAL_ID in
             <foreach collection="materialList" item="item" open="(" separator="," close=")">
@@ -1048,6 +1052,7 @@
         left join RMS_CAPACITY RC ON QQR.CAPACITY_ID = RC.CAPACITY_ID
         left join TMSTRUCK_TOTAL_RESULT TTR on QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM on TTR.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = OOM.MATERIAL_PRIORITY
         left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
         left join AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
         left join OMSTRUCK_ORDER OO on TTR.ORDER_ID = OO.ORDER_ID
@@ -1068,6 +1073,9 @@
             AND TTR.ORDER_STATUS = '排队中'
             AND ASO.SALE_TYPE = 50
         </if>
+        <if test="inboundWarehouse != null and inboundWarehouse != ''">
+            and RW.WAREHOUSE_NAME = #{inboundWarehouse}
+        </if>
         and QQSL.SPELILING_NUM not in (1,2)
         <if test="oYeFlag == null">
             AND OO.ORDER_ID NOT IN (
@@ -1160,6 +1168,7 @@
         left join RMS_CAPACITY RC ON QQR.CAPACITY_ID = RC.CAPACITY_ID
         left join TMSTRUCK_TOTAL_RESULT TTR on QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM on TTR.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = OOM.MATERIAL_PRIORITY
         left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
         left join OMSTRUCK_ORDER OO on TTR.ORDER_ID = OO.ORDER_ID
@@ -1200,6 +1209,9 @@
         </if>
         <if test="capacityNumber != null">and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
         </if>
+        <if test="inboundWarehouse != null and inboundWarehouse != ''">
+            and RW.WAREHOUSE_NAME = #{inboundWarehouse}
+        </if>
         <if test="
         materialList != null">and
             EXISTS (

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J\u914D\u7F6E
-log4j.rootCategory=INFO, file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO, file, RUNNING,errorfile
 ## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout