From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 187 ++++++++++++++++++++++++++++++----------------
1 files changed, 122 insertions(+), 65 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 1b09c74..b3ad742 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -1,6 +1,7 @@
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;
@@ -26,7 +27,9 @@
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -70,31 +73,30 @@
throw new ServiceException("涓嬪彂澶辫触锛屾湭閫夋嫨鐢熶骇璁″垝");
}
- List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(planIds);
- if (plans == null || plans.isEmpty() || plans.size() != planIds.size()) {
+ List<ProductionPlanDto> planLists = productionPlanMapper.selectWithMaterialByIds(planIds);
+ if (planLists == null || planLists.isEmpty() || planLists.size() != planIds.size()) {
throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掍笉瀛樺湪鎴栧凡琚垹闄�");
}
- ProductionPlanDto firstPlan = plans.getFirst();
+ ProductionPlanDto firstPlan = planLists.getFirst();
if (firstPlan.getProductModelId() == null) {
throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掔己灏戜骇鍝佸瀷鍙�");
}
- boolean hasDifferentModel = plans.stream()
+ boolean hasDifferentModel = planLists.stream()
.anyMatch(item -> !Objects.equals(item.getProductModelId(), firstPlan.getProductModelId()));
if (hasDifferentModel) {
throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掔殑浜у搧鍨嬪彿涓嶄竴鑷�");
}
- boolean hasIssuedPlan = plans.stream()
- .anyMatch(item -> item.getStatus() != null && item.getStatus() != PLAN_STATUS_WAIT);
+ boolean hasIssuedPlan = planLists.stream()
+ .anyMatch(item -> item.getStatus() != null && item.getStatus() == PLAN_STATUS_ISSUED);
if (hasIssuedPlan) {
throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掑瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戞暟鎹�");
}
- BigDecimal totalRequiredQuantity = plans.stream()
- .map(ProductionPlan::getQtyRequired)
- .filter(Objects::nonNull)
+ BigDecimal totalRequiredQuantity = planLists.stream()
+ .map(this::resolveRemainingQuantity)
.reduce(BigDecimal.ZERO, BigDecimal::add);
if (totalRequiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("涓嬪彂澶辫触锛屾墍閫夌敓浜ц鍒掗渶姹傛�婚噺蹇呴』澶т簬0");
@@ -108,8 +110,25 @@
throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庤鍒掗渶姹傛�婚噺");
}
+ 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("Issue failed, no quantity available for dispatch");
+ }
+
ProductionOrder productionOrder = new ProductionOrder();
- productionOrder.setProductionPlanIds(formatPlanIds(planIds));
+ productionOrder.setProductionPlanIds(formatPlanIds(issuedPlanIds));
productionOrder.setProductModelId(firstPlan.getProductModelId());
productionOrder.setQuantity(assignedQuantity);
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
@@ -119,13 +138,30 @@
throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍗曚繚瀛樺け璐�");
}
- int targetStatus = assignedQuantity.compareTo(totalRequiredQuantity) < 0 ? PLAN_STATUS_PARTIAL : PLAN_STATUS_ISSUED;
- List<ProductionPlan> updates = planIds.stream().map(id -> {
+ //宸蹭笅鍙戞暟閲�
+ 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(id);
- update.setStatus(targetStatus);
- return update;
- }).collect(Collectors.toList());
+ update.setId(plan.getId());
+ update.setStatus(planStatus);
+ update.setQuantityIssued(totalIssuedQuantity);
+ updates.add(update);
+ }
if (!updates.isEmpty()) {
this.updateBatchById(updates);
}
@@ -135,12 +171,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ProductionPlanDto dto) {
- if (StringUtils.isBlank(dto.getApplyNo())) {
- throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
- }
- checkApplyNoUnique(dto.getApplyNo(), null);
-
+ if (StringUtils.isBlank(dto.getMpsNo())) {
+ dto.setMpsNo(generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
+ }else checkMpsNoUnique(dto.getMpsNo(), null);
dto.setStatus(PLAN_STATUS_WAIT);
+ dto.setSource("鍐呴儴");
return productionPlanMapper.insert(dto) > 0;
}
@@ -160,21 +195,21 @@
throw new BaseException("缂栬緫澶辫触锛岃鐢熶骇璁″垝宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂锛岀姝㈢紪杈�");
}
- 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) {
+ private void checkMpsNoUnique(String mpsNo, Long excludeId) {
LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(ProductionPlan::getApplyNo, applyNo);
+ wrapper.eq(ProductionPlan::getMpsNo, mpsNo);
if (excludeId != null) {
wrapper.ne(ProductionPlan::getId, excludeId);
}
if (productionPlanMapper.selectCount(wrapper) > 0) {
- throw new ServiceException("鐢宠鍗曠紪鍙� " + applyNo + " 宸插瓨鍦�");
+ throw new ServiceException("鐢熶骇璁″垝鍙� " + mpsNo + " 宸插瓨鍦�");
}
}
@@ -202,7 +237,6 @@
if (file == null || file.isEmpty()) {
throw new ServiceException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
-
ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
List<ProductionPlanImportDto> list;
try {
@@ -210,77 +244,82 @@
} catch (Exception e) {
throw new ServiceException("Excel瑙ｆ瀽澶辫触");
}
-
if (list == null || list.isEmpty()) {
throw new ServiceException("Excel娌℃湁鏁版嵁");
}
-
- Set<String> applyNos = new HashSet<>();
- Set<String> materialCodes = new HashSet<>();
+ 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 = dto.getMpsNo();
+ if (StringUtils.isEmpty(mpsNo)) {
+ generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
}
- if (!applyNos.add(applyNo)) {
- throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙� " + applyNo);
+ if (!mpsNos.add(mpsNo)) {
+ throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙� " + mpsNo);
}
- if (StringUtils.isEmpty(materialCode)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀墿鏂欑紪鐮佷笉鑳戒负绌�");
- }
-
- String strength = dto.getStrength();
- if (StringUtils.isNotEmpty(strength) && !"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));
+ .in(ProductionPlan::getMpsNo, mpsNos));
if (existApplyNoCount > 0) {
- List<String> existApplyNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
- .in(ProductionPlan::getApplyNo, applyNos))
+ List<String> existMpsNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
+ .in(ProductionPlan::getMpsNo, mpsNos))
.stream()
- .map(ProductionPlan::getApplyNo)
+ .map(ProductionPlan::getMpsNo)
.collect(Collectors.toList());
- throw new ServiceException("瀵煎叆澶辫触锛岀敵璇峰崟缂栧彿宸插瓨鍦�: " + String.join(", ", existApplyNos));
+ throw new ServiceException("瀵煎叆澶辫触锛岀敓浜ц鍒掑彿宸插瓨鍦�: " + String.join(", ", existMpsNos));
}
-
LocalDateTime now = LocalDateTime.now();
List<ProductionPlan> entityList = list.stream().map(dto -> {
ProductionPlan entity = new ProductionPlan();
BeanUtils.copyProperties(dto, entity);
entity.setStatus(PLAN_STATUS_WAIT);
+ entity.setSource("鍐呴儴");
entity.setCreateTime(now);
entity.setUpdateTime(now);
return entity;
}).collect(Collectors.toList());
-
this.saveBatch(entityList);
}
@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);
- }
-
+ List<ProductionPlanDto> list = productionPlanMapper.selectWithMaterialByIds(ids);
List<ProductionPlanImportDto> exportList = new ArrayList<>();
- for (ProductionPlan entity : list) {
+ for (ProductionPlanDto entity : list) {
ProductionPlanImportDto dto = new ProductionPlanImportDto();
BeanUtils.copyProperties(entity, dto);
exportList.add(dto);
}
ExcelUtil<ProductionPlanImportDto> util = new ExcelUtil<>(ProductionPlanImportDto.class);
- util.exportExcel(response, exportList, "閿�鍞敓浜ч渶姹傛暟鎹�");
+ util.exportExcel(response, exportList, "涓荤敓浜ц鍒�");
+ }
+
+ private BigDecimal resolveRemainingQuantity(ProductionPlan plan) {
+ if (plan == null) {
+ return BigDecimal.ZERO;
+ }
+ BigDecimal requiredQuantity = Optional.ofNullable(plan.getQtyRequired()).orElse(BigDecimal.ZERO);
+ if (requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return BigDecimal.ZERO;
+ }
+ 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;
}
private String formatPlanIds(List<Long> planIds) {
@@ -290,4 +329,22 @@
.map(String::valueOf)
.collect(Collectors.joining(",", "[", "]"));
}
+
+ private String generateNextPlanNo(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);
+ int sequence = 1;
+ if (latestPlan != null && latestPlan.getMpsNo() != null && !latestPlan.getMpsNo().isEmpty()) {
+ String sequenceStr = latestPlan.getMpsNo().substring(("JH" + datePrefix).length());
+ try {
+ sequence = Integer.parseInt(sequenceStr) + 1;
+ } catch (NumberFormatException e) {
+ sequence = 1;
+ }
+ }
+ return "JH" + datePrefix + String.format("%04d", sequence);
+ }
}
--
Gitblit v1.9.3