From e6ad5f2957e3024eccb0128203d41f74cbd683ce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 21 七月 2025 08:51:07 +0800
Subject: [PATCH] 问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
index 29370c0..92994bb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
@@ -63,18 +63,18 @@
throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
}
List<PurchaseTemplate> resultList = result.getList();
- Map<String, List<PurchaseTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(PurchaseTemplate::getPoCode));
+ Map<String, List<PurchaseTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(item ->
+ !Objects.isNull(item.getPoCode()) ? item.getPoCode() : SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ORDER_PO_CODE, null)
+ ));
for (String key : listMap.keySet()) {
List<PurchaseTemplate> list = listMap.get(key);
Purchase serviceOne = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, key));
if (!Objects.isNull(serviceOne)) {
-// return R.error(serviceOne.getCode() + "鍗曟嵁宸插瓨鍦紒锛�");
throw new CoolException(serviceOne.getCode() + "鍗曟嵁宸插瓨鍦紒锛�");
}
PurchaseTemplate template = list.stream().findFirst().get();
Purchase purchase = new Purchase();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- Date date = dateFormat.parse(template.getArrTime());
+ Date date = template.getArrTime();
BeanUtils.copyProperties(template, purchase);
purchase.setCode(template.getPoCode());
if (StringUtils.isBlank(template.getPoCode())) {
@@ -96,32 +96,32 @@
if (StringUtils.isBlank(purchaseTemplate.getMatnrCode())) {
throw new CoolException(purchaseTemplate.getPoCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
}
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, template.getMatnrCode()));
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, purchaseTemplate.getMatnrCode()));
if (Objects.isNull(matnr)) {
- throw new CoolException(template.getMatnrCode() + "鐗╂枡涓嶅瓨鍦紒锛�");
+ throw new CoolException(purchaseTemplate.getMatnrCode() + "鐗╂枡涓嶅瓨鍦紒锛�");
}
item.setMatnrName(matnr.getName())
.setMatnrCode(matnr.getCode())
- .setPlatItemId(template.getPlatItemId())
- .setAnfme(template.getAnfme())
+ .setPlatItemId(purchaseTemplate.getPlatItemId())
+ .setAnfme(purchaseTemplate.getAnfme())
.setPurchaseId(purchase.getId())
.setUnit(matnr.getUnit())
.setNromQty(matnr.getNromNum())
- .setSplrBatch(template.getSplrBatch())
+ .setSplrBatch(purchaseTemplate.getSplrBatch())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
if (StringUtils.isNotBlank(purchaseTemplate.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
.eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
- .eq(Companys::getCode, template.getSplrCode()));
+ .eq(Companys::getCode, purchaseTemplate.getSplrCode()));
if (!Objects.isNull(companys)) {
item.setSplrCode(companys.getCode()).setSplrName(companys.getName());
} else {
throw new CoolException("渚涘簲鍟嗭細" + template.getSplrName() + "涓嶅瓨鍦紒锛�");
}
} else {
- throw new CoolException("渚涘簲鍟嗕笉鑳戒负绌猴紒锛�");
+ throw new CoolException("渚涘簲鍟嗙紪鐮佷笉鑳戒负绌猴紒锛�");
}
if (!this.save(item)) {
throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
--
Gitblit v1.9.1