From 687255fe255e8fb0cdba11e0869d4fc2b44e360c Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 10 Oct 2024 09:05:30 +0800
Subject: [PATCH] =?UTF-8?q?wms=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/matenews/index.vue      |  4 +-
 src/views/wms/odsRawOrderIn/index.vue | 28 +++++----
 src/views/wms/outorderzs/index.vue    | 17 +++---
 src/views/wms/put/index.vue           | 82 +++++++++++++++++++++++----
 4 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/matenews/index.vue b/src/views/wms/matenews/index.vue
index 2e7bbf4..87de13b 100644
--- a/src/views/wms/matenews/index.vue
+++ b/src/views/wms/matenews/index.vue
@@ -19,10 +19,10 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="库位编码" prop="wlCode">
+			<el-form-item label="标识卡" prop="wlCode">
 				<el-input
 					v-model="queryParams.wlCode"
-					placeholder="请输入库位编码"
+					placeholder="请输入标识卡"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
index 5d40fe4..c58f7e2 100644
--- a/src/views/wms/odsRawOrderIn/index.vue
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -1,15 +1,15 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+      <el-form-item label="送货单号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          placeholder="请输入送货单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
-			<el-form-item label="到货单号" prop="dnNo">
-				<el-input
-					v-model="queryParams.dnNo"
-					placeholder="请输入到货单号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item label="采购单号" prop="poNo" width="180">
 				<el-input
 					v-model="queryParams.poNo"
@@ -18,7 +18,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-
+      <el-form-item label="到货单号" prop="dnNo">
+        <el-input
+          v-model="queryParams.dnNo"
+          placeholder="请输入到货单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 			<el-form-item label="物料编码" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -110,8 +117,7 @@
 
 		<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-
-
+      <el-table-column label="送货单号" align="center" prop="orderNo" width="180"/>
 			<el-table-column label="采购订单号" align="center" prop="poNo" width="180"/>
       <el-table-column label="单据状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
diff --git a/src/views/wms/outorderzs/index.vue b/src/views/wms/outorderzs/index.vue
index 2786d3c..b4d3d7d 100644
--- a/src/views/wms/outorderzs/index.vue
+++ b/src/views/wms/outorderzs/index.vue
@@ -1,13 +1,16 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
-			<el-form-item label="领料单号" prop="produceCode">
-				<el-input v-model="queryParams.produceCode" placeholder="请输入领料单号" clearable
+      <el-form-item label="出库单" prop="userDefined4">
+        <el-input v-model="queryParams.userDefined4" placeholder="请输入出库单" clearable
+                  @keyup.enter.native="handleQuery" />
+      </el-form-item>
+			<el-form-item label="生产订单" prop="produceCode">
+				<el-input v-model="queryParams.produceCode" placeholder="请输入生产订单" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
-			<el-form-item label="型号编码" prop="materialCode">
-				<el-input v-model="queryParams.userDefined1" placeholder="请输入型号编码" clearable
+			<el-form-item label="物料编码" prop="materialCode">
+				<el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
 			<!-- <el-form-item label="型号名称" prop="materialDesc">
@@ -45,8 +48,8 @@
 			<el-table-column label="序号" type="index"  v-if="false" />
 			<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
 			<el-table-column label="ID" align="center" prop="ID" v-if="false" />
-			<el-table-column label="出库单号" align="center" prop="produceCode" width="250"/>
-
+      <el-table-column label="出库单" align="center" prop="userDefined4" width="250"/>
+			<el-table-column label="生产订单" align="center" prop="produceCode" width="250"/>
       <el-table-column label="物料编码" align="center" prop="materialCode" width="250">
         <template slot-scope="scope">
           <span>{{ formatProductCode(scope.row.materialCode) }}</span>
diff --git a/src/views/wms/put/index.vue b/src/views/wms/put/index.vue
index 5b8bfcb..cf35a88 100644
--- a/src/views/wms/put/index.vue
+++ b/src/views/wms/put/index.vue
@@ -464,6 +464,27 @@
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
+
+    <el-dialog
+      title="选择库存类型"
+      :visible.sync="dialogVisible"
+      @close="resetForm"
+    >
+      <el-form>
+        <el-form-item label="库存类型" required>
+          <el-select v-model="selectedType" placeholder="请选择库存类型">
+            <el-option label="质检" value="2"></el-option>
+            <el-option label="冻结" value="3"></el-option>
+            <el-option label="非限制" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmSelection">确认</el-button>
+      </span>
+    </el-dialog>
+
 	</div>
 </template>
 
@@ -488,6 +509,8 @@ export default {
 			total: 0,
 			// 成品生产入库表格数据
 			putList: [],
+      dialogVisible: false,  // 控制对话框的显示与隐藏
+      selectedType: '',      // 存储用户选择的库存类型
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -616,18 +639,55 @@ export default {
 			this.open = true;
 			this.title = "添加成品生产入库";
 		},
-		/** 过账按钮操作 */
-		handleUpdate(row) {
+		// /** 过账按钮操作 */
+		// handleUpdate(row) {
+    //   const ids = row.id || this.ids;
+    //   let postData = this.ids.map(id => ({ id: id }));
+    //   console.log(postData)
+    //   this.$modal.confirm('是否进行过账').then(function() {
+    //     return SAPPut(JSON.stringify(postData));
+    //   }).then(() => {
+    //     this.getList();
+    //     this.$modal.msgSuccess("过账完成");
+    //   }).catch(() => {});
+		// },
+    handleUpdate(row) {
+      // 确保 ids 是数组
       const ids = row.id || this.ids;
-      let postData = this.ids.map(id => ({ id: id }));
-      console.log(postData)
-      this.$modal.confirm('是否进行过账').then(function() {
-        return SAPPut(JSON.stringify(postData));
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("过账完成");
-      }).catch(() => {});
-		},
+
+      // 检查是否有可过账的记录
+      if (!this.ids || this.ids.length === 0) {
+        this.$message.error("没有可过账的记录");
+        return;
+      }
+
+      // 打开对话框
+      this.dialogVisible = true;
+    },
+    confirmSelection() {
+      if (!this.selectedType) {
+        this.$message.error("请选择库存类型");
+        return;
+      }
+
+      // 构造请求数据
+      const postData = this.ids.map(id => ({ id: id, attr3: this.selectedType }));
+
+      // 发送请求
+      SAPPut(JSON.stringify(postData))
+        .then(() => {
+          this.getList(); // 更新列表
+          this.$message.success("过账完成");
+          this.resetForm(); // 重置表单
+          this.dialogVisible = false; // 关闭对话框
+        })
+        .catch(error => {
+          this.$message.error("过账失败: " + error.message);
+        });
+    },
+    resetForm() {
+      this.selectedType = ''; // 重置选择
+    },
     /** 修改按钮操作 */
     handleUpdateKEN(row) {
       this.reset();