From be0589d61b2d13a12e0dc0f43591175bcae1261e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 10:19:07 +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 | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 9255348..13186f7 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
@@ -9,8 +9,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.CommonUtil;
@@ -38,6 +38,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -102,15 +103,20 @@
AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
if (!Objects.isNull(order)) {
sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�");
- continue;
+ throw new CoolException(sbFaild.toString());
}
order = new AsnOrder();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = dateFormat.parse(template.getArrTime());
+ if (Objects.isNull(date)) {
+ throw new CoolException("鏃堕棿鏍煎紡閿欒锛侊紒");
+ }
order.setCode(template.getCode())
.setPoCode(template.getPoCode())
.setMemo(template.getMemo())
+ .setArrTime(date)
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setPoId(Long.parseLong(template.getPoId()))
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
if (!asnOrderMapper.save(order)) {
@@ -120,13 +126,13 @@
for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
AsnOrderItem orderItem = new AsnOrderItem();
if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
- continue;
+ throw new CoolException(orderTemplate.getPoCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
}
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
.eq(Matnr::getCode, orderTemplate.getMatnrCode()));
if (Objects.isNull(matnr)) {
sbFaild.append(orderTemplate.getMatnrCode()).append("鐗╂枡涓嶅瓨鍦�");
- continue;
+ throw new CoolException(sbFaild.toString());
}
String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
orderItem.setAsnId(order.getId())
@@ -134,16 +140,14 @@
.setSplrBatch(orderTemplate.getSplrBatch())
.setPlatItemId(orderTemplate.getPlatItemId())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setQty(Double.parseDouble(orderTemplate.getQty()))
- .setTrackCode(StringUtils.isBlank(orderTemplate.getTrackCode()) ? trackCode : orderTemplate.getTrackCode())
- .setBarcode(StringUtils.isBlank(orderTemplate.getBarcode()) ? trackCode : orderTemplate.getBarcode())
+ .setTrackCode(trackCode)
+ .setBarcode(trackCode)
.setPoCode(orderTemplate.getPoCode())
- .setPurUnit(orderTemplate.getPurUnit())
+ .setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId)
.setSpec(matnr.getSpec())
.setModel(matnr.getModel())
- .setPurQty(Double.parseDouble(orderTemplate.getPurQty()))
.setMaktx(matnr.getName())
.setMatnrCode(matnr.getCode())
.setMatnrId(matnr.getId())
@@ -156,7 +160,7 @@
orderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
} else {
sbFaild.append("渚涘簲鍟�:" + orderTemplate.getSplrCode()).append("涓嶅瓨鍦�");
- continue;
+ throw new CoolException(sbFaild.toString());
}
} else {
continue;
@@ -168,10 +172,10 @@
}
}
if (!items.isEmpty()) {
- double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
+// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
double anfme = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getQty, qty)
+// .set(AsnOrder::getQty, qty)
.set(AsnOrder::getAnfme, anfme)
.eq(AsnOrder::getId, order.getId()))) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
--
Gitblit v1.9.1