From bb4eb72b95f6ed63e251e63baa4217f75b8572dd Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 8 Dec 2025 15:44:12 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9APC=E6=89=93=E5=8D=B0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MdPbGroupplateServiceImpl.java | 10 +++++++--- wms/nladmin-ui/src/views/wms/basedata/group/index.vue | 5 ++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java index b727f13..40f2f67 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java @@ -165,8 +165,12 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl set = new HashSet<>(); - set.add(dto.getGroup_id()); - delete(set); + if(ObjectUtil.isNotEmpty(dto.getOut_type()) && ObjectUtil.isNotEmpty(dto.getIs_need_delete())) { + if (dto.getOut_type().equals(IOSEnum.OUT_BILL_TYPE.code("烘干出库")) && dto.getIs_need_delete().equals(IOSConstant.ONE)) { + Set set = new HashSet<>(); + set.add(dto.getGroup_id()); + delete(set); + } + } } } diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue index 508a08b..0d961aa 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -465,8 +465,7 @@ export default { LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + row.produce_time + '') LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商名称：' + row.supp_name + '') - LODOP.ADD_PRINT_TEXT('26mm', '7mm', '60mm', '10mm', '烘干次数：' + bake_num + '') - LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '供应商编码：' + row.supp_code + '') + LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + bake_num + '') LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + row.pcsn + '') LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + row.execution_stand + '') LODOP.SET_PRINT_MODE('PRINT_SCALE', 0) @@ -474,7 +473,7 @@ export default { LODOP.PRINT()// 打印 // LODOP.PREVIEW()// 预览 - // 调用删除 + // 烘干出库且需要删除的 调用删除接口 if (row.out_type === '1004' && row.is_need_delete === '1') { crudGroup.printDelete(row).then(res => { })