From 6d6a1b26fcdad0ae743a6e99c8f321969bd2345f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 16:26:16 +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/PurchaseItemServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 10f5477..29370c0 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
@@ -5,13 +5,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.OrderSourceType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.Purchase;
-import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.PurchaseTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.mapper.PurchaseItemMapper;
@@ -30,7 +30,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -73,6 +73,8 @@
}
PurchaseTemplate template = list.stream().findFirst().get();
Purchase purchase = new Purchase();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = dateFormat.parse(template.getArrTime());
BeanUtils.copyProperties(template, purchase);
purchase.setCode(template.getPoCode());
if (StringUtils.isBlank(template.getPoCode())) {
@@ -81,7 +83,8 @@
}
purchase.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()))
- .setSource(template.getSource())
+ .setSource(OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.desc)
+ .setPreArr(date)
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
if (!purchaseService.save(purchase)) {
@@ -101,13 +104,12 @@
.setMatnrCode(matnr.getCode())
.setPlatItemId(template.getPlatItemId())
.setAnfme(template.getAnfme())
- .setQty(template.getQty())
.setPurchaseId(purchase.getId())
+ .setUnit(matnr.getUnit())
.setNromQty(matnr.getNromNum())
.setSplrBatch(template.getSplrBatch())
.setCreateBy(loginUserId)
- .setUpdateBy(loginUserId)
- .setUnit(template.getUnit());
+ .setUpdateBy(loginUserId);
if (StringUtils.isNotBlank(purchaseTemplate.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
@@ -128,8 +130,7 @@
}
double anfmes = items.stream().mapToDouble(PurchaseItem::getAnfme).sum();
- double qty = items.stream().mapToDouble(PurchaseItem::getQty).sum();
- purchase.setAnfme(anfmes).setQty(qty);
+ purchase.setAnfme(anfmes);
if (!purchaseService.updateById(purchase)) {
throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
--
Gitblit v1.9.1