From e4ecd9dd349f11a76cacbf52edf313fe7763da40 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 12 May 2025 16:15:05 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1=E3=80=81=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E8=83=BD=E6=9F=A5=E8=AF=A2=E7=AE=A1=E6=8E=A7?=
 =?UTF-8?q?=E5=BA=93=E5=AD=982=E3=80=81=E6=8A=A5=E8=A1=A8=E5=B9=85?=
 =?UTF-8?q?=E5=AE=BD=E5=B0=8F=E6=95=B0=E7=82=B9=E4=BF=9D=E7=95=991?=
 =?UTF-8?q?=E4=BD=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql | 1 +
 lms/nladmin-ui/src/components/Crud/crud.js               | 9 +++++++++
 lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue | 2 +-
 .../src/views/wms/stat/outbillquery/index2.vue           | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
index 820a10750..5a7296111 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
@@ -249,6 +249,7 @@
                     WHERE
                     	1 = 1
                     AND struct.lock_type = '1'
+                    AND struct.lock_type <> '88'
                     AND IFNULL(struct.storagevehicle_code,'') <> ''
 
                     OPTION 输入.remark <> ""
diff --git a/lms/nladmin-ui/src/components/Crud/crud.js b/lms/nladmin-ui/src/components/Crud/crud.js
index afb522103..ccaa77992 100644
--- a/lms/nladmin-ui/src/components/Crud/crud.js
+++ b/lms/nladmin-ui/src/components/Crud/crud.js
@@ -169,6 +169,15 @@ function CRUD(options) {
       }
       return parseFloat(row[column.property]).toFixed(0)
     },
+    /**
+     * 格式化数据，保留1位小数
+     */
+    formatNum1(row, column) {
+      if (!row[column.property]) {
+        return 0
+      }
+      return parseFloat(row[column.property]).toFixed(1)
+    },
     /**
      * 格式化数据，保留2位小数
      */
diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
index 41936bad5..ecdd40e65 100644
--- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
@@ -216,7 +216,7 @@
         <el-table-column show-overflow-tooltip prop="confirm_time" label="入库日期" :min-width="flexWidth('confirm_time',crud.data,'入库日期')" />
         <el-table-column show-overflow-tooltip prop="date_of_production" label="生产日期" :min-width="flexWidth('date_of_production',crud.data,'生产日期')" />
         <el-table-column show-overflow-tooltip prop="input_optname" label="入库人" :min-width="flexWidth('input_optname',crud.data,'入库人')" />
-        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width" label="产品规格" :formatter="crud.formatNum0" :min-width="flexWidth('width',crud.data,'产品规格')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width" label="产品规格" :formatter="crud.formatNum1" :min-width="flexWidth('width',crud.data,'产品规格')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />
diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
index 4da4783ad..2768fa8af 100644
--- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
@@ -130,7 +130,7 @@
         <el-table-column show-overflow-tooltip prop="sale_order_name" label="销售订单" :min-width="flexWidth('sale_order_name',crud.data,'销售订单')" />
         <el-table-column show-overflow-tooltip prop="old_sale_order_name" label="原销售订单" :min-width="flexWidth('old_sale_order_name',crud.data,'原销售订单')" />
         <el-table-column show-overflow-tooltip prop="confirm_time" label="出库日期" :min-width="flexWidth('confirm_time',crud.data,'出库日期')" />
-        <el-table-column show-overflow-tooltip prop="width" label="产品规格" :formatter="crud.formatNum0" :min-width="flexWidth('width',crud.data,'产品规格')" />
+        <el-table-column show-overflow-tooltip prop="width" label="产品规格" :formatter="crud.formatNum1" :min-width="flexWidth('width',crud.data,'产品规格')" />
         <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
         <el-table-column show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
         <el-table-column show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />