From bac9fcb414ccea69b5f879c554f6ad8b28466df1 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Jun 2025 15:28:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=8E=BB=E7=BA=A4=E8=84=B1?=
 =?UTF-8?q?=E6=A8=A1=E6=B5=8B=E9=87=8F=E5=92=8C=E9=80=80=E7=81=AB=E5=B7=A5?=
 =?UTF-8?q?=E6=AE=B5=E7=9A=84=E7=89=A9=E6=96=99=E6=89=93=E5=8D=B0=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=A6=81=E5=B8=A6=E5=87=BA=E6=9D=BF=E6=AE=B5=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/inmIn.vue  | 58 +++++++++++++++++++++++++++++--------
 src/views/wpm_bx/inmOut.vue | 57 ++++++++++++++++++++++++++++--------
 2 files changed, 91 insertions(+), 24 deletions(-)

diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index 3bf7d03a..02d96aad 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -465,20 +465,54 @@ export default {
 				if(type=='wm'){
 					let params = {};
 					params.tid = row.id;
-					if(that.route_code=='paiyicibang'){
-						params.label_template_name = '排一次棒打印模板';
+					if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){	
+						params.label_template_name = '工序带板段号打印模板';
+						that.wprParams.wm = row.id;
+						let numbers = ['','','','','','',''];
+						this.$API.wpm.wpr.list.req(that.wprParams).then((res) => {
+							let leng = res.length;
+							if(leng>0){
+								let nums = leng/4;
+								for(let i=0;i<nums;i++){
+									let index = i*4;
+									if(index+3<leng){
+										numbers[i] =res[index].number+'、'+res[index+1].number+'、'+res[index+2].number+'、'+res[index+3].number;
+									}else if(index+2<leng){
+										numbers[i] =res[index].number+'、'+res[index+1].number+'、'+res[index+2].number;
+									}else if(index+1<leng){
+										numbers[i] =res[index].number+'、'+res[index+1].number;
+									}else{
+										numbers[i] =res[index].number;
+									}
+								}
+							}
+							params.extra_data={count:row.count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]};
+							that.apiObjPrint.req(params).then((res) => {
+								let obj = {};
+								obj.printer_commands = res.commands;
+								obj.printer_name = that.printer_name;
+								that.$API.wpm.prints.req(obj).then((response) => {
+									that.$message.success("打印成功");
+								});
+							})
+						})
 					}else{
-						params.extra_data={count:row.count};
-						params.label_template_name = '其他工序打印模板';
+						if(that.route_code=='paiyicibang'){
+							params.label_template_name = '排一次棒打印模板';
+						}else{
+							params.extra_data={count:row.count};
+							params.label_template_name = '其他工序打印模板';
+						}
+						that.apiObjPrint.req(params).then((res) => {
+							let obj = {};
+							obj.printer_commands = res.commands;
+							obj.printer_name = that.printer_name;
+							that.$API.wpm.prints.req(obj).then((response) => {
+								that.$message.success("打印成功");
+							});
+						})
 					}
-					that.apiObjPrint.req(params).then((res) => {
-						let obj = {};
-						obj.printer_commands = res.commands;
-						obj.printer_name = that.printer_name;
-						that.$API.wpm.prints.req(obj).then((response) => {
-							that.$message.success("打印成功");
-						});
-					})
+					
 				}else if(type=='wpr'){
 					let params = {};
 					let name = row.material_name.split('|')[0];
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index a6997cfd..1d657f86 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -466,20 +466,53 @@ export default {
 				if(type=='wm'){
 					let params = {};
 					params.tid = row.id;
-					if(that.route_code=='paiyicibang'){
-						params.label_template_name = '排一次棒打印模板';
+					if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'){	
+						params.label_template_name = '工序带板段号打印模板';
+						that.wprParams.wm = row.id;
+						let numbers = ['','','','','','',''];
+						this.$API.wpm.wpr.list.req(that.wprParams).then((res) => {
+							let leng = res.length;
+							if(leng>0){
+								let nums = leng/4;
+								for(let i=0;i<nums;i++){
+									let index = i*4;
+									if(index+3<leng){
+										numbers[i] =res[index].number+'、'+res[index+1].number+'、'+res[index+2].number+'、'+res[index+3].number;
+									}else if(index+2<leng){
+										numbers[i] =res[index].number+'、'+res[index+1].number+'、'+res[index+2].number;
+									}else if(index+1<leng){
+										numbers[i] =res[index].number+'、'+res[index+1].number;
+									}else{
+										numbers[i] =res[index].number;
+									}
+								}
+							}
+							params.extra_data={count:row.count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]};
+							that.apiObjPrint.req(params).then((res) => {
+								let obj = {};
+								obj.printer_commands = res.commands;
+								obj.printer_name = that.printer_name;
+								that.$API.wpm.prints.req(obj).then((response) => {
+									that.$message.success("打印成功");
+								});
+							})
+						})
 					}else{
-						params.extra_data={count:row.count};
-						params.label_template_name = '其他工序打印模板';
+					    if(that.route_code=='paiyicibang'){
+							params.label_template_name = '排一次棒打印模板';
+						}else{
+							params.extra_data={count:row.count};
+							params.label_template_name = '其他工序打印模板';
+						}
+						that.apiObjPrint.req(params).then((res) => {
+							let obj = {};
+							obj.printer_commands = res.commands;
+							obj.printer_name = that.printer_name;
+							that.$API.wpm.prints.req(obj).then((response) => {
+								that.$message.success("打印成功");
+							});
+						})
 					}
-					that.apiObjPrint.req(params).then((res) => {
-						let obj = {};
-						obj.printer_commands = res.commands;
-						obj.printer_name = that.printer_name;
-						that.$API.wpm.prints.req(obj).then((response) => {
-							that.$message.success("打印成功");
-						});
-					})
 				}else if(type=='wpr'){
 					let params = {};
 					let name = row.material_name.split('|')[0];