From 46b43df315bb6ce06a39394369b80398820a5a73 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 18 Apr 2025 10:33:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?wms=E7=89=B9=E6=AE=8A=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9--=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E6=97=B6=E5=80=99=E6=B7=BB=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E6=80=BB=E8=B4=A6=E7=A7=91=E7=9B=AE=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/outorderTS/index.vue | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/outorderTS/index.vue b/src/views/wms/outorderTS/index.vue
index 639c53c..d88deb2 100644
--- a/src/views/wms/outorderTS/index.vue
+++ b/src/views/wms/outorderTS/index.vue
@@ -57,14 +57,15 @@
 			<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="userDefined1" width="250"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode" width="250">
+      <el-table-column label="出库单号" align="center" prop="produceCode" width="150"/>
+      <el-table-column label="批次" align="center" prop="userDefined1" width="150"/>
+      <el-table-column label="总账科目编号" align="center" prop="userDefined2" width="150"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" width="180">
         <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="180"/>
 			<el-table-column label="单位" align="center" prop="userDefined1" v-if="false" />
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="出库数量" align="center" prop="outNumber" />
@@ -78,16 +79,16 @@
       <el-table-column label="类型" align="center" prop="userDefined6" />
 			<el-table-column label="成品中心" align="center" prop="userDefined3" />
 
-			<el-table-column label="sap过账状态" align="center" prop="userDefined10">
+			<el-table-column label="sap过账状态" align="center" prop="userDefined10"  >
 				<template slot-scope="scope">
 					<span v-if="scope.row.userDefined10 === '1'">未过账</span>
 					<span v-else-if="scope.row.userDefined10 === '2'">过账成功</span>
 					<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="180"/>
 
-      <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />
+      <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" width="180" />
 			<el-table-column label="操作人" align="center" prop="createBy" />
 			<el-table-column label="操作时间" align="center" prop="createDate" width="180">
 				<template slot-scope="scope">
@@ -127,11 +128,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="10" class="mb8">
-<!--          <el-col :span="6">-->
-<!--            <el-form-item label="总账科目编号">-->
-<!--              <el-input v-model="queryParams1.accountingSubject" placeholder="总账科目编号"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="6">
+            <el-form-item label="总账科目编号">
+              <el-input v-model="queryParams1.userDefined2" placeholder="总账科目编号"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="收货方">
               <el-input v-model="queryParams1.receiver" placeholder="收货方"></el-input>
@@ -173,6 +174,7 @@
               <span>{{ formatProductCode(scope.row.materialCode) }}</span>
             </template>
           </el-table-column>
+
           <el-table-column label="单位" align="center" prop="userDefined1" />
           <el-table-column label="计划数量" align="center" width="180">
             <template slot-scope="scope">
@@ -447,7 +449,7 @@ export default {
 				produceCode: '',
 				warehouseNo: '',
         planDateMax: '',
-        accountingSubject: '', // 总账科目编号
+        userDefined2: '', // 总账科目编号
         receiver: '', // 收货方
         productionDate: '', // 生产日期
         shelfLifeExpiryDate: '' ,// 货架寿命到期日
@@ -959,7 +961,7 @@ export default {
         // unit: item.unit,
         planNumber: item.planNumber,  // 计划数量
         locCode: this.queryParams1.warehouseNo,  // 仓库编码
-        userDefined2: this.queryParams1.accountingSubject,  // 总账科目编号
+        userDefined2: this.queryParams1.userDefined2,  // 总账科目编号
         userDefined4: this.queryParams1.receiver,  // 收货方
         planDate: this.queryParams1.productionDate,  // 生产日期
         userDefined5: this.queryParams1.shelfLifeExpiryDate,  // 货架寿命到期日

From 7083d3e8eb752e8bf4d2207347feeb7b16e0ea75 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Sat, 19 Apr 2025 10:38:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?wms=E7=89=B9=E6=AE=8A=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/outorderTS/index.vue | 66 +++++++++++++++---------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/views/wms/outorderTS/index.vue b/src/views/wms/outorderTS/index.vue
index d88deb2..d72be9e 100644
--- a/src/views/wms/outorderTS/index.vue
+++ b/src/views/wms/outorderTS/index.vue
@@ -48,6 +48,18 @@
 				<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
 					v-hasPermi="['wms:outorder:export']">导出</el-button>
 			</el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          :disabled="single"
+          icon="el-icon-download"
+          size="mini"
+          @click="showPrint"
+          v-hasPermi="['mes:prepare:export']"
+        >打印特殊退货单</el-button>
+      </el-col>
+
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 		<el-table v-loading="loading" :data="outorderList" @selection-change="handleSelectionChange"
@@ -248,7 +260,7 @@
 
     <!-- 打印预览弹出层(生产物料) -->
     <el-dialog
-      title="退料单打印"
+      title="特殊出库单打印"
       :visible.sync="printDialogVisible"
       :width="shengchan?'861px':'871px'"
     >
@@ -257,40 +269,29 @@
         <el-form :model="form">
           <!-- 表头-工单信息 -->
           <!-- 导航栏 -->
-          <el-row class="my-print-nav">
-            <el-col :span="24">
-              <div style="display: flex; justify-content: flex-end;">
-                <div class="my-print-barcode" :width="shengchan ? '631px' : '621px'">
-                  <svg id="barcode"></svg>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-
           <!-- 主数据 -->
 
             <!-- 表头-工单信息 -->
             <el-row>
               <div class="my-print-head">
                 <el-col :span="24" style="text-align: center;">
-                  <h3 style="margin: 0;">普通领料/退料单</h3>
-                  <div style="margin-top: 10px;">
-                    <span>领料</span>
-                    <span style="margin-left: 20px;">退料 <span style="color: green;">✓</span></span>
-                  </div>
+                  <h3 style="margin: 0; display: flex; align-items: center; justify-content: center; text-align: center; margin-left: 160px;">
+                    特殊出库单
+                    <svg id="barcode" style="margin-left: 10px;"></svg>
+                  </h3>
                 </el-col>
               </div>
             </el-row>
             <!-- 导航栏 -->
             <el-row class="my-print-nav">
-              <el-col :span="6">领料单:{{printData.factory}}</el-col>
+              <el-col :span="6">领料单:{{printData.produceCode}}</el-col>
               <el-col :span="6">工厂编码:{{printData.factory}}</el-col>
               <el-col :span="6">库存地点:</el-col>
               <el-col :span="6">发料日期:</el-col>
               <el-col :span="6">打印日期:{{printData.printDate}}</el-col>
             </el-row>
             <el-row class="my-print-nav">
-              <el-col :span="6">成本中心编码:</el-col>
+              <el-col :span="6">成本中心编码:{{printData.userDefined3}}</el-col>
               <el-col :span="6">成本中心:</el-col>
               <el-col :span="6">移动类型:</el-col>
               <el-col :span="6">物料凭证:</el-col>
@@ -298,13 +299,13 @@
             <el-table
               v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table" :data="printData.workTable"
               border style="width: 1000px;padding-bottom: 1px;">
-              <el-table-column prop="materialCode" label="物料编码" :width="150" :formatter="productCodeFormate"></el-table-column>
-              <el-table-column prop="materialDesc" label="物料描述" :width="200"></el-table-column>
-              <el-table-column prop="userDefined1" width="55" label="单位"></el-table-column>
-              <el-table-column prop="userDefined5" width="165" label="批号"></el-table-column>
-              <el-table-column prop="quantity" label="计划数量"  width="100"></el-table-column>
-              <el-table-column prop="planNumber" width="75" label="实发数量"></el-table-column>
-              <el-table-column prop="routeCode" width="75" label="备注"></el-table-column>
+              <el-table-column prop="materialCode" label="物料编码" :width="140" :formatter="productCodeFormate"></el-table-column>
+              <el-table-column prop="materialDesc" label="物料描述" :width="230"></el-table-column>
+              <el-table-column prop="userDefined1" width="150" label="批号"></el-table-column>
+              <el-table-column prop="userDefined2" width="150" label="总账科目编号"></el-table-column>
+              <el-table-column prop="planNumber" label="计划数量"  width="75"></el-table-column>
+              <el-table-column prop="outNumber" width="75" label="实发数量"></el-table-column>
+<!--              <el-table-column prop="routeCode" width="75" label="备注"></el-table-column>-->
             </el-table>
             <!-- 底部 -->
             <el-row class="my-print-foot0">
@@ -779,16 +780,17 @@ export default {
         let queryParams = {
           produceCode: this.outorderList[0].produceCode
       };
-      listReturnDY(queryParams).then(response => {
+      listckTS(queryParams).then(response => {
         this.showWorkorderCode = true;
         this.printData.printTitle = '订单物料';
-        this.printData.factory = response.data[0].siteCode
+        this.printData.factory = response.rows[0].siteCode
         //this.printData.productDate = response.data.mesPrepareDetailList[0].productDate
         this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
-        this.printData.produceCode = response.data[0].produceCode
-        this.printData.workTable = response.data;
-        this.printData.pageNo = response.data.length;
-        this.printData.createBy=     response.data[0].createBy;
+        this.printData.produceCode = response.rows[0].produceCode
+        this.printData.userDefined3 = response.rows[0].userDefined3
+        this.printData.workTable = response.rows;
+        this.printData.pageNo = response.rows.length;
+        this.printData.createBy=     response.rows[0].createBy;
         // let chunkedArray = [];
         // console.log(this.printData.workTable[0].produceCode)
         // //遍历this.printData.workTable
@@ -802,7 +804,7 @@ export default {
         // }
       //  this.printData.workTable = chunkedArray;
         console.log(this.printData.workTable[0].produceCode)
-        this.printData.produceCode = response.data.produceCode
+        this.printData.produceCode = response.rows[0].produceCode
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 

From b98e55ae858f21e27377d6fc5a388e192ec24b63 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Sat, 19 Apr 2025 10:40:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?wms=E7=89=B9=E6=AE=8A=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/outorderTS/index.vue b/src/views/wms/outorderTS/index.vue
index d72be9e..9c414fa 100644
--- a/src/views/wms/outorderTS/index.vue
+++ b/src/views/wms/outorderTS/index.vue
@@ -268,7 +268,7 @@
 
         <el-form :model="form">
           <!-- 表头-工单信息 -->
-          <!-- 导航栏 -->
+          <!-- 导航栏 s-->
           <!-- 主数据 -->
 
             <!-- 表头-工单信息 -->