From dc9bd69da11eca75c9fd6bda25dd221494152652 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 11 Mar 2025 13:31:36 +0800
Subject: [PATCH 01/10] =?UTF-8?q?wms=E9=A1=B5=E9=9D=A2=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/outorderfc.js             | 7 +++++++
 src/views/wms/returnorderzs/index.vue | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js
index adf71e2..f9fb003 100644
--- a/src/api/wms/outorderfc.js
+++ b/src/api/wms/outorderfc.js
@@ -112,6 +112,13 @@ export function OutboundPostingzcSAP(data) {
     data: data
   });
 }
+export function OutboundPostingzcSAPTH(data) {
+  return request({
+    url: '/wms/order/OutboundPostingzcSAPTH',
+    method: 'post',
+    data: data
+  });
+}
 export function OutboundPostingzcSAPTS(data) {
   return request({
     url: '/wms/order/OutboundPostingzcSAPTS',
diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 0024b82..957dfb6 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -346,6 +346,7 @@ import {
   listReturnBC,
   OutboundPostingSAP,
   OutboundPostingzcSAP,
+  OutboundPostingzcSAPTH,
   listOutorderZC,
   listreturnderZC,
   addreturnderZC,
@@ -930,7 +931,7 @@ export default {
       let postData = this.selectabletrows.map(item => ({ id: item.id }));
 			//let postData = this.ids.map(id => ({ id: id }));
 			console.log(postData)
-      OutboundPostingzcSAP(JSON.stringify(postData)).then(response => {
+      OutboundPostingzcSAPTH(JSON.stringify(postData)).then(response => {
 				this.$modal.msgSuccess("操作完成");
 			});
 		},

From 186fd2806d6d3db7dad9230454c7eb8b236486a7 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 11 Mar 2025 13:40:13 +0800
Subject: [PATCH 02/10] =?UTF-8?q?wms=E9=A1=B5=E9=9D=A2=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/outorderTS/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/outorderTS/index.vue b/src/views/wms/outorderTS/index.vue
index cfb6fda..639c53c 100644
--- a/src/views/wms/outorderTS/index.vue
+++ b/src/views/wms/outorderTS/index.vue
@@ -71,8 +71,8 @@
 			<el-table-column label="状态" align="center" prop="orderStatus">
 				<template slot-scope="scope">
 					<span v-if="scope.row.orderStatus === '0'">未进行</span>
-					<span v-else-if="scope.row.orderStatus === '1'">进行中</span>
-					<span v-else-if="scope.row.orderStatus === '2'">完成</span>
+					<span v-else-if="scope.row.orderStatus === '2'">进行中</span>
+					<span v-else-if="scope.row.orderStatus === '3'">完成</span>
 				</template>
 			</el-table-column>
       <el-table-column label="类型" align="center" prop="userDefined6" />

From 2406761959ebd98f1cd0b5e63337e8f07bd89261 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 11 Mar 2025 15:16:45 +0800
Subject: [PATCH 03/10] =?UTF-8?q?wms=E9=A1=B5=E9=9D=A2=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/returnorderzs/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 957dfb6..3843a27 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -770,8 +770,10 @@ export default {
       this.printDialogVisible = true;
       this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
       this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
-        let queryParams = {
-          produceCode: this.outorderList[0].produceCode
+      // 根据选中的 IDs 获取数据
+      const selectedIds = this.ids; // 获取选中的 ID
+      let queryParams = {
+        produceCode: selectedIds // 根据选中的数据获取多个工单号，可以根据需要调整
       };
       listReturnDY(queryParams).then(response => {
         this.showWorkorderCode = true;

From e8085a471e2848730cea24d5c479004ee7bdfa8e Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 11 Mar 2025 15:22:26 +0800
Subject: [PATCH 04/10] =?UTF-8?q?wms=E9=A1=B5=E9=9D=A2=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B93.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/returnorderzs/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 3843a27..9d9cf6f 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -771,7 +771,7 @@ export default {
       this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
       this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
       // 根据选中的 IDs 获取数据
-      const selectedIds = this.ids; // 获取选中的 ID
+      const selectedIds = this.ids[0]; // 获取选中的 ID
       let queryParams = {
         produceCode: selectedIds // 根据选中的数据获取多个工单号，可以根据需要调整
       };

From b2e01a2b2dca441369091c3572c375efb05ca97f Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 12 Mar 2025 15:04:14 +0800
Subject: [PATCH 05/10] =?UTF-8?q?wms=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9D=A1=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/returnorderzs/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 9d9cf6f..4a7c5b4 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -773,7 +773,7 @@ export default {
       // 根据选中的 IDs 获取数据
       const selectedIds = this.ids[0]; // 获取选中的 ID
       let queryParams = {
-        produceCode: selectedIds // 根据选中的数据获取多个工单号，可以根据需要调整
+        ID: selectedIds // 根据选中的数据获取多个工单号，可以根据需要调整
       };
       listReturnDY(queryParams).then(response => {
         this.showWorkorderCode = true;
@@ -801,8 +801,7 @@ export default {
         this.printData.produceCode = response.data.produceCode
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
-
-        this.generateBarcode(this.outorderList[0].produceCode); //条码 根据工单号生成
+        this.generateBarcode(response.data[0].produceCode); //条码 根据工单号生成
       })
     },
     //产品编码格式化

From 972d1c758e1cc6c4bb9daa53bf8233cb7d4a3b77 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 12 Mar 2025 15:32:58 +0800
Subject: [PATCH 06/10] =?UTF-8?q?wms=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/outorderfc.js             | 2 +-
 src/views/wms/returnorderzs/index.vue | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js
index f9fb003..ff7a725 100644
--- a/src/api/wms/outorderfc.js
+++ b/src/api/wms/outorderfc.js
@@ -114,7 +114,7 @@ export function OutboundPostingzcSAP(data) {
 }
 export function OutboundPostingzcSAPTH(data) {
   return request({
-    url: '/wms/order/OutboundPostingzcSAPTH',
+    url: '/wms/outorder/OutboundPostingzcSAPTH',
     method: 'post',
     data: data
   });
diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 4a7c5b4..19ec5d5 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -72,10 +72,9 @@
 			<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="userDefined5" width="250"/>
+      <el-table-column label="退料单号" align="center" prop="produceCode" width="150"/>
+      <el-table-column label="出库单号" align="center" prop="userDefined4" width="150"/>
+      <el-table-column label="批次" align="center" prop="userDefined5" width="150"/>
       <el-table-column label="物料编码" align="center" prop="materialCode" width="250">
         <template slot-scope="scope">
           <span>{{ formatProductCode(scope.row.materialCode) }}</span>
@@ -84,7 +83,7 @@
 			<el-table-column label="物料名称" align="center" prop="materialDesc" width="250"/>
 			<el-table-column label="单位" align="center" prop="unit" v-if="false" />
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
-			<el-table-column label="退货数量" align="center" prop="outNumber" />
+			<el-table-column label="退货数量" align="center" prop="returnNumber" />
 <!--      <el-table-column label="报工数量" align="center" prop="bgnumber" />-->
 <!--      <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>-->
 <!--      <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>-->

From af11f2108dc6fb7d1285bd00997e7c2e84f679ae Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 12 Mar 2025 16:05:15 +0800
Subject: [PATCH 07/10] =?UTF-8?q?wms=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E7=94=9F=E6=88=90=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E5=BC=B9=E7=AA=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=89=94=E9=99=A4=E5=8F=8D=E5=86=B2=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/outorderfc.js             | 8 ++++++++
 src/views/wms/returnorderzs/index.vue | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js
index ff7a725..fcce42c 100644
--- a/src/api/wms/outorderfc.js
+++ b/src/api/wms/outorderfc.js
@@ -24,6 +24,14 @@ export function listOutorderZC(query) {
     params: query
   });
 }
+// 查询包材出库单列表去除反冲的
+export function listOutorderZCTC(query) {
+  return request({
+    url: '/wms/outorder/listZCTC',
+    method: 'post',
+    params: query
+  });
+}
 // 查询包材出库单详细
 export function getOutorder(ID) {
 	return request({
diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 19ec5d5..4f96951 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -347,6 +347,7 @@ import {
   OutboundPostingzcSAP,
   OutboundPostingzcSAPTH,
   listOutorderZC,
+  listOutorderZCTC,
   listreturnderZC,
   addreturnderZC,
   getIdCardListTH,
@@ -684,7 +685,7 @@ export default {
     async fetchMaterials(pageNum = 1) { // 这里的参数名称为 pageNum
       this.loading = true; // 显示加载状态
       try {
-        const response = await listOutorderZC({
+        const response = await listOutorderZCTC({
           ...this.queryParams, // 假设 queryParams 包含其他查询条件
           pageNum: pageNum,    // 将当前页码传递给后端
           pageSize: this.pageSize // 确保将每页显示的数量传递给后端

From 3b6a9ed98e19e1fb8fef9e9dc9b9ce360a90b04b Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 17 Mar 2025 10:55:21 +0800
Subject: [PATCH 08/10] =?UTF-8?q?wms=E6=96=B0sap=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/matetowsn.js             |   8 ++
 src/views/wms/matetowsnsap/index.vue | 185 +++++++++++++--------------
 2 files changed, 98 insertions(+), 95 deletions(-)

diff --git a/src/api/wms/matetowsn.js b/src/api/wms/matetowsn.js
index 028e93a..1ab4e65 100644
--- a/src/api/wms/matetowsn.js
+++ b/src/api/wms/matetowsn.js
@@ -8,6 +8,14 @@ export function listMatetowsn(query) {
 		params: query
 	});
 }
+
+export function listsaplist(query) {
+  return request({
+    url: '/wms/matetowsn/saplist',
+    method: 'get',
+    params: query
+  });
+}
 export function cardDy(data) {
   return request({
     url: '/wms/matetowsn/cardDy',
diff --git a/src/views/wms/matetowsnsap/index.vue b/src/views/wms/matetowsnsap/index.vue
index d0efb9f..a2e5cf4 100644
--- a/src/views/wms/matetowsnsap/index.vue
+++ b/src/views/wms/matetowsnsap/index.vue
@@ -19,41 +19,35 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="批次" prop="userDefined2">
+      <el-form-item label="物料号" prop="matnr">
         <el-input
-          v-model="queryParams.userDefined2"
-          placeholder="请输入仓库"
+          v-model="queryParams.matnr"
+          placeholder="请输入物料号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-			<el-form-item label="仓库" prop="whCode">
+      <el-form-item label="批次" prop="charg">
+        <el-input
+          v-model="queryParams.charg"
+          placeholder="请输入批次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+			<el-form-item label="库存地点" prop="lgort">
 				<el-input
-					v-model="queryParams.whCode"
-					placeholder="请输入仓库"
+					v-model="queryParams.lgort"
+					placeholder="请输入库存地点"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="库区" prop="waCode">
+
+
+			<el-form-item label="物料描述" prop="maktx">
 				<el-input
-					v-model="queryParams.waCode"
-					placeholder="请输入库区"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<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">
-				<el-input
-					v-model="queryParams.materialDesc"
+					v-model="queryParams.maktx"
 					placeholder="请输入物料描述"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -103,39 +97,35 @@
               :summary-align="'center'"
     >
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="唯一序列号" align="center" prop="mateOrderInSnId"  v-if="false" />
-      <el-table-column label="送货时间" align="center" prop="gmtCreate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+			<el-table-column label="唯一序列号" align="center" prop="storageId"  v-if="false" />
+<!--      <el-table-column label="送货时间" align="center" prop="gmtCreate" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column label="物料号" align="center" prop="materialCode" width="120">
+      <el-table-column label="物料号" align="center" prop="matnr" width="120">
         <template slot-scope="scope">
-          <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+          <span>{{ formatProductCode(scope.row.matnr) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="物料描述" align="center" prop="materialDesc" width="300"/>
-      <el-table-column label="送货单" align="center" prop="poNo"  width="100"/>
-      <el-table-column label="采购单" align="center" prop="orderNo" width="100"/>
-      <el-table-column label="批次" align="center" prop="userDefined2" width="100"/>
-      <el-table-column label="入库数量" align="center" prop="amount" />
-      <el-table-column label="出库数量" align="center" prop="outNumber" />
-      <el-table-column label="剩余数量" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.amount - (scope.row.outNumber || 0) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span v-if="scope.row.outNumber === 0 || scope.row.outNumber === null">入库</span>
-          <span v-else-if="scope.row.amount - scope.row.outNumber > 0 && (scope.row.outNumber !== 0 && scope.row.outNumber !== null)">部分出库</span>
-          <span v-else>出库完成</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="标识卡" align="center" prop="wlCode" width="300"/>
-      <el-table-column label="仓库" align="center" prop="whCode" />
-      <el-table-column label="库区" align="center" prop="waCode" />
+      <el-table-column label="物料描述" align="center" prop="maktx" width="120"/>
+      <el-table-column label="工厂" align="center" prop="werks" width="80"/>
+      <el-table-column label="库存地点" align="center" prop="lgort" width="80"/>
+      <el-table-column label="批号" align="center" prop="charg" width="120"/>
+
+      <el-table-column label="物料组" align="center" prop="matkl"  width="80"/>
+      <el-table-column label="单位" align="center" prop="meins" width="80"/>
+
+      <el-table-column label="非限制库存" align="center" prop="clabs" width="120"/>
+      <el-table-column label="质检库存" align="center" prop="cinsm" width="120"/>
+      lgort
+      <el-table-column label="限制库存" align="center" prop="ceinm" width="120" />
+      <el-table-column label="冻结库存" align="center" prop="cspem" width="120" />
+
+
+<!--      <el-table-column label="仓库" align="center" prop="whCode" />-->
+<!--      <el-table-column label="库区" align="center" prop="waCode" />-->
 			<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
 			<el-table-column label="备用2" align="center" prop="userDefined2"  v-if="false" />
 			<el-table-column label="备用3" align="center" prop="userDefined3"  v-if="false" />
@@ -146,11 +136,11 @@
 			<el-table-column label="备用8" align="center" prop="userDefined8"  v-if="false" />
 			<el-table-column label="备用9" align="center" prop="userDefined9"  v-if="false" />
 			<el-table-column label="备用10" align="center" prop="userDefined10"  v-if="false" />
-			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
+<!--			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">-->
+<!--				<template slot-scope="scope">-->
+<!--					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
 			<el-table-column label="有效标记" align="center" prop="activeFlag"v-if="false" />
 			<el-table-column label="工厂号" align="center" prop="factoryCode" />
 		</el-table>
@@ -310,10 +300,10 @@
         <el-table :data="addoutorderList" @selection-change="handleSelectionChange1">
           <el-table-column type="selection" width="55" align="center" :index="indexMethod" />
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="物料描述" align="center" prop="materialDesc" width="255"/>
-          <el-table-column label="物料编码" align="center" prop="materialCode" width="150">
+          <el-table-column label="物料描述" align="center" prop="maktx" width="255"/>
+          <el-table-column label="物料编码" align="center" prop="matnr" width="150">
             <template slot-scope="scope">
-              <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+              <span>{{ formatProductCode(scope.row.matnr) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="单位" align="center" prop="userDefined1" />
@@ -345,7 +335,7 @@
         <!-- 查询条件 -->
         <el-form :inline="true" :model="queryParams" class="demo-form-inline">
           <el-form-item label="物料号">
-            <el-input v-model="queryParams.materialCode" placeholder="请输入物料号"></el-input>
+            <el-input v-model="queryParams.matnr" placeholder="请输入物料号"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="fetchMaterials">查询</el-button>
@@ -354,10 +344,10 @@
         <el-table :data="materialList" @selection-change="handleMaterialSelectionChange">
           <el-table-column type="selection" width="55" />
           <el-table-column label="ID" align="center" prop="ID" v-if="false" />
-          <el-table-column label="物料描述" prop="materialDesc" width="250"/>
-          <el-table-column label="物料编码" align="center" prop="materialCode" width="150">
+          <el-table-column label="物料描述" prop="maktx" width="250"/>
+          <el-table-column label="物料编码" align="center" prop="matnr" width="150">
             <template slot-scope="scope">
-              <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+              <span>{{ formatProductCode(scope.row.matnr) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="单位" prop="userDefined1" width="100"/>
@@ -385,7 +375,7 @@
 </template>
 
 <script>
-import { listMatetowsn,cardDy, cardBD,Removecard,getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn";
+import { listMatetowsn,listsaplist,cardDy, cardBD,Removecard,getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn";
 import {
   listOutorder,
   getOutorder,
@@ -446,23 +436,25 @@ export default {
         productionDate: '', // 生产日期
         shelfLifeExpiryDate: '' ,// 货架寿命到期日
         planDateMin: '',
-        materialCode:'',
+        matnr:'',
         costCenter: '' // 新增成本中心字段
       },
 			queryParams: {
 				pageNum: 1,
 				pageSize: 10,
 				whCode: null,
+        lgort:null,
 				waCode: null,
 				wlCode: null,
-				orderNo: null,
-				poNo: null,
+        meins: null,
+        matkl: null,
 				poLine: null,
-				materialCode: null,
-				materialDesc: null,
+        matnr: null,
+        maktx: null,
 				sn: null,
 				barCode: null,
 				amount: null,
+        charg:  null,
 				userDefined1: null,
 				userDefined2: null,
 				userDefined3: null,
@@ -495,7 +487,7 @@ export default {
 		/** 查询包材库存明细表列表 */
 		getList() {
 			this.loading = true;
-			listMatetowsn(this.queryParams).then(response => {
+      listsaplist(this.queryParams).then(response => {
 				this.matetowsnList = response.rows;
 				this.total = response.total;
 				this.loading = false;
@@ -512,7 +504,7 @@ export default {
     /** 过账按钮操作 */
     handleUpdate(row) {
       const ids = row.id || this.ids;
-      let postData = this.ids.map(id => ({ mateOrderInSnId: id }));
+      let postData = this.ids.map(id => ({ storageId: id }));
       console.log(postData)
       this.$modal.confirm('是否进行打印').then(function() {
         return cardDy(JSON.stringify(postData));
@@ -536,16 +528,19 @@ export default {
     // },
     getSummary(param) {
       const { columns, data } = param;
-      const totalAmount = data.reduce((sum, row) => sum + (row.amount || 0), 0);
-      const totalOutNumber = data.reduce((sum, row) => sum + (row.outNumber || 0), 0);
-      const totalRemaining = totalAmount - totalOutNumber;
+      const totalAmount = data.reduce((sum, row) => sum + (Number(row.clabs) || 0), 0);
+      const totalOutNumber = data.reduce((sum, row) => sum + (Number(row.cinsm) || 0), 0);
+      const totalRemaining = data.reduce((sum, row) => sum + (Number(row.ceinm) || 0), 0);
+      const totalRemacspem = data.reduce((sum, row) => sum + (Number(row.cspem) || 0), 0);
       const summary = columns.map((column, index) => {
-        if (index === 7) { // "计划数量"在第8列
+        if (index === 8) { // "计划数量"在第8列
           return totalAmount;
-        } else if (index === 8) { // "已入库数量"在第9列
+        } else if (index === 9) { // "已入库数量"在第9列
           return totalOutNumber;
-        }else if (index === 9) { // "已入库数量"在第9列
+        }else if (index === 10) { // "已入库数量"在第9列
           return totalRemaining;
+        }else if (index === 11) { // "已入库数量"在第9列
+          return totalRemacspem;
         }
         return ''; // 其余列不汇总，返回空
       });
@@ -596,7 +591,7 @@ export default {
       for (const material of this.selectedMaterials) {
         let queryParams = {
           produceCode: material.produceCode,
-          materialCode: material.materialCode
+          matnr: material.matnr
         };
 
         try {
@@ -607,9 +602,9 @@ export default {
 
           materialsToAdd.push({
             produceCode: material.produceCode,
-            materialDesc: material.materialDesc,
+            maktx: material.maktx,
             userDefined1: material.userDefined1,
-            materialCode: material.materialCode,
+            matnr: material.matnr,
             planNumber: material.planNumber, // 数量
             outNumber: material.outNumber,   // 出库数量
             bgnumber: material.bgnumber,     // 报工数量
@@ -628,7 +623,7 @@ export default {
     },
     handleRemoveBatch() {
       const ids =  this.ids;
-      let postData = this.ids.map(id => ({ mateOrderInSnId: id }));
+      let postData = this.ids.map(id => ({ storageId: id }));
       console.log(postData)
       this.$modal.confirm('是否确认删除标识卡编号为"' + wlCode + '"的数据项？').then(function() {
         return Removecard(postData);
@@ -665,15 +660,15 @@ export default {
 		// 表单重置
 		reset() {
 			this.form = {
-				mateOrderInSnId: null,
-				whCode: null,
+        storageId: null,
+        lgort: null,
 				waCode: null,
 				wlCode: null,
-				orderNo: null,
-				poNo: null,
+        meins: null,
+        matkl: null,
 				poLine: null,
-				materialCode: null,
-				materialDesc: null,
+        matnr: null,
+        maktx: null,
 				sn: null,
 				barCode: null,
 				amount: null,
@@ -709,7 +704,7 @@ export default {
 		},
 		// 多选框选中数据
 		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.mateOrderInSnId)
+			this.ids = selection.map(item => item.storageId)
 			this.single = selection.length!==1
 			this.multiple = !selection.length
 		},
@@ -741,8 +736,8 @@ export default {
         qty: item.qty,  // 计划数量
         userDefined6: this.selectedOrderType,  // 订单类型
         produceCode: item.produceCode,  // 生产代码
-        materialDesc: item.materialDesc,  // 物料描述
-        materialCode: item.materialCode,  // 物料编码
+        maktx: item.maktx,  // 物料描述
+        matnr: item.matnr,  // 物料编码
         unit: item.userDefined1,
         // 注意：根据您的描述，可能没有 unit 字段，请确认是否需要
         // unit: item.unit,
@@ -782,9 +777,9 @@ export default {
     },
 		/** 删除按钮操作 */
 		handleDelete(row) {
-			const mateOrderInSnIds = row.mateOrderInSnId || this.ids;
-			this.$modal.confirm('是否确认删除包材库存明细表编号为"' + mateOrderInSnIds + '"的数据项？').then(function() {
-				return delMatetowsn(mateOrderInSnIds);
+			const storageIds = row.storageId || this.ids;
+			this.$modal.confirm('是否确认删除包材库存明细表编号为"' + storageIds + '"的数据项？').then(function() {
+				return delMatetowsn(storageIds);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");

From b0575095529a46f8ebfc81c767142d2b96934f4b Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 17 Mar 2025 18:05:21 +0800
Subject: [PATCH 09/10] =?UTF-8?q?wms=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
 =?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/api/wms/outorderfc.js             |  7 +++++++
 src/views/wms/outorderzs/index.vue    | 12 ++++++------
 src/views/wms/returnorderzs/index.vue | 23 +++++++++++++++++++----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js
index fcce42c..3eff1f8 100644
--- a/src/api/wms/outorderfc.js
+++ b/src/api/wms/outorderfc.js
@@ -73,6 +73,13 @@ export function delOutorder(ID) {
 		method: 'delete'
 	});
 }
+export function removeReturn(data) {
+  return request({
+    url: '/wms/outorder/removeReturn',
+    method: 'post',
+    data: data
+  });
+}
 // 仓库列表
 export function getlistCK(data) {
 	return request({
diff --git a/src/views/wms/outorderzs/index.vue b/src/views/wms/outorderzs/index.vue
index b4d3d7d..06f1bff 100644
--- a/src/views/wms/outorderzs/index.vue
+++ b/src/views/wms/outorderzs/index.vue
@@ -48,19 +48,19 @@
 			<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="userDefined4" width="250"/>
-			<el-table-column label="生产订单" align="center" prop="produceCode" width="250"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode" width="250">
+      <el-table-column label="出库单" align="center" prop="userDefined4" width="150"/>
+			<el-table-column label="生产订单" align="center" prop="produceCode" width="150"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" width="150">
         <template slot-scope="scope">
           <span>{{ formatProductCode(scope.row.materialCode) }}</span>
         </template>
       </el-table-column>
-			<el-table-column label="物料名称" align="center" prop="materialDesc" width="250"/>
+			<el-table-column label="物料名称" align="center" prop="materialDesc" width="150"/>
 			<el-table-column label="单位" align="center" prop="unit" v-if="false" />
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="出库数量" align="center" prop="outNumber" />
       <el-table-column label="报工数量" align="center" prop="bgnumber" />
-      <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>
+      <el-table-column label="需求时间" align="center" prop="planDate" width="150"/>
 <!--      <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>-->
 <!--			<el-table-column label="仓库编号" align="center" prop="locCode" />-->
 <!--			<el-table-column label="库位名称" align="center" prop="locDesc" v-if="false" />-->
@@ -83,7 +83,7 @@
 					<span v-else-if="scope.row.userDefined10 === '3'">过账失败</span>
 				</template>
 			</el-table-column>
-      <el-table-column label="过账凭证" align="center" prop="userDefined9" width="250"/>
+      <el-table-column label="过账凭证" align="center" prop="userDefined9" width="150"/>
 
       <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />
 
diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 4f96951..a19704e 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -30,6 +30,18 @@
 				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
 					v-hasPermi="['wms:outorder:add']">新增</el-button>
 			</el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes:pro:workorder:remove']"
+        >删除
+        </el-button>
+      </el-col>
 			<el-col :span="1.5">
 				<el-button type="success" plain icon="el-icon-edit" size="mini" @click="handleSAP">过账</el-button>
 			</el-col>
@@ -74,8 +86,9 @@
 			<el-table-column label="id" align="center" prop="id" v-if="false" />
       <el-table-column label="退料单号" align="center" prop="produceCode" width="150"/>
       <el-table-column label="出库单号" align="center" prop="userDefined4" width="150"/>
+      <el-table-column label="生产日期" align="center" prop="needDate" width="150"/>
       <el-table-column label="批次" align="center" prop="userDefined5" width="150"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode" width="250">
+      <el-table-column label="物料编码" align="center" prop="materialCode" width="150">
         <template slot-scope="scope">
           <span>{{ formatProductCode(scope.row.materialCode) }}</span>
         </template>
@@ -108,7 +121,7 @@
 					<span v-else-if="scope.row.userDefined10 === '3'">过账失败</span>
 				</template>
 			</el-table-column>
-      <el-table-column label="过账凭证" align="center" prop="userDefined9" width="250"/>
+      <el-table-column label="过账凭证" align="center" prop="userDefined9" width="140"/>
 
       <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />
 
@@ -350,6 +363,7 @@ import {
   listOutorderZCTC,
   listreturnderZC,
   addreturnderZC,
+  removeReturn,
   getIdCardListTH,
   listReturnDY,
   listOutorderZU
@@ -977,8 +991,9 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const IDs = row.ID || this.ids;
-			this.$modal.confirm('是否确认删除包材出库单编号为"' + IDs + '"的数据项？').then(function () {
-				return delOutorder(IDs);
+			this.$modal.confirm('是否确认删除退料单编号为"' + IDs + '"的数据项？').then(function () {
+        let paramsJSON = JSON.stringify(IDs); // 将对象转换为JSON字符串
+				return removeReturn(paramsJSON);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");

From 04542c1b34e4fb8dcb41640d999070975dd48fc5 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 18 Mar 2025 11:11:37 +0800
Subject: [PATCH 10/10] =?UTF-8?q?wms=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/returnorderzs/index.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index a19704e..c4fcef6 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -26,10 +26,10 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-					v-hasPermi="['wms:outorder:add']">新增</el-button>
-			</el-col>
+<!--			<el-col :span="1.5">-->
+<!--				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
+<!--					v-hasPermi="['wms:outorder:add']">新增</el-button>-->
+<!--			</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -953,7 +953,7 @@ export default {
     async submitForm() {
       const payload = this.addoutorderList.map(item => ({
         id: item.id,
-        qty: item.qty,
+        qty: item.qty,//操作数量
         selectedBatch: item.selectedBatch,
         produceCode: item.produceCode,
         materialDesc: item.materialDesc,
@@ -965,6 +965,14 @@ export default {
       }));
 
       console.log("payload:", payload); // 使用逗号分隔符来打印对象
+      // 输入校验：检查所有项目的数量是否大于零
+      const invalidItems = payload.filter(item => item.qty <= 0);
+      if (invalidItems.length > 0) {
+        // 提示用户哪些物料的数量无效
+       // const invalidMaterialDescs = invalidItems.map(item => item.materialDesc).join(', ');
+        this.$message.error(`数量必须大于零`);
+        return; // 终止操作
+      }
 
       try {
         await this.$confirm('确认提交退货单吗?', '确认', {