From d87b636f92269b4ec97cb5ca00680409755814a9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 15:38:43 +0800 Subject: [PATCH] 收货优化修改 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 d8daa85..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,12 +160,12 @@ */ @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("璁″垝鏁颁笉鑳戒负绌猴紒锛�"); -- Gitblit v1.9.1