From 602ddf51f97d89a9593c15a69f4673fa163de46f Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 29 Sep 2025 15:23:14 +0800
Subject: [PATCH] =?UTF-8?q?ifs=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/warehouse/ifsInventoryInit.vue    | 61 +++++++++++++++----
 src/views/modules/warehouse/labelQuery.vue    |  9 ++-
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/warehouse/ifsInventoryInit.vue b/src/views/modules/warehouse/ifsInventoryInit.vue
index ac839f7..b34d93a 100644
--- a/src/views/modules/warehouse/ifsInventoryInit.vue
+++ b/src/views/modules/warehouse/ifsInventoryInit.vue
@@ -2,7 +2,7 @@
   <div class="mod-config">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-input v-model="dataForm.partNo" placeholder="商品编码" clearable></el-input>
+        <el-input v-model="dataForm.partNo" placeholder="物料编码" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-input v-model="dataForm.batchNo" placeholder="批次号" clearable></el-input>
@@ -10,11 +10,15 @@
       <el-form-item>
         <el-input v-model="dataForm.locationId" placeholder="库位" clearable></el-input>
       </el-form-item>
+      <el-form-item>
+        <el-input v-model="dataForm.descriptionLike" placeholder="物料描述" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="dataForm.minUnPrintQty" placeholder="最小未打印数量" type="number" clearable></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="getDataList()">
-          <i class="el-icon-search"></i>搜索
-        </el-button>
+        <el-button @click="resetForm()">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -47,13 +51,13 @@
         prop="partNo"
         header-align="center"
         align="center"
-        label="商品编码">
+        label="物料编码">
       </el-table-column>
       <el-table-column
         prop="description"
         header-align="center"
         align="center"
-        label="商品描述">
+        label="物料描述">
       </el-table-column>
       <el-table-column
         prop="batchNo"
@@ -74,7 +78,7 @@
         label="库位">
       </el-table-column>
       <el-table-column
-        prop="qtyOnHand"
+        prop="inQty"
         header-align="center"
         align="center"
         label="现有库存">
@@ -83,7 +87,13 @@
         prop="printQty"
         header-align="center"
         align="center"
-        label="已打数量">
+        label="已打印数量">
+      </el-table-column>
+      <el-table-column
+        prop="unPrintQty"
+        header-align="center"
+        align="center"
+        label="未打印数量">
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -116,7 +126,7 @@
        <el-form :model="createHuForm" ref="createHuForm" class="create-hu-form">
          <el-row :gutter="20">
            <el-col :span="12">
-             <el-form-item label="商品编码" prop="partNo" class="form-item-vertical">
+             <el-form-item label="物料编码" prop="partNo" class="form-item-vertical">
                <el-input v-model="createHuForm.partNo" readonly></el-input>
              </el-form-item>
            </el-col>
@@ -139,10 +149,21 @@
              </el-form-item>
            </el-col>
          </el-row>
-
+         <el-row :gutter="20">
+           <el-col :span="12">
+             <el-form-item label="库存数量" prop="inQty" class="form-item-vertical">
+               <el-input v-model="createHuForm.inQty" readonly></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="12">
+             <el-form-item label="未打印数量" prop="unPrintQty" class="form-item-vertical">
+               <el-input v-model="createHuForm.unPrintQty" readonly></el-input>
+             </el-form-item>
+           </el-col>
+         </el-row>
          <el-row :gutter="20">
            <el-col :span="24">
-             <el-form-item label="商品描述" prop="partDesc" class="form-item-vertical">
+             <el-form-item label="物料描述" prop="partDesc" class="form-item-vertical">
                <el-input v-model="createHuForm.partDesc" readonly></el-input>
              </el-form-item>
            </el-col>
@@ -187,7 +208,9 @@ export default {
       dataForm: {
         partNo: '',
         batchNo: '',
-        locationId: ''
+        locationId: '',
+        descriptionLike: '',
+        minUnPrintQty: 0
       },
       dataList: [],
       pageIndex: 1,
@@ -279,6 +302,8 @@ export default {
         batchNo: row.batchNo,
         wdr: row.wdr,
         locationId: row.locationId,
+        inQty: row.inQty,
+        unPrintQty: row.unPrintQty,
         perPackageQty: '',
         packageCount: 1
       }
@@ -357,6 +382,18 @@ export default {
       } catch (error) {
         return Promise.reject(error);
       }
+    },
+    // 重置表单
+    resetForm() {
+      this.dataForm = {
+        partNo: '',
+        batchNo: '',
+        locationId: '',
+        descriptionLike: '',
+        minUnPrintQty: 0
+      }
+      this.pageIndex = 1
+      this.getDataList()
     }
   }
 }
diff --git a/src/views/modules/warehouse/labelQuery.vue b/src/views/modules/warehouse/labelQuery.vue
index 4de0a25..e520e21 100644
--- a/src/views/modules/warehouse/labelQuery.vue
+++ b/src/views/modules/warehouse/labelQuery.vue
@@ -21,6 +21,9 @@
       <el-form-item label="单元ID">
         <el-input style="width: 120px;" v-model="queryHeaderData.unitId" placeholder="请输入单元ID"></el-input>
       </el-form-item>
+      <el-form-item label="物料描述">
+        <el-input style="width: 120px;" v-model="queryHeaderData.partDesc" placeholder="请输入物料描述"></el-input>
+      </el-form-item>
       <el-form-item style="margin-top: 20px;">
         <el-button @click="getDataList()" type="primary">查询</el-button>
         <el-button @click="resetQuery()" type="default">重置</el-button>
@@ -115,7 +118,8 @@ export default {
         partNo: '',
         batchNo: '',
         locationId: '',
-        unitId: ''
+        unitId: '',
+        partDesc: ''
       },
       // 打印相关配置
       reportId: 'HU_LABEL', // 默认报表ID，可根据实际情况调整
@@ -168,7 +172,8 @@ export default {
         partNo: '',
         batchNo: '',
         locationId: '',
-        unitId: ''
+        unitId: '',
+        partDesc: ''
       }
       this.pageIndex = 1
       this.getDataList()