From b67bf724fc788cb3b86641c7eb7a35cdbc4c7a93 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 20:17:25 +0800
Subject: [PATCH] PO单导入功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 185 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 147 insertions(+), 38 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 32a81f3..ea2eef7 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
@@ -5,50 +5,61 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.enums.CompanysType;
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.CompanysService;
+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;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@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;
+
+ @Autowired
+ private CompanysService companysService;
@Override
public R generateBarcode(List<Long> orders) {
@@ -75,47 +86,145 @@
@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));
+ StringBuffer sbFaild = new StringBuffer();
+ for (String key : listMap.keySet()) {
+ AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
+ if (!Objects.isNull(order)) {
+ sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�");
+ throw new CoolException(sbFaild.toString());
+ }
+ 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();
+ if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
+ 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("鐗╂枡涓嶅瓨鍦�");
+ throw new CoolException(sbFaild.toString());
+ }
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
+ orderItem.setAsnId(order.getId())
+ .setAsnCode(order.getCode())
+ .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())
+ .setPoCode(orderTemplate.getPoCode())
+ .setPurUnit(orderTemplate.getPurUnit())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setSpec(matnr.getSpec())
+ .setModel(matnr.getModel())
+ .setPurQty(Double.parseDouble(orderTemplate.getPurQty()))
+ .setMaktx(matnr.getName())
+ .setMatnrCode(matnr.getCode())
+ .setMatnrId(matnr.getId())
+ .setStockUnit(matnr.getUnit());
+ if (!Objects.isNull(orderTemplate.getSplrCode())) {
+ Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
+ .eq(Companys::getCode, orderTemplate.getSplrCode()));
+ if (!Objects.isNull(companys)) {
+ orderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ } else {
+ sbFaild.append("渚涘簲鍟�:" + orderTemplate.getSplrCode()).append("涓嶅瓨鍦�");
+ throw new CoolException(sbFaild.toString());
+ }
+ } else {
+ continue;
+ }
+ items.add(orderItem);
+
+ if (!asnOrderItemService.save(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ if (!items.isEmpty()) {
+ 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::getAnfme, anfme)
+ .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("鎿嶄綔鎴愬姛锛侊紒");
+
+ return R.ok("瀵煎叆鎴愬姛锛�" + sbFaild.toString());
}
+ /**
+ * @param
+ * @param loginUserId
+ * @return
+ * @author Ryan
+ * @description ASN鏄庣粏鍗曟嵁淇濆瓨锛屽強鎵╁睍瀛楁淇濆瓨
+ * @time 2025/4/7 09:59
+ */
@Override
- public boolean fieldsSave(Map<String, Object> params) {
+ @Transactional(rollbackFor = Exception.class)
+ 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);
+ asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
+ }
+ if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
+ Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getId, asnOrderItem.getSplrCode())
+ .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val));
+ if (!Objects.isNull(companys)) {
+ asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ }
+ }
+ if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
+ throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
+ }
+// if (StringUtils.isBlank(asnOrderItem.getSplrBatch())) {
+// throw new CoolException("渚涘簲鍟嗘壒娆′笉鑳戒负绌猴紒锛�");
+// }
+ //淇濆瓨鎵╁睍瀛楁
+ try {
+ String uuid16 = CommonUtil.randomUUID16();
+ Boolean fields = FieldsUtils.saveFields(params, uuid16);
+ if (fields) {
+ asnOrderItem.setFieldsIndex(uuid16);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
if (!this.saveOrUpdate(asnOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
- }
- //淇濆瓨鎵╁睍瀛楁
- try {
- ExtendFieldsUtils.saveFields(params);
- } catch (Exception e) {
- throw new RuntimeException(e);
}
return true;
}
@@ -126,8 +235,8 @@
if (hsahMap.getRecords().isEmpty()) {
return hsahMap.setRecords(new ArrayList<>());
}
- hsahMap.setRecords(ExtendFieldsUtils.getExtendFields(hsahMap.getRecords()));
+ hsahMap.setRecords(FieldsUtils.getExtendFields(hsahMap.getRecords()));
return hsahMap;
-
}
+
}
--
Gitblit v1.9.1