From 98911ba7d8a9f50f48ae903775c6fba673f6f8e3 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 16:04:46 +0800
Subject: [PATCH] refactor(purchase): 重构采购退货单详情查询以使用包含扩展信息的DTO
---
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 490 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 379 insertions(+), 111 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
index 2f9d675..b00266b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
@@ -13,11 +18,11 @@
import com.ruoyi.production.bean.dto.ProductionPlanDto;
import com.ruoyi.production.bean.dto.ProductionPlanImportDto;
import com.ruoyi.production.bean.vo.ProductionPlanVo;
-import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.mapper.ProductionOrderMapper;
import com.ruoyi.production.mapper.ProductionPlanMapper;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.pojo.ProductionPlan;
+import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.production.service.ProductionPlanService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@@ -25,131 +30,217 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
- private final ProductionPlanMapper productionPlanMapper;
+ private static final int PLAN_STATUS_WAIT = 0;
+ private static final int PLAN_STATUS_PARTIAL = 1;
+ private static final int PLAN_STATUS_ISSUED = 2;
+ private final ProductionPlanMapper productionPlanMapper;
private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionOrderService productionOrderService;
+ private final ProductModelMapper productModelMapper;
+ private final ProductMapper productMapper;
@Override
public IPage<ProductionPlanVo> listPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
-
- IPage<ProductionPlanVo> planVoIPage = productionPlanMapper.listPage(page, productionPlanDto)
- .convert(dto -> {
- ProductionPlanVo vo = new ProductionPlanVo();
- BeanUtils.copyProperties(dto, vo);
- return vo;
- });
- return planVoIPage;
+ // 鍒嗛〉鏌ヨ涓荤敓浜ц鍒掑垪琛�
+ return productionPlanMapper.listPage(page, productionPlanDto);
}
/**
- * 鍚堝苟鐢熶骇璁″垝
+ * 鍚堝苟鐢熶骇璁″垝骞朵笅鍙戠敓浜ц鍗曘��
+ * 绾︽潫锛�
+ * 1. 浠呭厑璁稿悓涓�浜у搧鍨嬪彿鐨勮鍒掑悎骞讹紱
+ * 2. 宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂鐨勮鍒掍笉鍏佽鍐嶆鍚堝苟锛�
+ * 3. 涓嬪彂鏁伴噺涓嶈兘澶т簬鎵�閫夎鍒掑墿浣欓渶姹傛�婚噺锛�
+ * 4. 涓嬪彂鏃剁粺涓�璋冪敤 ProductionOrderService.saveProductionOrder锛岀‘淇濆悗缁伐鑹�/BOM/棰嗘枡閫昏緫涓�鑷淬��
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean combine(ProductionPlanDto productionPlanDto) {
- if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ // 鍩虹鍏ュ弬鏍￠獙锛氭病鏈夊彲涓嬪彂璁″垝鍒欑洿鎺ヨ繑鍥� false
+ if (productionPlanDto == null || productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return false;
}
- // 鏌ヨ涓荤敓浜ц鍒�
- List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(productionPlanDto.getIds());
-
- if (plans == null || plans.isEmpty()) {
- throw new ServiceException("涓嬪彂澶辫触,鐢熶骇璁″垝涓嶅瓨鍦�");
+ // 鍘荤┖銆佸幓閲嶏紝寰楀埌鏈鍙備笌鍚堝苟鐨勮鍒� ID
+ List<Long> planIds = productionPlanDto.getIds().stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ if (planIds.isEmpty()) {
+ throw new ServiceException("涓嬪彂澶辫触锛屾湭閫夋嫨鐢熶骇璁″垝");
}
- // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
- String firstProductName = plans.get(0).getProductName();
- if (plans.stream().anyMatch(p -> p.getProductName() == null || !p.getProductName().equals(firstProductName))) {
- throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
+ // 鏌ヨ骞舵牎楠岃鍒掓槸鍚﹂兘瀛樺湪
+ List<ProductionPlanDto> planLists = productionPlanMapper.selectWithMaterialByIds(planIds);
+ if (planLists == null || planLists.isEmpty() || planLists.size() != planIds.size()) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掍笉瀛樺湪鎴栧凡琚垹闄�");
}
- // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
- String firstProductSpec = plans.get(0).getModel();
- if (plans.stream().anyMatch(p -> p.getModel() == null || !p.getModel().equals(firstProductSpec))) {
- throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
+ // 浠ョ涓�鏉¤鍒掍綔涓哄瀷鍙峰熀鍑�
+ ProductionPlanDto firstPlan = planLists.getFirst();
+ if (firstPlan.getProductModelId() == null) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掔己灏戜骇鍝佸瀷鍙�");
}
- // 鍒涘缓鐢熶骇璁㈠崟
+ // 浠呭厑璁稿悓鍨嬪彿璁″垝鍚堝苟涓嬪彂
+ boolean hasDifferentModel = planLists.stream()
+ .anyMatch(item -> !Objects.equals(item.getProductModelId(), firstPlan.getProductModelId()));
+ if (hasDifferentModel) {
+ throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掔殑浜у搧鍨嬪彿涓嶄竴鑷�");
+ }
+
+ // 浠呪�滃凡涓嬪彂鈥濊鍒掍笉鍏佽鍐嶆鍙備笌鍚堝苟涓嬪彂锛�
+ // 鈥滃緟涓嬪彂/閮ㄥ垎涓嬪彂鈥濆厑璁哥户缁笅鍙戝墿浣欐暟閲忋��
+ boolean hasFullyIssuedPlan = planLists.stream()
+ .anyMatch(item -> item.getStatus() != null
+ && item.getStatus() == PLAN_STATUS_ISSUED);
+ if (hasFullyIssuedPlan) {
+ throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掑瓨鍦ㄥ凡涓嬪彂鐨勬暟鎹�");
+ }
+
+ // 璁＄畻鏈鍙笅鍙戠殑鍓╀綑闇�姹傛�婚噺
+ BigDecimal totalRequiredQuantity = planLists.stream()
+ .map(this::resolveRemainingQuantity)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (totalRequiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屾墍閫夌敓浜ц鍒掑墿浣欓渶姹傛�婚噺蹇呴』澶т簬0");
+ }
+
+ // 鏍￠獙涓嬪彂鏁伴噺
+ BigDecimal assignedQuantity = productionPlanDto.getTotalAssignedQuantity();
+ if (assignedQuantity == null || assignedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忓繀椤诲ぇ浜�0");
+ }
+ if (assignedQuantity.compareTo(totalRequiredQuantity) > 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庤鍒掑墿浣欓渶姹傛�婚噺");
+ }
+
+ // 鎸夎鍒掗『搴忓垎鎽婁笅鍙戞暟閲忥紝鏀堕泦瀹為檯鍙備笌涓嬪彂鐨勮鍒� ID
+ BigDecimal remainingForOrderBind = assignedQuantity;
+ List<Long> issuedPlanIds = new ArrayList<>();
+ for (ProductionPlanDto plan : planLists) {
+ BigDecimal remainingQuantity = resolveRemainingQuantity(plan);
+ if (remainingForOrderBind.compareTo(BigDecimal.ZERO) <= 0 || remainingQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ BigDecimal issueForThisPlan = remainingForOrderBind.min(remainingQuantity);
+ remainingForOrderBind = remainingForOrderBind.subtract(issueForThisPlan);
+ if (issueForThisPlan.compareTo(BigDecimal.ZERO) > 0) {
+ issuedPlanIds.add(plan.getId());
+ }
+ }
+ if (issuedPlanIds.isEmpty()) {
+ throw new ServiceException("涓嬪彂澶辫触锛屾棤鍙笅鍙戞暟閲�");
+ }
+
+ // 鐢熸垚鐢熶骇璁㈠崟涓诲崟锛屽苟缁戝畾鏈涓嬪彂鍏宠仈鐨勮鍒�
ProductionOrder productionOrder = new ProductionOrder();
- productionOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productionOrder.setProductionPlanIds(formatPlanIds(issuedPlanIds));
+ productionOrder.setProductModelId(firstPlan.getProductModelId());
+ productionOrder.setQuantity(assignedQuantity);
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
- productionOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
+ if (!productionOrderService.saveProductionOrder(productionOrder)) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍗曚繚瀛樺け璐�");
+ }
+
+ // 鍥炲啓姣忔潯璁″垝鐨勭疮璁′笅鍙戦噺鍜岀姸鎬�
+ BigDecimal remainingAssignedQuantity = assignedQuantity;
+ List<ProductionPlan> updates = new ArrayList<>();
+ for (ProductionPlanDto plan : planLists) {
+ BigDecimal requiredQuantity = Optional.ofNullable(plan.getQtyRequired()).orElse(BigDecimal.ZERO);
+ if (requiredQuantity.compareTo(BigDecimal.ZERO) < 0) {
+ requiredQuantity = BigDecimal.ZERO;
+ }
+ BigDecimal remainingQuantity = resolveRemainingQuantity(plan);
+ BigDecimal historicalIssuedQuantity = requiredQuantity.subtract(remainingQuantity);
+ BigDecimal issuedQuantity = BigDecimal.ZERO;
+ if (remainingAssignedQuantity.compareTo(BigDecimal.ZERO) > 0 && remainingQuantity.compareTo(BigDecimal.ZERO) > 0) {
+ issuedQuantity = remainingAssignedQuantity.min(remainingQuantity);
+ remainingAssignedQuantity = remainingAssignedQuantity.subtract(issuedQuantity);
+ }
+
+ BigDecimal totalIssuedQuantity = historicalIssuedQuantity.add(issuedQuantity);
+ int planStatus = resolvePlanStatus(requiredQuantity, totalIssuedQuantity);
+ ProductionPlan update = new ProductionPlan();
+ update.setId(plan.getId());
+ update.setStatus(planStatus);
+ update.setQuantityIssued(totalIssuedQuantity);
+ updates.add(update);
+ }
+ if (!updates.isEmpty()) {
+ // 鎵归噺鏇存柊璁″垝鐘舵�佷笌鏁伴噺
+ this.updateBatchById(updates);
+ }
return true;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ProductionPlanDto dto) {
- if (StringUtils.isBlank(dto.getApplyNo())) {
- throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
+ // 鏂板涓荤敓浜ц鍒�
+ if (StringUtils.isBlank(dto.getMpsNo())) {
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ dto.setMpsNo(buildPlanNo(datePrefix, resolveNextPlanSequence(datePrefix)));
+ } else {
+ checkMpsNoUnique(dto.getMpsNo(), null);
}
- checkApplyNoUnique(dto.getApplyNo(), null);
-
- dto.setStatus(0);
+ dto.setStatus(PLAN_STATUS_WAIT);
+ if (StringUtils.isBlank(dto.getSource())) {
+ dto.setSource("鍐呴儴");
+ }
return productionPlanMapper.insert(dto) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean update(ProductionPlanDto dto) {
+ // 鏇存柊涓荤敓浜ц鍒�
if (dto == null || dto.getId() == null) {
- throw new ServiceException("缂栬緫澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ throw new ServiceException("缂栬緫澶辫触锛屾暟鎹笉鑳戒负绌�");
}
ProductionPlan old = getById(dto.getId());
if (old == null) {
- throw new ServiceException("缂栬緫澶辫触,涓荤敓浜ц鍒掍笉瀛樺湪");
+ throw new ServiceException("缂栬緫澶辫触锛岀敓浜ц鍒掍笉瀛樺湪");
}
- // 鐘舵�佹牎楠�
- if (old.getStatus() != 0) {
- throw new BaseException("缂栬緫澶辫触,璇ョ敓浜ц鍒掑凡涓嬪彂鎴栭儴鍒嗕笅鍙戠姸鎬�,绂佹缂栬緫");
+ if (old.getStatus() != PLAN_STATUS_WAIT) {
+ throw new BaseException("缂栬緫澶辫触锛岃鐢熶骇璁″垝宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂锛岀姝㈢紪杈�");
}
- // applyNo鍙樻洿鎵嶆牎楠�
- if (StringUtils.isNotBlank(dto.getApplyNo())
- && !dto.getApplyNo().equals(old.getApplyNo())) {
- checkApplyNoUnique(dto.getApplyNo(), dto.getId());
+ if (StringUtils.isNotBlank(dto.getMpsNo()) && !dto.getMpsNo().equals(old.getMpsNo())) {
+ checkMpsNoUnique(dto.getMpsNo(), dto.getId());
}
return productionPlanMapper.updateById(dto) > 0;
}
- private void checkApplyNoUnique(String applyNo, Long excludeId) {
- LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(ProductionPlan::getApplyNo, applyNo);
-
- if (excludeId != null) {
- wrapper.ne(ProductionPlan::getId, excludeId);
- }
-
- if (productionPlanMapper.selectCount(wrapper) > 0) {
- throw new ServiceException("鐢宠鍗曠紪鍙� " + applyNo + " 宸插瓨鍦�");
- }
- }
-
@Override
@Transactional(rollbackFor = Exception.class)
public boolean delete(List<Long> ids) {
- // 濡傛灉瀛樺湪宸蹭笅鍙戠殑璁″垝锛屽垯涓嶈兘鍒犻櫎
- if (productionPlanMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getId, ids)).stream().anyMatch(p -> p.getStatus() == 1 || p.getStatus() == 2)) {
+ // 鍒犻櫎涓荤敓浜ц鍒�
+ if (productionPlanMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getId, ids))
+ .stream()
+ .anyMatch(p -> p.getStatus() == PLAN_STATUS_PARTIAL || p.getStatus() == PLAN_STATUS_ISSUED)) {
throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戠殑璁″垝");
}
- // 濡傛灉鏈夊叧鑱旇鍗曪紝鍒欎笉鑳藉垹闄�
- if (productionOrderMapper.selectList(Wrappers.<ProductionOrder>lambdaQuery().in(ProductionOrder::getProductionPlanIds, ids)).stream().anyMatch(p -> p.getId() != null)) {
- throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旇鍗�");
+
+ if (productionOrderMapper.selectList(Wrappers.<ProductionOrder>lambdaQuery().in(ProductionOrder::getProductionPlanIds, ids))
+ .stream()
+ .anyMatch(p -> p.getId() != null)) {
+ throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旂敓浜ц鍗�");
}
return productionPlanMapper.deleteBatchIds(ids) > 0;
@@ -158,6 +249,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void importProdData(MultipartFile file) {
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
if (file == null || file.isEmpty()) {
throw new ServiceException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
@@ -166,80 +258,256 @@
try {
list = excelUtil.importExcel(file.getInputStream());
} catch (Exception e) {
- log.error("鐢熶骇闇�姹侲xcel瀵煎叆澶辫触", e);
throw new ServiceException("Excel瑙ｆ瀽澶辫触");
}
-
if (list == null || list.isEmpty()) {
throw new ServiceException("Excel娌℃湁鏁版嵁");
}
- Set<String> applyNos = new HashSet<>();
- Set<String> materialCodes = new HashSet<>();
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ int nextSequence = resolveNextPlanSequence(datePrefix);
+ Set<String> mpsNos = new HashSet<>();
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
for (int i = 0; i < list.size(); i++) {
ProductionPlanImportDto dto = list.get(i);
- String applyNo = dto.getApplyNo();
- String materialCode = dto.getMaterialCode();
-
- if (StringUtils.isEmpty(applyNo)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
+ String mpsNo = StringUtils.trim(dto.getMpsNo());
+ if (StringUtils.isEmpty(mpsNo)) {
+ mpsNo = buildPlanNo(datePrefix, nextSequence++);
}
- if (!applyNos.add(applyNo)) {
- throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙�: " + applyNo);
+ dto.setMpsNo(mpsNo);
+ if (!mpsNos.add(mpsNo)) {
+ throw new ServiceException("瀵煎叆澶辫触锛孍xcel涓瓨鍦ㄩ噸澶嶇殑涓荤敓浜ц鍒掑彿 " + mpsNo);
}
- if (StringUtils.isEmpty(materialCode)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀墿鏂欑紪鐮佷笉鑳戒负绌�");
+ if (dto.getQtyRequired() == null || dto.getQtyRequired().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + (i + 2) + "琛岄渶姹傛暟閲忓繀椤诲ぇ浜�0");
}
-
- String strength = dto.getStrength();
- if (StringUtils.isNotEmpty(strength)) {
- if (!"A3.5".equals(strength) && !"A5.0".equals(strength)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛屽己搴﹀彧鑳芥槸 A3.5 鎴� A5.0");
- }
- }
-
- materialCodes.add(materialCode);
}
- // 鐢宠鍗曠紪鍙锋槸鍚﹀凡瀛樺湪
- Long existApplyNoCount = baseMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery()
- .in(ProductionPlan::getApplyNo, applyNos));
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
+ Long existApplyNoCount = baseMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getMpsNo, mpsNos));
if (existApplyNoCount > 0) {
- List<String> existApplyNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
- .in(ProductionPlan::getApplyNo, applyNos))
- .stream().map(ProductionPlan::getApplyNo).collect(Collectors.toList());
- throw new ServiceException("瀵煎叆澶辫触锛岀敵璇峰崟缂栧彿宸插瓨鍦�: " + String.join(", ", existApplyNos));
+ List<String> existMpsNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getMpsNo, mpsNos))
+ .stream()
+ .map(ProductionPlan::getMpsNo)
+ .collect(Collectors.toList());
+ throw new ServiceException("瀵煎叆澶辫触锛屼富鐢熶骇璁″垝鍙峰凡瀛樺湪: " + String.join(", ", existMpsNos));
}
+
+ List<ProductModel> allModels = productModelMapper.selectList(Wrappers.<ProductModel>lambdaQuery());
+ Set<Long> productIds = allModels.stream()
+ .map(ProductModel::getProductId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ Map<Long, String> productNameById = productIds.isEmpty()
+ ? Collections.emptyMap()
+ : productMapper.selectBatchIds(productIds).stream()
+ .collect(Collectors.toMap(Product::getId, Product::getProductName, (a, b) -> a));
LocalDateTime now = LocalDateTime.now();
- List<ProductionPlan> entityList = list.stream().map(dto -> {
+ List<ProductionPlan> entityList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ ProductionPlanImportDto dto = list.get(i);
ProductionPlan entity = new ProductionPlan();
BeanUtils.copyProperties(dto, entity);
- entity.setStatus(0);
+ entity.setProductModelId(resolveProductModelId(dto, i + 2, allModels, productNameById));
+ entity.setStatus(PLAN_STATUS_WAIT);
+ entity.setSource(StringUtils.isNotEmpty(dto.getSource()) ? StringUtils.trim(dto.getSource()) : "鍐呴儴");
+ entity.setQuantityIssued(BigDecimal.ZERO);
entity.setCreateTime(now);
entity.setUpdateTime(now);
- return entity;
- }).collect(Collectors.toList());
-
- this.saveBatch(entityList);
+ entityList.add(entity);
+ }
+ // 鎸佷箙鍖栨垨杈撳嚭澶勭悊缁撴灉
+ if (!this.saveBatch(entityList)) {
+ throw new ServiceException("瀵煎叆澶辫触锛屼繚瀛樼敓浜ц鍒掓暟鎹け璐�");
+ }
}
@Override
- public void exportProdData(HttpServletResponse response, List<Long> ids) {
- List<ProductionPlan> list;
- if (ids != null && !ids.isEmpty()) {
- list = baseMapper.selectBatchIds(ids);
- } else {
- list = baseMapper.selectList(null);
- }
+ public void exportProdData(HttpServletResponse response, ProductionPlanDto requestDto) {
+ // 瀵煎嚭涓荤敓浜ц鍒掓暟鎹�
+ List<Long> ids = requestDto == null || requestDto.getIds() == null
+ ? Collections.emptyList()
+ : requestDto.getIds().stream().filter(Objects::nonNull).distinct().collect(Collectors.toList());
List<ProductionPlanImportDto> exportList = new ArrayList<>();
- for (ProductionPlan entity : list) {
- ProductionPlanImportDto dto = new ProductionPlanImportDto();
- BeanUtils.copyProperties(entity, dto);
- exportList.add(dto);
+ if (!ids.isEmpty()) {
+ List<ProductionPlanDto> list = productionPlanMapper.selectWithMaterialByIds(ids);
+ for (ProductionPlanDto item : list) {
+ ProductionPlanImportDto dto = new ProductionPlanImportDto();
+ BeanUtils.copyProperties(item, dto);
+ dto.setAssignedQuantity(item.getQuantityIssued());
+ exportList.add(dto);
+ }
+ } else {
+ ProductionPlanDto query = new ProductionPlanDto();
+ if (requestDto != null) {
+ BeanUtils.copyProperties(requestDto, query);
+ }
+ IPage<ProductionPlanVo> page = productionPlanMapper.listPage(new Page<>(1, -1), query);
+ if (page != null && page.getRecords() != null) {
+ for (ProductionPlanVo item : page.getRecords()) {
+ ProductionPlanImportDto dto = new ProductionPlanImportDto();
+ BeanUtils.copyProperties(item, dto);
+ dto.setAssignedQuantity(item.getQuantityIssued());
+ exportList.add(dto);
+ }
+ }
}
+
ExcelUtil<ProductionPlanImportDto> util = new ExcelUtil<>(ProductionPlanImportDto.class);
- util.exportExcel(response, exportList, "閿�鍞敓浜ч渶姹傛暟鎹�");
+ util.exportExcel(response, exportList, "涓荤敓浜ц鍒�");
+ }
+
+ /**
+ * 鏍￠獙涓荤敓浜ц鍒掑彿鍞竴鎬э紝鍙�氳繃 excludeId 鎺掗櫎褰撳墠璁板綍銆�
+ */
+ private void checkMpsNoUnique(String mpsNo, Long excludeId) {
+ // 鎸変富鐢熶骇璁″垝鍙锋煡璇㈤噸澶嶈褰�
+ LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(ProductionPlan::getMpsNo, mpsNo);
+ if (excludeId != null) {
+ // 鏇存柊鏃舵帓闄ゅ綋鍓嶈褰曟湰韬�
+ wrapper.ne(ProductionPlan::getId, excludeId);
+ }
+ if (productionPlanMapper.selectCount(wrapper) > 0) {
+ // 瀛樺湪閲嶅璁″垝鍙凤紝鐩存帴鎷︽埅
+ throw new ServiceException("鐢熶骇璁″垝鍙� " + mpsNo + " 宸插瓨鍦�");
+ }
+ }
+
+ /**
+ * 鏍规嵁瀵煎叆琛岀殑鍨嬪彿銆佷骇鍝佸悕绉般�佸崟浣嶅畾浣嶅敮涓�鐨勪骇鍝佸瀷鍙� ID銆�
+ */
+ private Long resolveProductModelId(ProductionPlanImportDto dto, int rowNo, List<ProductModel> allModels,
+ Map<Long, String> productNameById) {
+ // 鍏堟寜瑙勬牸鍨嬪彿鍋氱涓�杞繃婊�
+ String model = StringUtils.trim(dto.getModel());
+ if (StringUtils.isEmpty(model)) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛岃鏍煎瀷鍙蜂笉鑳戒负绌�");
+ }
+
+ List<ProductModel> candidates = allModels.stream()
+ .filter(item -> model.equals(StringUtils.trim(item.getModel())))
+ .collect(Collectors.toList());
+ if (candidates.isEmpty()) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛岃鏍煎瀷鍙蜂笉瀛樺湪锛屽瀷鍙凤細" + model);
+ }
+
+ // 鑻ヤ紶浜嗕骇鍝佸悕绉帮紝鍐嶅仛绗簩杞繃婊�
+ String productName = StringUtils.trim(dto.getProductName());
+ if (StringUtils.isNotEmpty(productName)) {
+ candidates = candidates.stream()
+ .filter(item -> productName.equals(StringUtils.trim(productNameById.get(item.getProductId()))))
+ .collect(Collectors.toList());
+ if (candidates.isEmpty()) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛屼骇鍝佸悕绉颁笌瑙勬牸鍨嬪彿涓嶅尮閰�");
+ }
+ }
+
+ // 鑻ヤ紶浜嗗崟浣嶏紝鍐嶅仛绗笁杞繃婊�
+ String unit = StringUtils.trim(dto.getUnit());
+ if (StringUtils.isNotEmpty(unit)) {
+ candidates = candidates.stream()
+ .filter(item -> unit.equals(StringUtils.trim(item.getUnit())))
+ .collect(Collectors.toList());
+ if (candidates.isEmpty()) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛屽崟浣嶄笌瑙勬牸鍨嬪彿涓嶅尮閰�");
+ }
+ }
+
+ // 浠嶇劧澶氭潯璇存槑淇℃伅涓嶈冻浠ュ敮涓�瀹氫綅
+ if (candidates.size() > 1) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛岃鏍煎瀷鍙峰尮閰嶅埌澶氫釜浜у搧锛岃琛ュ厖浜у搧鍚嶇О鎴栧崟浣�");
+ }
+ return candidates.get(0).getId();
+ }
+
+ /**
+ * 鐢熸垚涓荤敓浜ц鍒掑彿锛屾牸寮忥細JH + yyyyMMdd + 4浣嶆祦姘村彿銆�
+ */
+ private String buildPlanNo(String datePrefix, int sequence) {
+ // 缁熶竴璁″垝鍙锋牸寮忥細JH + 鏃ユ湡 + 4浣嶆祦姘村彿
+ return "JH" + datePrefix + String.format("%04d", sequence);
+ }
+
+ /**
+ * 鏌ヨ褰撴棩宸插瓨鍦ㄧ殑鏈�澶ф祦姘村彿锛屽苟杩斿洖涓嬩竴涓彲鐢ㄦ祦姘村彿銆�
+ */
+ private int resolveNextPlanSequence(String datePrefix) {
+ // 鏌ヨ褰撴棩鏈�鏂颁竴鏉¤鍒掑彿
+ QueryWrapper<ProductionPlan> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("mps_no", "JH" + datePrefix);
+ queryWrapper.orderByDesc("mps_no");
+ queryWrapper.last("LIMIT 1");
+ ProductionPlan latestPlan = productionPlanMapper.selectOne(queryWrapper);
+
+ // 榛樿浠� 0001 寮�濮�
+ int sequence = 1;
+ if (latestPlan != null && StringUtils.isNotEmpty(latestPlan.getMpsNo())) {
+ // 鎴彇鏈熬娴佹按鍙峰苟閫掑
+ String sequenceStr = latestPlan.getMpsNo().substring(("JH" + datePrefix).length());
+ try {
+ sequence = Integer.parseInt(sequenceStr) + 1;
+ } catch (NumberFormatException ignored) {
+ // 鍘嗗彶鏁版嵁鏍煎紡寮傚父鏃跺洖閫�鍒� 0001
+ sequence = 1;
+ }
+ }
+ return sequence;
+ }
+
+ /**
+ * 璁＄畻鐢熶骇璁″垝鐨勫墿浣欐湭涓嬪彂鏁伴噺锛堥渶姹傞噺 - 宸蹭笅鍙戦噺锛屾渶灏忎负 0锛夈��
+ */
+ private BigDecimal resolveRemainingQuantity(ProductionPlan plan) {
+ // 绌哄璞℃寜 0 澶勭悊
+ if (plan == null) {
+ return BigDecimal.ZERO;
+ }
+ // 闇�姹傞噺涓虹┖鎴栧皬浜庣瓑浜� 0锛岃涓烘棤鍓╀綑
+ BigDecimal requiredQuantity = Optional.ofNullable(plan.getQtyRequired()).orElse(BigDecimal.ZERO);
+ if (requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return BigDecimal.ZERO;
+ }
+ // 宸蹭笅鍙戦噺涓虹┖鎴栧皬浜庣瓑浜� 0锛屽墿浣欏嵆闇�姹傞噺
+ BigDecimal issuedQuantity = Optional.ofNullable(plan.getQuantityIssued()).orElse(BigDecimal.ZERO);
+ if (issuedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return requiredQuantity;
+ }
+ // 宸蹭笅鍙戦噺澶т簬绛変簬闇�姹傞噺锛屽墿浣欏綊闆�
+ if (issuedQuantity.compareTo(requiredQuantity) >= 0) {
+ return BigDecimal.ZERO;
+ }
+ // 姝ｅ父鍦烘櫙杩斿洖宸��
+ return requiredQuantity.subtract(issuedQuantity);
+ }
+
+ /**
+ * 鎸夐渶姹傞噺涓庣疮璁′笅鍙戦噺鎺ㄥ璁″垝鐘舵�併��
+ */
+ private int resolvePlanStatus(BigDecimal requiredQuantity, BigDecimal issuedQuantity) {
+ // 鏃犳湁鏁堥渶姹傞噺鏃讹紝鐘舵�佷繚鎸佸緟涓嬪彂
+ if (requiredQuantity == null || requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return PLAN_STATUS_WAIT;
+ }
+ // 鏈夐渶姹備絾鏈笅鍙戯紝鐘舵�佷粛涓哄緟涓嬪彂
+ if (issuedQuantity == null || issuedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return PLAN_STATUS_WAIT;
+ }
+ // 宸蹭笅鍙戦噺灏忎簬闇�姹傞噺涓洪儴鍒嗕笅鍙戯紝鍚﹀垯涓哄凡涓嬪彂
+ return issuedQuantity.compareTo(requiredQuantity) < 0 ? PLAN_STATUS_PARTIAL : PLAN_STATUS_ISSUED;
+ }
+
+ /**
+ * 灏嗚鍒� ID 闆嗗悎杞垚 [1,2,3] 褰㈠紡锛屽啓鍏ョ敓浜ц鍗曞叧鑱斿瓧娈点��
+ */
+ private String formatPlanIds(List<Long> planIds) {
+ // 鍘婚噸骞舵嫾鎺ヤ负 [1,2,3] 褰㈠紡鐨勫瓧绗︿覆
+ return planIds.stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .map(String::valueOf)
+ .collect(Collectors.joining(",", "[", "]"));
}
}
--
Gitblit v1.9.3