From 4153937c91df7fcf6d7f70d95f6f8e03643b975d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 15:48:16 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 99cb110..32a81f3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -103,12 +103,20 @@
@Override
public boolean fieldsSave(Map<String, Object> params) {
- //淇濆瓨鎵╁睍瀛楁
- ExtendFieldsUtils.saveFields(params);
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
+ if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
+ asnOrderItem.setTrackCode(ruleCode);
+ }
if (!this.saveOrUpdate(asnOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
+ //淇濆瓨鎵╁睍瀛楁
+ try {
+ ExtendFieldsUtils.saveFields(params);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
return true;
}
--
Gitblit v1.9.1