From e1bf6880c9795b84d45ccdfed4e2149256155b52 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 8 Dec 2025 15:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/General/warehouse-box.vue | 21 +++++++++++++++++----
 pages/Material/hw-out-store.vue | 20 +++++++++++++++++---
 utils/getData2.js               |  6 ++++++
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue
index dfb9d65..99a293e 100644
--- a/pages/General/warehouse-box.vue
+++ b/pages/General/warehouse-box.vue
@@ -115,7 +115,7 @@
 	import {getDate} from '@/utils/utils.js'
 	const currentDate = getDate({format: true})
 	// import {queryGroupQuality, queryNowVehicle} from '@/utils/mork2.js'
-	import {queryGroupQuality, queryNowVehicle, confirmBox} from '@/utils/getData2.js'
+	import {queryGroupQuality, queryNowVehicle, confirmBox, printDelete} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -234,6 +234,16 @@
 					this.disabled = false
 				}
 			},
+			async _printDelete (data) {
+				try {
+					let res = await printDelete(data)
+					if (res) {
+						// console.log('success')
+					}
+				} catch (e) {
+					// console.log('error')
+				}
+			},
 			labelPrint () {
 				this.disabled1 = true
 				if (!this.vehicleCode || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
@@ -279,14 +289,17 @@
 				LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
 				LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商名称：' + data.supp_name)
 
-				LODOP.ADD_PRINT_TEXT('26mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
-				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '供应商编码：' + data.supp_code)
+				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
 				LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
 				LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
 				LODOP.PRINT();
 				// LODOP.PREVIEW()
+				// 调用删除
+				if (data.out_type === '1004' && data.is_need_delete === '1') {
+					this.printDelete(data)
+				}
 				uni.showToast({
-					title: '打印成功',
+					title: '操作成功',
 					icon: 'none'
 				})
 				this.disabled1 = false
diff --git a/pages/Material/hw-out-store.vue b/pages/Material/hw-out-store.vue
index 9a07b00..fae6f73 100644
--- a/pages/Material/hw-out-store.vue
+++ b/pages/Material/hw-out-store.vue
@@ -89,6 +89,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import {getInvInfoQty, materialBoxOutConfirm} from '@/utils/getData1.js'
+	import {printDelete} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -157,6 +158,16 @@
 					this.disabled = false
 				}
 			},
+			async _printDelete (data) {
+				try {
+					let res = await printDelete(data)
+					if (res) {
+						// console.log('success')
+					}
+				} catch (e) {
+					// console.log('error')
+				}
+			},
 			labelPrint () {
 				this.disabled1 = true
 				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
@@ -198,14 +209,17 @@
 				LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + data.produce_time)
 				LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商名称：' + data.supp_name)
 
-				LODOP.ADD_PRINT_TEXT('26mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
-				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '供应商编码：' + data.supp_code)
+				LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + data.bake_num)
 				LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + data.pcsn)
 				LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + data.execution_stand)
 				LODOP.PRINT();
 				// LODOP.PREVIEW()
+				// 调用删除
+				if (data.out_type === '1004' && data.is_need_delete === '1') {
+					this.printDelete(data)
+				}
 				uni.showToast({
-					title: '打印成功',
+					title: '操作成功',
 					icon: 'none'
 				})
 				this.disabled1 = false
diff --git a/utils/getData2.js b/utils/getData2.js
index 3e289f6..fcfe10d 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -21,6 +21,12 @@ export const handLogin = (user, password) => request({
 	}
 })
 
+
+// 打印删除
+export const printDelete = () => request({
+	url:'api/group/printDelete',
+	data: {}
+})
 // 查询品质类型
 export const queryGroupQuality = () => request({
 	url:'api/pdaGeneralPublic/queryGroupQuality',