From 68a0e6473242aabde86df7dc3ad5c6fb31352b34 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sun, 27 Nov 2022 13:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql   |  2 +-
 .../st/returns/wql/QST_IVT_INANDOUTRETRUN.wql |  7 +++-
 .../src/views/wms/st/inAndOutReturn/index.vue |  2 +-
 .../wms/statistics/ioStorQuery/DivDialog.vue  | 11 ++---
 .../wms/statistics/ioStorQuery/TaskDialog.vue |  5 +--
 .../wms/statistics/ioStorQuery/index.vue      | 40 ++++++++-----------
 6 files changed, 33 insertions(+), 34 deletions(-)

diff --git 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
index d1a1a6502..6446e4722 100644
--- 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
@@ -549,7 +549,7 @@
                 st_ivt_iostorinvdis dis
                 LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
                 LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
-                LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
+                INNER JOIN sch_base_task task ON dis.task_id = task.task_id
                 WHERE
                 1=1
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
index af5532d54..fca848e96 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
@@ -22,6 +22,7 @@
 	输入.is_upload					    TYPEAS s_string
 	输入.begin_time					    TYPEAS s_string
 	输入.end_time					    TYPEAS s_string
+	输入.bill_status					    TYPEAS s_string
 	输入.iostorinv_id					TYPEAS s_string
 	输入.bill_code					    TYPEAS s_string
 	输入.bill_type					    TYPEAS s_string
@@ -68,7 +69,7 @@
             	LEFT JOIN sys_user user ON user.user_id = mst.upload_optid
             	INNER JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
             WHERE
-                mst.bill_status = '99'
+                mst.is_delete = '0'
                OPTION 输入.stor_id <> ""
                    mst.stor_id = 输入.stor_id
                ENDOPTION
@@ -77,6 +78,10 @@
                   dtl.pcsn = 输入.pcsn
               ENDOPTION
 
+              OPTION 输入.bill_status <> ""
+                mst.bill_status = 输入.bill_status
+            ENDOPTION
+
                OPTION 输入.bill_type <> ""
                    mst.bill_type = 输入.bill_type
                ENDOPTION
diff --git a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
index 287dd77c2..4a050e73c 100644
--- a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
@@ -251,7 +251,7 @@ export default {
         reset: true,
         download: false
       },
-      query: { io_type: '0' }
+      query: { io_type: '0', bill_status: '99' }
     })
   },
   mixins: [presenter(), header(), crud()],
diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
index 9328760db..9f0e6e7d3 100644
--- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
@@ -42,8 +42,6 @@
         <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
-        <el-table-column prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
-        <el-table-column prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
         <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
         <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
@@ -64,8 +62,7 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
         <el-table-column show-overflow-tooltip prop="seq_no" label="明细序号" align="center" />
-        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
-        <el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" align="center" />
+        <el-table-column  prop="box_no" label="木箱号" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
@@ -163,7 +160,11 @@ export default {
       if (current !== null) {
         this.currentRow = current
         this.tabledis = []
-        this.getOutBillDisDtl(current.iostorinvdtl_id)
+        checkoutbill.getOutBillDis({ 'iostorinvdtl_id': current.iostorinvdtl_id }).then(res => {
+          this.tabledis = res
+        }).catch(() => {
+          this.tabledis = []
+        })
       } else {
         this.mstrow.iostorinvdtl_id = ''
         this.currentRow = {}
diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue
index 241a8e134..211901d09 100644
--- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue
@@ -65,9 +65,8 @@
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
-        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" align="center" />
-        <el-table-column show-overflow-tooltip prop="bucket_num" label="桶数" align="center" />
-        <el-table-column show-overflow-tooltip prop="total_storage_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="box_no" label="木箱码" align="center" />
+        <el-table-column show-overflow-tooltip prop="real_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column show-overflow-tooltip prop="start_point_code" label="起始位置" align="center" />
         <el-table-column show-overflow-tooltip prop="next_point_code" label="目的位置" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
index da90f9d9f..5c492f8e7 100644
--- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
@@ -229,7 +229,6 @@
 </template>
 
 <script>
-import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -237,7 +236,8 @@ import pagination from '@crud/Pagination'
 import DivDialog from '@/views/wms/statistics/ioStorQuery/DivDialog'
 import TaskDialog from '@/views/wms/statistics/ioStorQuery/TaskDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
-import crudRawAssist from '@/views/wms/st/inbill/rawassist'
+import inandoutreturn from '@/views/wms/st/inAndOutReturn/inandoutreturn'
+import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 
 export default {
   name: 'IoStorQuery',
@@ -247,18 +247,20 @@ export default {
       props: {
         // 每页数据条数
         size: 20
-      },idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill },
+      },idField: 'iostorinv_id', url: 'api/inandoutreturn', crudMethod: { ...inandoutreturn },
       optShow: {
         add: false,
         edit: false,
         del: false,
         reset: true,
         download: false
-      }})
+      },
+      query: { io_type: '0' }
+    })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['ST_QUALITY_SCODE', 'io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload'],
+  dicts: ['io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload', 'ST_INV_IN_TYPE', 'ST_INV_OUT_TYPE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -283,12 +285,11 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
       this.storlist = res.content
     })
-    checkoutbill.getType().then(res => {
-      this.billtypelist = res
-    })
+    debugger
+    this.billtypelist = this.dict.ST_INV_IN_TYPE
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
@@ -324,17 +325,9 @@ export default {
     },
     ioTypeChange(value) {
       if (value === '1') {
-        crudRawAssist.getType({ 'io_code': '', 'io_flag': '01' }).then(res => {
-          this.billtypelist = res
-        })
-      } else if (value === '0') {
-        crudRawAssist.getType({ 'io_code': '', 'io_flag': '00' }).then(res => {
-          this.billtypelist = res
-        })
+        this.billtypelist = this.dict.ST_INV_OUT_TYPE
       } else {
-        checkoutbill.getType().then(res => {
-          this.billtypelist = res
-        })
+        this.billtypelist = this.dict.ST_INV_IN_TYPE
       }
       this.crud.toQuery()
     },
@@ -342,10 +335,11 @@ export default {
       return this.dict.label.io_bill_status[row.bill_status]
     },
     bill_typeFormat(row) {
-      for (const item of this.billtypelist) {
-        if (item.code === row.bill_type) {
-          return item.name
-        }
+      if (this.query.io_type === '0') {
+        return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
+      }
+      if (this.query.io_type === '1') {
+        return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
       }
     },
     create_modeFormat(row) {