From 1d71e8d6e37f7e992c9db9a77b9be86cb240afa1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 11:00:28 +0800
Subject: [PATCH] #修改 1. 收货通知单导入报错问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 31 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 1b6da75..2edc657 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,30 +9,27 @@
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.dto.PoItemsDto;
-import com.vincent.rsf.server.api.service.ReportMsgService;
+import com.vincent.rsf.server.api.entity.enums.OrderType;
+import com.vincent.rsf.server.api.entity.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;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
-import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.PurchaseService;
+import com.vincent.rsf.server.manager.service.AsnOrderService;
+import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
-import com.vincent.rsf.server.system.utils.ExtendFieldsUtils;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,14 +42,19 @@
@Service("asnOrderItemService")
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements AsnOrderItemService {
- @Resource
- private AsnOrderMapper asnOrderMapper;
+ @Autowired
+ private AsnOrderService asnOrderMapper;
@Autowired
private FieldsService fieldsService;
@Autowired
private FieldsItemService fieldsItemService;
+ @Autowired
+ private MatnrService matnrService;
+
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
@Override
public R generateBarcode(List<Long> orders) {
@@ -79,46 +81,89 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception {
+ public R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
if (result.getList().isEmpty()) {
throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
}
- if (!Objects.isNull(hashMap.get("asnId"))) {
- throw new CoolException("涓诲崟ID涓虹┖锛屾棤娉曟搷浣滐紒锛�");
+ if (result.getList().isEmpty()) {
+ throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder order = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, hashMap.get("asnId")));
- if (Objects.isNull(order)) {
- throw new CoolException("ASN鍗曟嵁涓嶅瓨鍦紒锛�");
+ List<AsnOrderTemplate> resultList = result.getList();
+ Map<String, List<AsnOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(AsnOrderTemplate::getCode));
+ 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)) {
+ continue;
+ }
+ AsnOrder order = new AsnOrder();
+ order.setCode(template.getCode())
+ .setPoCode(template.getPoCode())
+ .setMemo(template.getMemo())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setPoId(Long.parseLong(template.getPoId()))
+ .setType(OrderType.getTypeVal(template.getType()))
+ .setWkType(OrderWorkType.getWorkType(template.getWkType()));
+ if (!asnOrderMapper.save(order)) {
+ throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+ List<AsnOrderItem> items = new ArrayList<>();
+ for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
+ AsnOrderItem orderItem = new AsnOrderItem();
+ Matnr matnr = null;
+ if (!Objects.isNull(orderTemplate.getMatnrCode()) || StringUtils.isNotBlank(orderTemplate.getMatnrCode())) {
+ matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, orderTemplate.getMatnrCode()));
+ }
+ orderItem.setAsnId(order.getId())
+ .setAsnCode(order.getCode())
+ .setSplrBatch(orderTemplate.getSplrBatch())
+ .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
+ .setQty(Double.parseDouble(orderTemplate.getQty()))
+ .setSplrName(orderTemplate.getSplrName())
+ .setSplrCode(orderTemplate.getSplrCode())
+ .setPoCode(orderTemplate.getPoCode())
+ .setMaktx(orderTemplate.getMaktx())
+ .setMatnrCode(orderTemplate.getMatnrCode())
+ .setPurUnit(orderTemplate.getPurUnit())
+ .setPurQty(Double.parseDouble(orderTemplate.getPurQty()));
+ if (!Objects.isNull(matnr)) {
+ orderItem.setMaktx(matnr.getName()).setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
+ }
+ items.add(orderItem);
+ if (!asnOrderItemService.saveBatch(items)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ if (!items.isEmpty()) {
+ double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
+ double purQty = items.stream().mapToDouble(AsnOrderItem::getPurQty).sum();
+ if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>().set(AsnOrder::getQty, qty).set(AsnOrder::getAnfme, purQty).eq(AsnOrder::getId, order.getId()))) {
+ throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ }
}
- List<AsnOrderItem> itemList = new ArrayList<>();
- result.getList().forEach(template -> {
- AsnOrderItem orderItem = new AsnOrderItem();
- BeanUtils.copyProperties(template, orderItem);
- orderItem.setAsnId(order.getId())
- .setAsnCode(order.getCode());
- itemList.add(orderItem);
- });
- if (!this.saveBatch(itemList)) {
- throw new CoolException("淇濆瓨澶辫触锛侊紒");
- }
+
return R.ok("鎿嶄綔鎴愬姛锛侊紒");
}
/**
- * @author Ryan
- * @description ASN鏄庣粏鍗曟嵁淇濆瓨锛屽強鎵╁睍瀛楁淇濆瓨
* @param
* @return
+ * @author Ryan
+ * @description ASN鏄庣粏鍗曟嵁淇濆瓨锛屽強鎵╁睍瀛楁淇濆瓨
* @time 2025/4/7 09:59
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean fieldsSave(Map<String, Object> params){
+ public boolean fieldsSave(Map<String, Object> params) {
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
- asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);;
+ asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
+ ;
}
if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
throw new CoolException("璁″垝鏀惰揣鏁颁笉鑳戒负绌猴紒锛�");
--
Gitblit v1.9.1