From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java | 247 +++++++++++++++++++++++--------------------------
1 files changed, 116 insertions(+), 131 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java
index 7e59d53..0a64954 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java
@@ -10,10 +10,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.DeliveryTemplate;
-import com.vincent.rsf.server.manager.enums.CompanysType;
-import com.vincent.rsf.server.manager.enums.OrderType;
-import com.vincent.rsf.server.manager.enums.OrderWorkType;
-import com.vincent.rsf.server.manager.enums.QlyIsptResult;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.DeliveryItemMapper;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.DeliveryItemService;
@@ -25,6 +22,7 @@
import org.apache.commons.lang3.StringUtils;
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 java.io.IOException;
@@ -44,7 +42,6 @@
@Autowired
private DeliveryItemService deliveryItemService;
-// private
/**
* excel DO鍗曞鍏�
*
@@ -53,130 +50,118 @@
* @param loginUserId
* @return
*/
-// @Override
-// public R excelImport(MultipartFile file, Map<String, Object> hashMap, Long loginUserId) throws Exception {
-// ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), DeliveryTemplate.class, ExcelUtil.getDefaultImportParams());
-// if (result.getList().isEmpty()) {
-// throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
-// }
-// List<DeliveryTemplate> resultList = result.getList();
-// Map<String, List<DeliveryTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(DeliveryTemplate::getDoCode));
-// StringBuffer sbFaild = new StringBuffer();
-// for (String key : listMap.keySet()) {
-// if (StringUtils.isBlank(key)) {
-// throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
-// }
-// DeliveryTemplate template = listMap.get(key).stream().findFirst().get();
-// Delivery order = deliveryService.getOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, key));
-// if (!Objects.isNull(order)) {
-// sbFaild.append(template.getDoCode()).append(",宸叉坊鍔狅紒锛�");
-// throw new CoolException(sbFaild.toString());
-// }
-// order = new Delivery();
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-// Date date = dateFormat.parse(template.getArrTime());
-// if (Objects.isNull(date)) {
-// throw new CoolException("鏃堕棿鏍煎紡閿欒锛侊紒");
-// }
-// if (Objects.isNull((OrderType.getTypeVal(template.getType())))) {
-// sbFaild.append(template.getDoCode()).append(",鍗曟嵁鐘舵�佷笉瀛樺湪锛侊紒");
-// throw new CoolException(sbFaild.toString());
-// }
-// if (Objects.isNull((OrderWorkType.getWorkType(template.getWkType())))) {
-// sbFaild.append(template.getDoCode()).append(",涓氬姟鐘舵�佷笉瀛樺湪锛侊紒");
-// throw new CoolException(sbFaild.toString());
-// }
-//
-// order.setCode(template.getDoCode())
-// .setPoCode(template.getPoCode())
-// .setMemo(template.getMemo())
-// .setArrTime(date)
-// .setUpdateBy(loginUserId)
-// .setLogisNo(template.getLogicNo())
-// .setCreateBy(loginUserId)
-// .setType(OrderType.getTypeVal(template.getType()))
-// .setWkType(OrderWorkType.getWorkType(template.getWkType()));
-// if (!deliveryService.save(order)) {
-// throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
-// }
-// List<DeliveryItem> items = new ArrayList<>();
-// for (DeliveryTemplate orderTemplate : listMap.get(key)) {
-// DeliveryItem orderItem = new DeliveryItem();
-// if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
-// throw new CoolException(orderTemplate.getDoCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
-// }
-// if (StringUtils.isBlank(orderTemplate.getAnfme())) {
-// throw new CoolException(orderTemplate.getDoCode() + "锛氭暟閲忎笉鑳戒负绌猴紒锛�");
-// }
-// if (StringUtils.isBlank(orderTemplate.getType())) {
-// throw new CoolException(orderTemplate.getDoCode() + "锛氬崟鎹被鍨嬩笉鑳戒负绌猴紒锛�");
-// }
-// if (StringUtils.isBlank(orderTemplate.getWkType())) {
-// throw new CoolException(orderTemplate.getDoCode() + "锛氫笟鍔＄被鍨嬩笉鑳戒负绌猴紒锛�");
-// }
-//
-// 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.setDeliveryId(order.getId())
-// .setDeliveryCode(order.getCode())
-// .setSplrBatch(orderTemplate.getSplrBatch())
-// .setPlatItemId(orderTemplate.getPlatItemId())
-// .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
-// .setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
-//// .setTrackCode(trackCode)
-// .setBarcode(trackCode)
-// .setPlatOrderCode(orderTemplate.getPlatOrderCode())
-// .setPlatWorkCode(orderTemplate.getPlatWorkCode())
-// .setProjectCode(orderTemplate.getProjectCode())
-// .setPoCode(orderTemplate.getDoCode())
-// .setPurUnit(matnr.getUnit())
-// .setCreateBy(loginUserId)
-// .setUpdateBy(loginUserId)
-// .setSpec(matnr.getSpec())
-// .setModel(matnr.getModel())
-// .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 (!deliveryItemService.save(orderItem)) {
-// throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
-// }
-// }
-// if (!items.isEmpty()) {
-//// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
-// double anfme = items.stream().mapToDouble(DeliveryItem::getAnfme).sum();
-// if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
-//// .set(AsnOrder::getQty, qty)
-// .set(Delivery::getAnfme, anfme)
-// .eq(Delivery::getId, order.getId()))) {
-// throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
-// }
-// }
-//
-//
-// }
-//
-//
-// return null;
-// }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R excelImport(MultipartFile file, Map<String, Object> hashMap, Long loginUserId) throws Exception {
+ ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), DeliveryTemplate.class, ExcelUtil.getDefaultImportParams());
+ if (result.getList().isEmpty()) {
+ throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
+ }
+ List<DeliveryTemplate> resultList = result.getList();
+ Map<String, List<DeliveryTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(DeliveryTemplate::getDoCode));
+ StringBuffer sbFaild = new StringBuffer();
+ for (String key : listMap.keySet()) {
+ if (StringUtils.isBlank(key)) {
+ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
+ }
+ DeliveryTemplate template = listMap.get(key).stream().findFirst().get();
+ Delivery order = deliveryService.getOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, key));
+ if (!Objects.isNull(order)) {
+ sbFaild.append(template.getDoCode()).append(",宸叉坊鍔狅紒锛�");
+ throw new CoolException(sbFaild.toString());
+ }
+ order = new Delivery();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = dateFormat.parse(template.getArrTime());
+ if (Objects.isNull(date)) {
+ throw new CoolException("鏃堕棿鏍煎紡閿欒锛侊紒");
+ }
+ if (Objects.isNull((OrderType.getTypeVal(template.getType())))) {
+ sbFaild.append(template.getDoCode()).append(",鍗曟嵁鐘舵�佷笉瀛樺湪锛侊紒");
+ throw new CoolException(sbFaild.toString());
+ }
+ if (Objects.isNull((OrderWorkType.getWorkType(template.getWkType())))) {
+ sbFaild.append(template.getDoCode()).append(",涓氬姟鐘舵�佷笉瀛樺湪锛侊紒");
+ throw new CoolException(sbFaild.toString());
+ }
+
+ order.setCode(template.getDoCode())
+ .setType(OrderType.getTypeVal(template.getType()))
+ .setWkType(OrderWorkType.getWorkType(template.getWkType()))
+ .setMemo(template.getMemo())
+ .setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.desc)
+ .setAnfme(Double.parseDouble(template.getAnfme()))
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId);
+ if (!deliveryService.save(order)) {
+ throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+ List<DeliveryItem> items = new ArrayList<>();
+ for (DeliveryTemplate orderTemplate : listMap.get(key)) {
+ DeliveryItem orderItem = new DeliveryItem();
+ if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
+ throw new CoolException(orderTemplate.getDoCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (StringUtils.isBlank(orderTemplate.getAnfme())) {
+ throw new CoolException(orderTemplate.getDoCode() + "锛氭暟閲忎笉鑳戒负绌猴紒锛�");
+ }
+ if (StringUtils.isBlank(orderTemplate.getType())) {
+ throw new CoolException(orderTemplate.getDoCode() + "锛氬崟鎹被鍨嬩笉鑳戒负绌猴紒锛�");
+ }
+ if (StringUtils.isBlank(orderTemplate.getWkType())) {
+ throw new CoolException(orderTemplate.getDoCode() + "锛氫笟鍔＄被鍨嬩笉鑳戒负绌猴紒锛�");
+ }
+
+ 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());
+ }
+ if (!matnr.getName().equals(orderTemplate.getMaktx())) {
+ throw new CoolException("瀵煎叆鐗╂枡鍚嶇О涓庡簱鍐呭悕绉颁笉涓�鑷达紒锛�");
+ }
+ orderItem.setDeliveryId(order.getId())
+ .setDeliveryCode(order.getCode())
+ .setSplrBatch(orderTemplate.getSplrBatch())
+ .setPlatItemId(orderTemplate.getPlatItemId())
+ .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
+ .setUnit(matnr.getUnit())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setSplrBatch(orderTemplate.getSplrBatch())
+ .setMaktx(matnr.getName())
+ .setMatnrCode(matnr.getCode())
+ .setMatnrId(matnr.getId());
+ 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 (!deliveryItemService.save(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ if (!items.isEmpty()) {
+ Double anfme = items.stream().mapToDouble(DeliveryItem::getAnfme).sum();
+ if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
+ .set(Delivery::getAnfme, anfme)
+ .eq(Delivery::getId, order.getId()))) {
+ throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ }
+ }
+
+ return null;
+ }
}
--
Gitblit v1.9.1