Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

2022-12-01 13:01:08 +08:00
parent 264d369fcf 594ee8a843
commit e77518f5dd
5 changed files with 24 additions and 8 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -212,6 +212,9 @@
                    OPTION 输入.sect_id <> ""
                          struct.sect_id = 输入.sect_id
                    ENDOPTION
+                    OPTION 输入.stor_id <> ""
+                          struct.stor_id = 输入.stor_id
+                    ENDOPTION
                    order by ivt.canuse_qty,ivt.pcsn desc
                    ) t1
                    UNION
@@ -259,6 +262,9 @@
                    OPTION 输入.sect_id <> ""
                          struct.sect_id = 输入.sect_id
                    ENDOPTION
+                    OPTION 输入.stor_id <> ""
+                          struct.stor_id = 输入.stor_id
+                    ENDOPTION
                    order by ivt2.canuse_qty,ivt2.pcsn desc
                    ) t2
                    ENDSELECT