From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 804 +++++++++++++++++---------------------------------------
1 files changed, 246 insertions(+), 558 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 74e54a7..8e70889 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -1,558 +1,246 @@
-//package com.ruoyi.production.service.impl;
-//
-//import com.alibaba.fastjson2.JSONArray;
-//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.poi.ExcelUtil;
-//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.mapper.ProductionPlanMapper;
-//import com.ruoyi.production.pojo.ProductionPlan;
-//import com.ruoyi.production.service.ProductionPlanService;
-//import lombok.RequiredArgsConstructor;
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import jakarta.servlet.http.HttpServletResponse;
-//import java.math.BigDecimal;
-//import java.time.Instant;
-//import java.time.LocalDateTime;
-//import java.time.ZoneId;
-//import java.util.*;
-//import java.util.concurrent.locks.ReentrantLock;
-//import java.util.stream.Collectors;
-//
-///**
-// * <p>
-// * 鐢熶骇璁″垝琛� 鏈嶅姟瀹炵幇绫�
-// * </p>
-// *
-// * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
-// * @since 2026-04-21 02:11:10
-// */
-//@Service
-//@RequiredArgsConstructor
-//public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
-//
-// private ProductionPlanMapper productionPlanMapper;
-//
-//
-// /**
-// * 鍚屾閿侊紝纭繚鎵嬪姩鍜屽畾鏃朵换鍔′笉鍚屾椂鎵ц
-// */
-// private final ReentrantLock syncLock = new ReentrantLock();
-//
-// @Override
-// public IPage<ProductionPlanVo> listPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
-//
-// return productionPlanMapper.selectPage(page, null);
-// }
-//
-// /**
-// * 椤甸潰鎵嬪姩鍚屾
-// */
-// @Override
-// public void loadProdData() {
-// syncProdData(1);
-// }
-//
-// /**
-// * 瀹氭椂浠诲姟鍚屾
-// */
-// @Override
-// public void syncProdDataJob() {
-// syncProdData(2);
-// }
-//
-// /**
-// * 鍚堝苟鐢熶骇璁″垝
-// */
-// @Override
-// @Transactional(rollbackFor = Exception.class)
-// public boolean combine(ProductionPlanDto productionPlanDto) {
-// if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
-// return false;
-// }
-//
-// // 鏌ヨ涓荤敓浜ц鍒�
-// 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))) {
-// throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
-// }
-//
-// // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
-// String firstProductSpec = plans.get(0).getModel();
-// if (plans.stream().anyMatch(p -> p.getModel() == null || !p.getModel().equals(firstProductSpec))) {
-// throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
-// }
-//
-// // 鍙犲姞鍓╀綑鏂规暟
-// BigDecimal totalRemainingVolume = plans.stream()
-// .map(ProductionPlan::getRemainingVolume)
-// .filter(Objects::nonNull)
-// .reduce(BigDecimal.ZERO, BigDecimal::add);
-// // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鍓╀綑鏂规暟
-// if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalRemainingVolume) > 0) {
-// throw new BaseException("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庡墿浣欐柟鏁�");
-// }
-//
-// // 鍒涘缓鐢熶骇璁㈠崟
-// ProductOrder productOrder = new ProductOrder();
-// productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
-// productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
-// productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
-// productOrder.setStrength(productionPlanDto.getStrength());
-// productOrder.setProductMaterialSkuId(plans.get(0).getProductMaterialSkuId());
-//
-// Long orderId = productOrderService.insertProductOrder(productOrder);
-//
-// // 褰撲笅鍙戠殑浜у搧涓虹爩鍧楁垨鏉挎潗锛屽氨鎷夊彇BOM瀛愰泦涓庡伐鑹鸿矾绾垮瓙闆嗘暟鎹瓨鍏ュ埌闄勮〃涓�
-// if ("鐮屽潡".equals(productionPlanDto.getProductName())) {
-// productOrder.setRouteId(productionOrderAppendixService.populateBlocks(orderId, productionPlanDto));
-// }
-// if ("鏉挎潗".equals(productionPlanDto.getProductName())) {
-// productOrder.setRouteId(productionOrderAppendixService.populatePlates(orderId, productionPlanDto));
-// }
-// // 鏇存柊缁戝畾鐨勫伐鑹鸿矾绾�
-// productOrderService.updateById(productOrder);
-//
-// // 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
-// BigDecimal assignedVolume = BigDecimal.ZERO;
-// for (ProductionPlan plan : plans) {
-// BigDecimal volume = plan.getVolume();
-// if (volume == null) {
-// continue;
-// }
-// // 璁＄畻鍓╀綑鏂规暟
-// BigDecimal remainingVolume = plan.getRemainingVolume();
-// if (remainingVolume.compareTo(BigDecimal.ZERO) <= 0) {
-// continue;
-// }
-//
-// ProductOrderPlan productOrderPlan = new ProductOrderPlan();
-// productOrderPlan.setProductOrderId(productOrder.getId());
-// productOrderPlan.setProductionPlanId(plan.getId());
-//
-// if (assignedVolume.add(remainingVolume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
-// // 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
-// BigDecimal lastRemainingVolume = productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume);
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO).add(lastRemainingVolume);
-// plan.setAssignedQuantity(assignedQuantity);
-// plan.setStatus(assignedQuantity.compareTo(plan.getVolume()) >= 0 ? 2 : 1);
-// productOrderPlan.setAssignedQuantity(lastRemainingVolume);
-// productionPlanMapper.updateById(plan);
-// productOrderPlanMapper.insert(productOrderPlan);
-// break;
-// }
-//
-// // 鍒嗛厤褰撳墠璁″垝鏂规暟
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO).add(remainingVolume);
-// plan.setAssignedQuantity(assignedQuantity);
-// plan.setStatus(assignedQuantity.compareTo(plan.getVolume()) >= 0 ? 2 : 1);
-// productOrderPlan.setAssignedQuantity(remainingVolume);
-// // 鏇存柊鐢熶骇璁″垝
-// productionPlanMapper.updateById(plan);
-// // 鍒涘缓鍏宠仈鍏崇郴
-// productOrderPlanMapper.insert(productOrderPlan);
-// assignedVolume = assignedVolume.add(remainingVolume);
-// }
-//
-// for (ProductionPlan plan : plans) {
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO);
-// BigDecimal volume = Optional.ofNullable(plan.getVolume()).orElse(BigDecimal.ZERO);
-// if (assignedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
-// plan.setStatus(0);
-// } else if (assignedQuantity.compareTo(volume) >= 0) {
-// plan.setStatus(2);
-// } else {
-// plan.setStatus(1);
-// }
-// productionPlanMapper.updateById(plan);
-// }
-// return true;
-// }
-//
-// @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);
-// return true;
-// }
-//
-// @Override
-// @Transactional(rollbackFor = Exception.class)
-// public boolean update(ProductionPlanDto productionPlanDto) {
-// 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);
-//
-// if (hasProductOrderPlan) {
-// if (productionPlanDto.getVolume().compareTo(productionPlan.getVolume()) < 0) {
-// throw new BaseException("鏂规暟涓嶈兘閫掑噺");
-// }
-// }
-//
-// return productionPlanMapper.updateById(productionPlanDto) > 0;
-// }
-//
-// @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)) {
-// throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戠殑璁″垝");
-// }
-// // 濡傛灉鏈夊叧鑱旇鍗曪紝鍒欎笉鑳藉垹闄�
-// if (productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().in(ProductOrderPlan::getProductionPlanId, ids)).stream().anyMatch(p -> p.getProductOrderId() != null)) {
-// throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旇鍗�");
-// }
-//
-// return productionPlanMapper.deleteBatchIds(ids) > 0;
-// }
-//
-// /**
-// * 鍚屾鏁版嵁
-// */
-// @Transactional(rollbackFor = Exception.class)
-// public void syncProdData(Integer dataSyncType) {
-// if (!syncLock.tryLock()) {
-// log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩鍚屾" : "瀹氭椂浠诲姟鍚屾");
-// return;
-// }
-//
-// try {
-// 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);
-//
-// String searchFieldJson = searchConditions.toJSONString();
-//
-// JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getProducePlanFormUuid(), searchFieldJson, this, ProductionPlan::getFormModifiedTime);
-//
-// if (dataArr.isEmpty()) {
-// log.info("娌℃湁鏇村鏂版暟鎹渶瑕佸悓姝�");
-// return;
-// }
-//
-// // 瑙ｆ瀽骞朵繚瀛樻暟鎹�
-// List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, dataArr.size());
-// if (!list.isEmpty()) {
-// // 澶勭悊鏇存柊鎴栨柊澧�
-// int affected = processSaveOrUpdate(list);
-// log.info("鏁版嵁鍚屾瀹屾垚锛屽叡鍚屾 {} 鏉℃暟鎹�", affected);
-// }
-//
-// } catch (Exception e) {
-// log.error("鍚屾鐢熶骇璁″垝寮傚父", e);
-// } finally {
-// // 閲婃斁閿�
-// syncLock.unlock();
-// }
-// }
-//
-// private List<ProductionPlan> parseProductionPlans(JSONArray dataArr, Integer dataSyncType, Integer totalCount) {
-// List<ProductionPlan> list = new ArrayList<>();
-// LocalDateTime now = LocalDateTime.now();
-//
-// for (int i = 0; i < dataArr.size(); i++) {
-// JSONObject item = dataArr.getJSONObject(i);
-// String formInstanceId = item.getString("formInstanceId");
-// String serialNo = item.getString("serialNo");
-//
-// JSONObject originator = item.getJSONObject("originator");
-// String originatorName = originator != null && originator.containsKey("userName")
-// ? originator.getJSONObject("userName").getString("nameInChinese") : "鏈煡";
-//
-// JSONObject formData = item.getJSONObject("formData");
-// JSONArray tableArr = formData.getJSONArray("tableField_l7fytfcn");
-// if (tableArr == null || tableArr.isEmpty()) {
-// continue;
-// }
-//
-// for (int j = 0; j < tableArr.size(); j++) {
-// JSONObject row = tableArr.getJSONObject(j);
-// ProductionPlan plan = new ProductionPlan();
-//
-// plan.setFormInstanceId(formInstanceId);
-// plan.setSerialNo(serialNo);
-// plan.setApplyNo(formData.getString("textField_l7fytfco"));
-// plan.setCustomerName(formData.getString("textField_lbkozohg"));
-//
-// String materialCode = row.getString("textField_l9xo62q5");
-// // 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅琛紝鍏宠仈鐗╂枡ID
-// if (StringUtils.isNotEmpty(materialCode)) {
-// LambdaQueryWrapper<ProductMaterialSku> skuQueryWrapper = new LambdaQueryWrapper<>();
-// skuQueryWrapper.eq(ProductMaterialSku::getMaterialCode, materialCode);
-// ProductMaterialSku sku = productMaterialSkuService.getOne(skuQueryWrapper);
-// if (sku != null) {
-// plan.setProductMaterialSkuId(sku.getId());
-// }
-// }
-//
-// plan.setLength(row.getInteger("numberField_lb7lgatg_value"));
-// plan.setWidth(row.getInteger("numberField_lb7lgath_value"));
-// plan.setHeight(row.getInteger("numberField_lb7lgati_value"));
-// plan.setQuantity(row.getInteger("numberField_lb7lgatj_value"));
-// plan.setVolume(row.getBigDecimal("numberField_l7fytfd3_value"));
-// plan.setStrength(row.getString("radioField_m9urarr2_id"));
-//
-// JSONArray dateArr = row.getJSONArray("cascadeDateField_lfxqqluw");
-// if (dateArr != null && dateArr.size() == 2) {
-// try {
-// long start = Long.parseLong(dateArr.getString(0));
-// long end = Long.parseLong(dateArr.getString(1));
-//
-// 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);
-// }
-// }
-//
-// plan.setSubmitter(originatorName);
-// plan.setSubmitOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
-// plan.setRemarkOne(formData.getString("textareaField_l7fytfcy"));
-// plan.setRemarkTwo(formData.getString("textField_l7fytfcx"));
-// plan.setCreatorName(originatorName);
-//
-// JSONObject modifyUser = item.getJSONObject("modifyUser");
-// if (modifyUser != null && modifyUser.containsKey("userName")) {
-// plan.setModifierName(modifyUser.getJSONObject("userName").getString("nameInChinese"));
-// }
-//
-// plan.setFormCreatedTime(AliDingUtils.parseUtcTime(item.getString("createdTimeGMT")));
-// plan.setFormModifiedTime(AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT")));
-// plan.setDataSourceType(DataSourceTypeEnum.DING_TALK.getCode());
-// plan.setCreateTime(now);
-// plan.setUpdateTime(now);
-// plan.setTotalCount(totalCount);
-//
-// list.add(plan);
-// }
-// }
-// return list;
-// }
-//
-// private int processSaveOrUpdate(List<ProductionPlan> list) {
-// if (list == null || list.isEmpty()) {
-// return 0;
-// }
-// int affected = 0;
-//
-// // 鍘婚噸 formInstanceId
-// Set<String> formIds = list.stream()
-// .map(ProductionPlan::getFormInstanceId)
-// .collect(Collectors.toSet());
-//
-// // 鏌ヨ鏁版嵁搴撳凡鏈夋暟鎹�
-// List<ProductionPlan> existList = this.list(new LambdaQueryWrapper<ProductionPlan>().in(ProductionPlan::getFormInstanceId, formIds));
-//
-// // Map (formInstanceId + materialCode)
-// Map<String, ProductionPlan> existMap = new HashMap<>();
-// for (ProductionPlan p : existList) {
-// String key = p.getFormInstanceId() + "_" + p.getProductMaterialSkuId();
-// existMap.put(key, p);
-// }
-//
-// // 閬嶅巻鍚屾鏁版嵁
-// for (ProductionPlan plan : list) {
-// String key = plan.getFormInstanceId() + "_" + plan.getProductMaterialSkuId();
-// ProductionPlan exist = existMap.get(key);
-// if (exist == null) {
-// // 鏂板
-// this.save(plan);
-// affected++;
-// log.info("鏂板鏁版嵁 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getProductMaterialSkuId());
-// } else {
-// // 鍒ゆ柇鏄惁闇�瑕佹洿鏂�
-// if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(plan.getFormModifiedTime())) {
-// plan.setId(exist.getId());
-// plan.setCreateTime(exist.getCreateTime());
-// this.updateById(plan);
-// affected++;
-// log.info("鏇存柊鏁版嵁 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getProductMaterialSkuId());
-// }
-// }
-// }
-// return affected;
-// }
-//
-// @Override
-// public List<ProductionPlanSummaryDto> summaryByProductType(ProductionPlanSummaryDto query) {
-// return baseMapper.selectSummaryByProductType(query);
-// }
-//
-// @Override
-// @Transactional(rollbackFor = Exception.class)
-// public void importProdData(MultipartFile file) {
-// if (file == null || file.isEmpty()) {
-// throw new ServiceException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
-// }
-// ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
-// List<ProductionPlanImportDto> list;
-// 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<>();
-// 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) + " 琛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
-// }
-// if (!applyNos.add(applyNo)) {
-// throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙�: " + applyNo);
-// }
-// if (StringUtils.isEmpty(materialCode)) {
-// throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀墿鏂欑紪鐮佷笉鑳戒负绌�");
-// }
-//
-// 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));
-// 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));
-// }
-//
-// Map<String, Long> skuMap = productMaterialSkuService.list(Wrappers.<ProductMaterialSku>lambdaQuery()
-// .in(ProductMaterialSku::getMaterialCode, materialCodes))
-// .stream().collect(Collectors.toMap(ProductMaterialSku::getMaterialCode, ProductMaterialSku::getId, (k1, k2) -> k1));
-//
-// List<String> missingCodes = materialCodes.stream()
-// .filter(code -> !skuMap.containsKey(code))
-// .collect(Collectors.toList());
-// if (!missingCodes.isEmpty()) {
-// throw new ServiceException("瀵煎叆澶辫触锛屼互涓嬬墿鏂欑紪鐮佷笉瀛樺湪: " + String.join(", ", missingCodes));
-// }
-//
-// LocalDateTime now = LocalDateTime.now();
-// List<ProductionPlan> entityList = list.stream().map(dto -> {
-// ProductionPlan entity = new ProductionPlan();
-// BeanUtils.copyProperties(dto, entity);
-// entity.setProductMaterialSkuId(skuMap.get(dto.getMaterialCode()));
-// entity.setAssignedQuantity(BigDecimal.ZERO);
-// entity.setDataSourceType(DataSourceTypeEnum.MANUAL.getCode());
-// entity.setStatus(0);
-// 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<ProductionPlanImportDto> exportList = new ArrayList<>();
-// for (ProductionPlan entity : list) {
-// ProductionPlanImportDto dto = new ProductionPlanImportDto();
-// BeanUtils.copyProperties(entity, dto);
-// exportList.add(dto);
-// }
-// ExcelUtil<ProductionPlanImportDto> util = new ExcelUtil<>(ProductionPlanImportDto.class);
-// util.exportExcel(response, exportList, "閿�鍞敓浜ч渶姹傛暟鎹�");
-// }
-//
-//}
+package com.ruoyi.production.service.impl;
+
+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.poi.ExcelUtil;
+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.ProductionPlanService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
+
+ private final ProductionPlanMapper productionPlanMapper;
+
+ private final ProductionOrderMapper productionOrderMapper;
+
+ @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;
+ }
+
+ /**
+ * 鍚堝苟鐢熶骇璁″垝
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean combine(ProductionPlanDto productionPlanDto) {
+ if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ return false;
+ }
+
+ // 鏌ヨ涓荤敓浜ц鍒�
+ 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))) {
+ throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
+ }
+
+ // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
+ String firstProductSpec = plans.get(0).getModel();
+ if (plans.stream().anyMatch(p -> p.getModel() == null || !p.getModel().equals(firstProductSpec))) {
+ throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
+ }
+
+ // 鍒涘缓鐢熶骇璁㈠崟
+ ProductionOrder productionOrder = new ProductionOrder();
+ productionOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
+ productionOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
+ productionOrder.setStrength(productionPlanDto.getStrength());
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean add(ProductionPlanDto dto) {
+ if (StringUtils.isBlank(dto.getApplyNo())) {
+ throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
+ }
+ checkApplyNoUnique(dto.getApplyNo(), null);
+
+ dto.setStatus(0);
+ return productionPlanMapper.insert(dto) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean update(ProductionPlanDto dto) {
+ if (dto == null || dto.getId() == null) {
+ throw new ServiceException("缂栬緫澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ ProductionPlan old = getById(dto.getId());
+ if (old == null) {
+ throw new ServiceException("缂栬緫澶辫触,涓荤敓浜ц鍒掍笉瀛樺湪");
+ }
+
+ // 鐘舵�佹牎楠�
+ if (old.getStatus() != 0) {
+ throw new BaseException("缂栬緫澶辫触,璇ョ敓浜ц鍒掑凡涓嬪彂鎴栭儴鍒嗕笅鍙戠姸鎬�,绂佹缂栬緫");
+ }
+
+ // applyNo鍙樻洿鎵嶆牎楠�
+ if (StringUtils.isNotBlank(dto.getApplyNo())
+ && !dto.getApplyNo().equals(old.getApplyNo())) {
+ checkApplyNoUnique(dto.getApplyNo(), 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)) {
+ 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;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importProdData(MultipartFile file) {
+ if (file == null || file.isEmpty()) {
+ throw new ServiceException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
+ List<ProductionPlanImportDto> list;
+ 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<>();
+ 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) + " 琛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
+ }
+ if (!applyNos.add(applyNo)) {
+ throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙�: " + applyNo);
+ }
+ if (StringUtils.isEmpty(materialCode)) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀墿鏂欑紪鐮佷笉鑳戒负绌�");
+ }
+
+ 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));
+ 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));
+ }
+
+ LocalDateTime now = LocalDateTime.now();
+ List<ProductionPlan> entityList = list.stream().map(dto -> {
+ ProductionPlan entity = new ProductionPlan();
+ BeanUtils.copyProperties(dto, entity);
+ entity.setStatus(0);
+ 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<ProductionPlanImportDto> exportList = new ArrayList<>();
+ for (ProductionPlan entity : list) {
+ ProductionPlanImportDto dto = new ProductionPlanImportDto();
+ BeanUtils.copyProperties(entity, dto);
+ exportList.add(dto);
+ }
+ ExcelUtil<ProductionPlanImportDto> util = new ExcelUtil<>(ProductionPlanImportDto.class);
+ util.exportExcel(response, exportList, "閿�鍞敓浜ч渶姹傛暟鎹�");
+ }
+}
--
Gitblit v1.9.3