From 423ac2a5e7e451248d8cdfc2cda3f32dba0ec8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 11 三月 2026 17:59:52 +0800
Subject: [PATCH] feat: 生产计划关联物料信息表
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 152 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 120 insertions(+), 32 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 31fa45c..6025b24 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -5,20 +5,26 @@
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.common.exception.ServiceException;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.AliDingConfig;
+import com.ruoyi.production.pojo.ProductMaterial;
import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.service.ProductMaterialService;
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.dto.ProductionPlanImportDto;
import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
+import com.ruoyi.productionPlan.mapper.ProductOrderPlanMapper;
import com.ruoyi.productionPlan.mapper.ProductionPlanMapper;
+import com.ruoyi.productionPlan.pojo.ProductOrderPlan;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
import com.ruoyi.productionPlan.service.ProductionPlanService;
import lombok.extern.slf4j.Slf4j;
@@ -30,10 +36,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
+import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.*;
@@ -64,6 +67,12 @@
@Autowired
private ProductOrderService productOrderService;
+
+ @Autowired
+ private ProductOrderPlanMapper productOrderPlanMapper;
+
+ @Autowired
+ private ProductMaterialService productMaterialService;
/**
* 鍚屾閿侊紝纭繚鎵嬪姩鍜屽畾鏃朵换鍔′笉鍚屾椂鎵ц
@@ -103,32 +112,36 @@
// 鏌ヨ涓荤敓浜ц鍒�
List<ProductionPlan> plans = productionPlanMapper.selectBatchIds(productionPlanDto.getIds());
+ plans.sort(Comparator.comparingLong(ProductionPlan::getId));
// 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
String firstProductName = plans.get(0).getProductName();
if (plans.stream().anyMatch(p -> !p.getProductName().equals(firstProductName))) {
- log.warn("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
- return false;
+ throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
}
// 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
String firstProductSpec = plans.get(0).getProductSpec();
if (plans.stream().anyMatch(p -> !p.getProductSpec().equals(firstProductSpec))) {
- log.warn("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
- return false;
+ throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
}
- // 鍙犲姞鏂规暟
- BigDecimal totalVolume = plans.stream()
- .map(ProductionPlan::getVolume)
+ // 鍙犲姞鍓╀綑鏂规暟
+ BigDecimal totalRemainingVolume = plans.stream()
+ .map(ProductionPlan::getRemainingVolume)
.filter(v -> v != null)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鏂规暟
- if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalVolume) > 0) {
- log.warn("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
- return false;
+ // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鍓╀綑鏂规暟
+ if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalRemainingVolume) > 0) {
+ throw new BaseException("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庡墿浣欐柟鏁�");
}
+
+ // 鍒涘缓鐢熶骇璁㈠崟
+ ProductOrder productOrder = new ProductOrder();
+ productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
+ productOrderService.addProductOrder(productOrder);
// 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
BigDecimal assignedVolume = BigDecimal.ZERO;
@@ -137,26 +150,35 @@
if (volume == null) {
continue;
}
+ // 璁＄畻鍓╀綑鏂规暟
+ BigDecimal remainingVolume = plan.getRemainingVolume();
+ if (remainingVolume.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
- if (assignedVolume.add(volume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
+ ProductOrderPlan productOrderPlan = new ProductOrderPlan();
+ productOrderPlan.setProductOrderId(productOrder.getId());
+ productOrderPlan.setProductionPlanId(plan.getId());
+
+ if (assignedVolume.add(remainingVolume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
// 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
- plan.setAssignedQuantity(productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume));
+ BigDecimal lastRemainingVolume = productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume);
+ plan.setAssignedQuantity(plan.getAssignedQuantity().add(lastRemainingVolume));
+ productOrderPlan.setAssignedQuantity(lastRemainingVolume);
+ productionPlanMapper.updateById(plan);
+ productOrderPlanMapper.insert(productOrderPlan);
break;
}
// 鍒嗛厤褰撳墠璁″垝鏂规暟
- plan.setAssignedQuantity(volume);
+ plan.setAssignedQuantity(plan.getAssignedQuantity().add(remainingVolume));
+ productOrderPlan.setAssignedQuantity(remainingVolume);
+ // 鏇存柊鐢熶骇璁″垝
productionPlanMapper.updateById(plan);
- assignedVolume = assignedVolume.add(volume);
+ // 鍒涘缓鍏宠仈鍏崇郴
+ productOrderPlanMapper.insert(productOrderPlan);
+ assignedVolume = assignedVolume.add(remainingVolume);
}
-
- // 鍒涘缓鐢熶骇璁㈠崟
- ProductOrder productOrder = new ProductOrder();
- String combineIds = StringUtils.join(productionPlanDto.getIds(), ",");
- productOrder.setCombineProductionPlanIds(combineIds);
- productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
- productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
- productOrderService.addProductOrder(productOrder);
return true;
}
@@ -166,6 +188,33 @@
productionPlanDto.setDataSourceType(PRODUCTION_FORECAST.getCode());
productionPlanMapper.insert(productionPlanDto);
return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean update(ProductionPlanDto productionPlanDto) {
+ // 鏌ヨ鏄惁鏈夊叧鑱旇鍗�
+ 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) {
+ throw new BaseException("鏂规暟涓嶈兘閫掑噺");
+ }
+ }
+
+ return productionPlanMapper.updateById(productionPlanDto) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean delete(List<Long> ids) {
+ // 濡傛灉鏈夊叧鑱旇鍗曪紝鍒欎笉鑳藉垹闄�
+ if (productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().in(ProductOrderPlan::getProductionPlanId, ids)).stream().anyMatch(p -> p.getProductOrderId() != null)) {
+ throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旇鍗�");
+ }
+
+ return productionPlanMapper.deleteBatchIds(ids) > 0;
}
/**
@@ -270,9 +319,23 @@
searchParam.put("appType", aliDingConfig.getAppType());
searchParam.put("systemToken", aliDingConfig.getSystemToken());
searchParam.put("userId", aliDingConfig.getUserId());
- searchParam.put("formUuid", aliDingConfig.getFormUuid());
+ searchParam.put("formUuid", aliDingConfig.getProducePlanFormUuid());
+ searchParam.put("currentPage", pageNumber);
searchParam.put("pageSize", pageSize);
- searchParam.put("pageNumber", pageNumber);
+
+ JSONArray searchConditions = new JSONArray();
+ JSONObject condition = new JSONObject();
+ condition.put("key", "processApprovedResult");
+ JSONArray valueArray = new JSONArray();
+ valueArray.add("agree");
+
+ condition.put("value", valueArray);
+ condition.put("type", "ARRAY");
+ condition.put("operator", "in");
+ condition.put("componentName", "SelectField");
+ searchConditions.add(condition);
+
+ searchParam.put("searchFieldJson", searchConditions.toJSONString());
// 榛樿鎸変慨鏀规椂闂村崌搴忔帓搴忥紝纭繚鍒嗛〉鎷夊彇鏁版嵁鐨勮繛缁��
// "+" 琛ㄧず鍗囧簭锛�"gmt_modified" 鏄畼鏂瑰唴缃瓧娈�
@@ -322,7 +385,19 @@
plan.setApplyNo(formData.getString("textField_l7fytfco"));
plan.setCustomerName(formData.getString("textField_lbkozohg"));
- plan.setMaterialCode(row.getString("textField_l9xo62q5"));
+ String materialCode = row.getString("textField_l9xo62q5");
+ plan.setMaterialCode(materialCode);
+
+ // 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅琛紝鍏宠仈鐗╂枡ID
+ if (StringUtils.isNotEmpty(materialCode)) {
+ LambdaQueryWrapper<ProductMaterial> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductMaterial::getMaterialCode, materialCode);
+ ProductMaterial productMaterial = productMaterialService.getOne(queryWrapper);
+ if (productMaterial != null) {
+ plan.setProductMaterialId(productMaterial.getId());
+ }
+ }
+
plan.setProductName(row.getString("textField_l9xo62q7"));
plan.setProductSpec(row.getString("textField_l9xo62q8"));
plan.setLength(row.getInteger("numberField_lb7lgatg_value"));
@@ -337,8 +412,20 @@
try {
long start = Long.parseLong(dateArr.getString(0));
long end = Long.parseLong(dateArr.getString(1));
- plan.setStartDate(Instant.ofEpochMilli(start).atZone(ZoneId.systemDefault()).toLocalDateTime());
- plan.setEndDate(Instant.ofEpochMilli(end).atZone(ZoneId.systemDefault()).toLocalDateTime());
+
+ Date startDate = Date.from(Instant.ofEpochMilli(start)
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate()
+ .atStartOfDay(ZoneId.systemDefault())
+ .toInstant());
+ Date endDate = Date.from(Instant.ofEpochMilli(end)
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate()
+ .atStartOfDay(ZoneId.systemDefault())
+ .toInstant());
+
+ plan.setStartDate(startDate);
+ plan.setEndDate(endDate);
} catch (Exception e) {
log.warn("瑙ｆ瀽鏃ユ湡澶辫触: {}", dateArr);
}
@@ -454,6 +541,7 @@
for (ProductionPlanImportDto dto : list) {
entity = new ProductionPlan();
BeanUtils.copyProperties(dto, entity);
+ entity.setAssignedQuantity(BigDecimal.ZERO);
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setDataSourceType(2);
--
Gitblit v1.9.3