2023年8月31日14:08:57

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -174,13 +174,13 @@
             <if test="type == 'BD'">
                 and t.ActID=317
                 <if test="flowType == '未装车'">
-                    and p.ifLoaded = 'F' and p.ifUnLoaded = 'F' and p.ifOrder2ed = 'F'
+                    and p.ifLoaded = 'F' and p.ifUnLoaded = 'F' and (p.ifOrder2ed = 'F' or p.ifOrder2ed = 'T')
                 </if>
                 <if test="flowType == '未卸车'">
-                    and p.ifLoaded = 'T' and p.ifUnLoaded = 'F' and p.ifOrder2ed = 'F'
+                    and p.ifLoaded = 'T' and p.ifUnLoaded = 'F' and (p.ifOrder2ed = 'F' or p.ifOrder2ed = 'T')
                 </if>
                 <if test="flowType == '已卸车'">
-                    and p.ifLoaded = 'T' and p.ifUnLoaded = 'T' and p.ifOrder2ed = 'F'
+                    and p.ifLoaded = 'T' and p.ifUnLoaded = 'T' and (p.ifOrder2ed = 'F' or p.ifOrder2ed = 'T')
                 </if>
                 <if test="flowType == '已提交'">
                     and p.ifLoaded = 'T' and p.ifUnLoaded = 'T' and p.ifOrder2ed = 'S'