From de2365da21526a6af8e0c1504ed489dcc3617de9 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期一, 07 四月 2025 20:45:55 +0800
Subject: [PATCH] #修改 任务主单明细显示优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 3a98a42..74ddb6e 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
@@ -13,7 +13,9 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
@@ -103,21 +105,36 @@
return R.ok("鎿嶄綔鎴愬姛锛侊紒");
}
+ /**
+ * @author Ryan
+ * @description ASN鏄庣粏鍗曟嵁淇濆瓨锛屽強鎵╁睍瀛楁淇濆瓨
+ * @param
+ * @return
+ * @time 2025/4/7 09:59
+ */
@Override
- public boolean fieldsSave(Map<String, Object> params) {
+ @Transactional(rollbackFor = Exception.class)
+ public boolean fieldsSave(Map<String, Object> 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("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
+ throw new CoolException("璁″垝鏀惰揣鏁颁笉鑳戒负绌猴紒锛�");
}
//淇濆瓨鎵╁睍瀛楁
try {
- ExtendFieldsUtils.saveFields(params);
+ String uuid16 = CommonUtil.randomUUID16();
+ Boolean fields = FieldsUtils.saveFields(params, uuid16);
+ if (fields) {
+ asnOrderItem.setFieldsIndex(uuid16);
+ }
} catch (Exception e) {
throw new RuntimeException(e);
+ }
+ if (!this.saveOrUpdate(asnOrderItem)) {
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
return true;
}
@@ -128,7 +145,7 @@
if (hsahMap.getRecords().isEmpty()) {
return hsahMap.setRecords(new ArrayList<>());
}
- hsahMap.setRecords(ExtendFieldsUtils.getExtendFields(hsahMap.getRecords()));
+ hsahMap.setRecords(FieldsUtils.getExtendFields(hsahMap.getRecords()));
return hsahMap;
}
--
Gitblit v1.9.1