From 7f9fa6378436a22a6b7df8c8ddb3af83f42c7d8b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:11 +0800
Subject: [PATCH] #优化修改 1. 再次收货，先收货30再次收货30累加才对 2. 批次号整个流程走不通 3. 任务工作档排序，最新的永远在最上面
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 13 ++++++++-----
1 files changed, 8 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 768ef85..40753d9 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
@@ -35,7 +35,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -94,7 +93,7 @@
for (String key : listMap.keySet()) {
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
- if (Objects.isNull(asnOrder)) {
+ if (!Objects.isNull(asnOrder)) {
continue;
}
AsnOrder order = new AsnOrder();
@@ -153,6 +152,7 @@
/**
* @param
+ * @param loginUserId
* @return
* @author Ryan
* @description ASN鏄庣粏鍗曟嵁淇濆瓨锛屽強鎵╁睍瀛楁淇濆瓨
@@ -160,16 +160,19 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean fieldsSave(Map<String, Object> params) {
+ public boolean fieldsSave(Map<String, Object> params, Long loginUserId) {
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
+ asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
- ;
}
if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
- throw new CoolException("璁″垝鏀惰揣鏁颁笉鑳戒负绌猴紒锛�");
+ throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
}
+// if (StringUtils.isBlank(asnOrderItem.getSplrBatch())) {
+// throw new CoolException("渚涘簲鍟嗘壒娆′笉鑳戒负绌猴紒锛�");
+// }
//淇濆瓨鎵╁睍瀛楁
try {
String uuid16 = CommonUtil.randomUUID16();
--
Gitblit v1.9.1