代码更新

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

lms/nladmin-ui/src/views/wms/pub/StructDialog.vue

@@ -68,6 +68,7 @@ import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudStructattr from '@/views/wms/basedata/st/struct/structattr'
 import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'StructDialog',
@@ -91,6 +92,10 @@ export default {
     },
     sectProp: {
       type: Object
+    },
+    storId: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -132,15 +137,14 @@ export default {
       return true
     },
     open() {
-      crudSectattr.getSect().then(res => {
+      crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
       })
-      debugger
       if (this.sect) {
         this.query.sect = this.sect
         if (this.sect.length === 1) {
           this.query.stor_id = this.sect[0]
-          this.query.sect_id = ''
+          this.query.stor_id = this.storId
         }
         if (this.sect.length === 0) {
           this.query.sect_id = ''
@@ -154,6 +158,8 @@ export default {
       this.query.is_lock = '1'
       this.query.lock_type = this.lock
       this.query.is_used = '1'
+      debugger
+      this.query.stor_id = this.storId
       this.crud.toQuery()
     },
     handleSelectionChange(val, row) {

lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue

@@ -217,7 +217,7 @@
       </el-table>
     </el-card>
 
-    <StructDiv ref="child" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />
+    <StructDiv ref="child" :stor-id="storId" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />
 
   </el-dialog>
 </template>

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -217,7 +217,7 @@
       </el-table>
     </el-card>
     <pointDialog ref="child" :dialog-show.sync="pointshow" :dialog-typedisable="typedisable" :dialog-areatype="areatype" @PointChanged="PointChanged" />
-    <StructIvt :dialog-show.sync="structshow" :open-array="openParam" :rowmst="openRow" @StructIvtClosed="queryTableDtl" />
+    <StructIvt :dialog-show.sync="structshow" :stor-id="storId" :open-array="openParam" :rowmst="openRow" @StructIvtClosed="queryTableDtl" />
   </el-dialog>
 </template>
 
@@ -316,7 +316,6 @@ export default {
   methods: {
     open() {
       crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
-        debugger
         this.sects = res.content
       })
     },
@@ -367,6 +366,7 @@ export default {
     },
     openStructIvt() {
       this.currentRow.remark = ''
+      this.currentRow.stor_id = this.storId
       checkoutbill.getStructIvt(this.currentRow).then(res => {
         this.openParam = res
         this.structshow = true

lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue

@@ -104,6 +104,7 @@
 import CRUD, { header } from '@crud/crud'
 import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'StructIvt',
@@ -120,6 +121,10 @@ export default {
     openArray: {
       type: Array,
       default: () => { return [] }
+    },
+    storId: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -150,8 +155,7 @@ export default {
   },
   methods: {
     open() {
-      crudSectattr.getSect({ is_productstore: '1' }).then(res => {
+      crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
-        debugger
         this.sects = res.content
       })
       this.query.source_bill_code = this.queryrow.source_bill_code