From daf9f8dbb7ba36eb283221d2c6022039aefaf97d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 00:40:38 +0800
Subject: [PATCH] feat(aftersales): 售后退货单同步MES批次信息并优化工单处理流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java
index 23bc7d5..b66853b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java
@@ -70,7 +70,8 @@
// 3. 淇濆瓨鏉＄爜璁板綍
MesWmBarcodeDO barcode = BeanUtils.toBean(createReqVO, MesWmBarcodeDO.class).setContent(content)
- .setConfigId(config.getId()).setFormat(config.getFormat());
+ .setConfigId(config.getId()).setFormat(config.getFormat())
+ .setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
barcodeMapper.insert(barcode);
return barcode.getId();
}
@@ -141,7 +142,7 @@
if (barcode == null) {
return;
}
- if (ObjUtil.notEqual(barcode, id)) {
+ if (ObjUtil.notEqual(barcode.getId(), id)) {
throw exception(WM_BARCODE_ALREADY_EXISTS);
}
}
@@ -241,6 +242,10 @@
// 1. 浼樺厛鎸夋潯鐮佸唴瀹圭簿纭懡涓凡鏈夋潯鐮佽褰�
MesWmBarcodeDO barcode = barcodeMapper.selectByContent(content);
if (barcode != null) {
+ // 鍋滅敤鍙奖鍝嶅悗缁娇鐢紝涓嶅垹闄ゅ巻鍙茶褰曞拰杩芥函鏁版嵁
+ if (!CommonStatusEnum.isEnable(barcode.getStatus())) {
+ throw exception(WM_BARCODE_DISABLED);
+ }
Map<String, Object> result = new LinkedHashMap<>();
result.put("matched", true);
result.put("barcodeId", barcode.getId());
--
Gitblit v1.9.3