From 90869d75f496350fcb11587010fef20fba16157b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 08 四月 2026 14:52:59 +0800
Subject: [PATCH] fix: 新增主生成计划的申请单编号不能重复,报工查看详情数据重复问题
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index 9fccff8..fcee832 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -120,6 +120,10 @@
// 鏌ヨ涓荤敓浜ц鍒�
List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(productionPlanDto.getIds());
+ if (plans == null || plans.isEmpty()) {
+ throw new ServiceException("涓嬪彂澶辫触,鐢熶骇璁″垝涓嶅瓨鍦�");
+ }
+
// 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
String firstProductName = plans.get(0).getProductName();
if (plans.stream().anyMatch(p -> p.getProductName() == null || !p.getProductName().equals(firstProductName))) {
@@ -148,6 +152,7 @@
productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
productOrder.setStrength(productionPlanDto.getStrength());
+ productOrder.setProductMaterialSkuId(plans.get(0).getProductMaterialSkuId());
Long orderId = productOrderService.insertProductOrder(productOrder);
@@ -220,6 +225,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ProductionPlanDto productionPlanDto) {
+ if (StringUtils.isEmpty(productionPlanDto.getApplyNo())) {
+ throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
+ }
+ Long count = productionPlanMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery()
+ .eq(ProductionPlan::getApplyNo, productionPlanDto.getApplyNo()));
+ if (count > 0) {
+ throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿 " + productionPlanDto.getApplyNo() + " 宸插瓨鍦�");
+ }
productionPlanDto.setDataSourceType(DataSourceTypeEnum.MANUAL.getCode());
productionPlanDto.setStatus(0);
productionPlanMapper.insert(productionPlanDto);
@@ -229,16 +242,37 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean update(ProductionPlanDto productionPlanDto) {
- // 宸蹭笅鍙戠姸鎬侊紝涓嶈兘缂栬緫
- if (productionPlanDto.getStatus() != 0) {
- throw new BaseException("宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂鐘舵�侊紝涓嶈兘缂栬緫");
+ if (productionPlanDto == null || productionPlanDto.getId() == null) {
+ throw new ServiceException("缂栬緫澶辫触,鏁版嵁涓嶈兘涓虹┖");
}
+ ProductionPlan productionPlan = getById(productionPlanDto.getId());
+ if (productionPlan == null) {
+ throw new ServiceException("缂栬緫澶辫触,涓荤敓浜ц鍒掍笉瀛樺湪");
+ }
+
+ if (StringUtils.isNotEmpty(productionPlanDto.getApplyNo())
+ && !productionPlanDto.getApplyNo().equals(productionPlan.getApplyNo())) {
+
+ Long count = productionPlanMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery()
+ .eq(ProductionPlan::getApplyNo, productionPlanDto.getApplyNo())
+ .ne(ProductionPlan::getId, productionPlanDto.getId())); // 鎺掗櫎鑷韩
+
+ if (count > 0) {
+ throw new ServiceException("缂栬緫澶辫触锛岀敵璇峰崟缂栧彿 " + productionPlanDto.getApplyNo() + " 宸茶鍗犵敤");
+ }
+ }
+ // 宸蹭笅鍙戠姸鎬侊紝涓嶈兘缂栬緫
+ if (productionPlan.getStatus() != 0) {
+ throw new BaseException("缂栬緫澶辫触,璇ョ敓浜ц鍒掑凡涓嬪彂鎴栭儴鍒嗕笅鍙戠姸鎬�,绂佹缂栬緫");
+ }
+
// 鏌ヨ鏄惁鏈夊叧鑱旇鍗�
- boolean hasProductOrderPlan = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().eq(ProductOrderPlan::getProductionPlanId, productionPlanDto.getId())).stream().anyMatch(p -> p.getProductOrderId() != null);
+ boolean hasProductOrderPlan = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery()
+ .eq(ProductOrderPlan::getProductionPlanId, productionPlanDto.getId()))
+ .stream().anyMatch(p -> p.getProductOrderId() != null);
+
if (hasProductOrderPlan) {
- // 濡傛灉鍏宠仈锛屾柟鏁板彧鑳介�掑
- ProductionPlan currentPlan = productionPlanMapper.selectById(productionPlanDto.getId());
- if (productionPlanDto.getVolume().compareTo(currentPlan.getVolume()) < 0) {
+ if (productionPlanDto.getVolume().compareTo(productionPlan.getVolume()) < 0) {
throw new BaseException("鏂规暟涓嶈兘閫掑噺");
}
}
@@ -478,7 +512,7 @@
entity.setAssignedQuantity(BigDecimal.ZERO);
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setDataSourceType(DataSourceTypeEnum.DING_TALK.getCode());
+ entity.setDataSourceType(DataSourceTypeEnum.MANUAL.getCode());
// 鏍规嵁鐗╂枡缂栫爜濉厖鍏宠仈ID
if (StringUtils.isNotEmpty(dto.getMaterialCode())) {
--
Gitblit v1.9.3