From 1458532478eedbd82947e6ee8515f881d4a4912a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 16:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 433 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 433 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
new file mode 100644
index 0000000..34ca046
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -0,0 +1,433 @@
+package cn.iocoder.yudao.module.mes.service.pro.mps;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsMergeItemDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.mps.MesProMpsMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.mps.MesProMpsMergeItemMapper;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderSourceTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * MES 鐢熶骇涓昏鍒掞紙MPS锛塖ervice 瀹炵幇绫�
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Service
+@Validated
+@Slf4j
+public class MesProMpsServiceImpl implements MesProMpsService {
+
+ /**
+ * MPS 缂栫爜瑙勫垯
+ */
+ private static final String MPS_CODE_RULE = "MPS";
+
+ @Resource
+ private MesProMpsMapper mpsMapper;
+ @Resource
+ private MesProMpsMergeItemMapper mergeItemMapper;
+ @Resource
+ private MesProWorkOrderService workOrderService;
+ @Resource
+ private MesMdItemService itemService;
+ @Resource
+ private MesMdAutoCodeRecordService autoCodeRecordService;
+ @Resource
+ private CrmCustomerApi customerApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createMps(Long saleOrderId, String saleOrderNo, Long saleOrderItemId,
+ Long mdmItemId, String productName, BigDecimal quantity, Long clientId,
+ String requestDate, String remark) {
+ // 1. 鏍规嵁 MDM 鐗╂枡 ID 鏌ユ壘 MES 浜у搧
+ cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO mesItem = itemService.getItemByMdmItemId(mdmItemId);
+ if (mesItem == null) {
+ // MES 浜у搧涓嶅瓨鍦紝鎶涘嚭寮傚父骞跺寘鍚骇鍝佸悕绉版彁绀�
+ throw exception(PRO_MPS_MES_PRODUCT_NOT_EXISTS, productName != null ? productName : mdmItemId);
+ }
+
+ // 2. 鐢熸垚 MPS 缂栫爜
+ String code = generateMpsCode();
+
+ // 3. 瑙ｆ瀽闇�姹傛棩鏈�
+ LocalDateTime requestDateTime = null;
+ if (StrUtil.isNotBlank(requestDate)) {
+ try {
+ requestDateTime = LocalDateTime.parse(requestDate, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ } catch (Exception e) {
+ requestDateTime = LocalDateTime.parse(requestDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ }
+ }
+
+ // 4. 鍒涘缓 MPS锛堜娇鐢� MES 浜у搧 ID锛�
+ MesProMpsDO mps = new MesProMpsDO();
+ mps.setCode(code);
+ mps.setStatus(MesProMpsStatusEnum.DRAFT.getStatus());
+ mps.setSaleOrderId(saleOrderId);
+ mps.setSaleOrderNo(saleOrderNo);
+ mps.setSaleOrderItemId(saleOrderItemId);
+ mps.setProductId(mesItem.getId()); // 浣跨敤 MES 浜у搧 ID
+ mps.setQuantity(quantity);
+ mps.setQuantityProduced(BigDecimal.ZERO);
+ mps.setUnitMeasureId(mesItem.getUnitMeasureId()); // 浠� MES 浜у搧鑾峰彇璁￠噺鍗曚綅
+ mps.setClientId(clientId);
+ mps.setRequestDate(requestDateTime);
+ mps.setMergeFlag(0);
+ mps.setRemark(remark);
+
+ mpsMapper.insert(mps);
+ log.info("[createMps] 鍒涘缓 MPS 鎴愬姛锛宨d={}, code={}, saleOrderItemId={}, mdmItemId={}, productId={}",
+ mps.getId(), mps.getCode(), mps.getSaleOrderItemId(), mdmItemId, mesItem.getId());
+ return mps.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createMps(MesProMpsSaveReqVO createReqVO) {
+ // 鏍￠獙浜у搧瀛樺湪
+ itemService.validateItemExists(createReqVO.getProductId());
+
+ // 濡傛灉鏈～鍐欑紪鐮侊紝鑷姩鐢熸垚
+ if (StrUtil.isBlank(createReqVO.getCode())) {
+ createReqVO.setCode(generateMpsCode());
+ } else {
+ // 鏍￠獙缂栫爜鍞竴
+ validateMpsCodeUnique(null, createReqVO.getCode());
+ }
+
+ // 鎻掑叆
+ MesProMpsDO mps = BeanUtils.toBean(createReqVO, MesProMpsDO.class);
+ mps.setStatus(MesProMpsStatusEnum.DRAFT.getStatus());
+ mps.setQuantityProduced(BigDecimal.ZERO);
+ mps.setMergeFlag(0);
+ mpsMapper.insert(mps);
+
+ log.info("[createMps] 鎵嬪姩鍒涘缓 MPS 鎴愬姛锛宨d={}, code={}", mps.getId(), mps.getCode());
+ return mps.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateMps(MesProMpsSaveReqVO updateReqVO) {
+ // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ validateMpsExistsAndDraft(updateReqVO.getId());
+
+ // 鏍￠獙缂栫爜鍞竴
+ validateMpsCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
+
+ // 鏇存柊
+ MesProMpsDO updateObj = BeanUtils.toBean(updateReqVO, MesProMpsDO.class);
+ mpsMapper.updateById(updateObj);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteMps(Long id) {
+ // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ MesProMpsDO mps = validateMpsExistsAndDraft(id);
+
+ // 鏍￠獙鏄惁宸插叧鑱斿伐鍗�
+ if (mps.getWorkOrderId() != null) {
+ throw exception(PRO_MPS_HAS_WORK_ORDER);
+ }
+
+ // 鍒犻櫎
+ mpsMapper.deleteById(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long issueMps(Long id) {
+ // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ MesProMpsDO mps = validateMpsExistsAndDraft(id);
+
+ // 鍒涘缓鐢熶骇宸ュ崟
+ Long workOrderId = createWorkOrderFromMps(mps, mps.getQuantity());
+
+ // 鏇存柊 MPS 鐘舵��
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(id)
+ .setStatus(MesProMpsStatusEnum.ISSUED.getStatus())
+ .setWorkOrderId(workOrderId)
+ .setIssueDate(LocalDateTime.now()));
+
+ log.info("[issueMps] MPS 涓嬪彂鎴愬姛锛宮psId={}, workOrderId={}", id, workOrderId);
+ return workOrderId;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long mergeAndIssueMps(List<Long> mpsIds) {
+ // 鏍￠獙 MPS 鍒楄〃
+ if (CollUtil.isEmpty(mpsIds) || mpsIds.size() < 2) {
+ throw exception(PRO_MPS_MERGE_AT_LEAST_TWO);
+ }
+
+ List<MesProMpsDO> mpsList = mpsMapper.selectBatchIds(mpsIds);
+ if (mpsList.size() != mpsIds.size()) {
+ throw exception(PRO_MPS_NOT_EXISTS);
+ }
+
+ // 鏍￠獙锛氬繀椤绘槸鐩稿悓浜у搧銆佽崏绋跨姸鎬�
+ Long productId = null;
+ for (MesProMpsDO mps : mpsList) {
+ if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_DRAFT);
+ }
+ if (productId == null) {
+ productId = mps.getProductId();
+ } else if (!productId.equals(mps.getProductId())) {
+ throw exception(PRO_MPS_MERGE_PRODUCT_MISMATCH);
+ }
+ }
+
+ // 璁＄畻鍚堝苟鏁伴噺
+ BigDecimal totalQuantity = mpsList.stream()
+ .map(MesProMpsDO::getQuantity)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ // 鍙栫涓�鏉� MPS 浣滀负涓昏褰曪紝鍒涘缓鐢熶骇宸ュ崟
+ MesProMpsDO firstMps = mpsList.get(0);
+ Long workOrderId = createWorkOrderFromMps(firstMps, totalQuantity);
+
+ // 鐢熸垚鍚堝苟鎵规鍙�
+ String mergeBatchNo = generateMergeBatchNo();
+
+ // 鏇存柊鎵�鏈� MPS 鐘舵�侊紝璁板綍鍚堝苟鍏崇郴
+ for (MesProMpsDO mps : mpsList) {
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(mps.getId())
+ .setStatus(MesProMpsStatusEnum.ISSUED.getStatus())
+ .setWorkOrderId(workOrderId)
+ .setMergeFlag(1)
+ .setMergeBatchNo(mergeBatchNo)
+ .setIssueDate(LocalDateTime.now()));
+
+ // 璁板綍鍚堝苟鏄庣粏
+ MesProMpsMergeItemDO mergeItem = new MesProMpsMergeItemDO();
+ mergeItem.setMergeBatchNo(mergeBatchNo);
+ mergeItem.setMpsId(mps.getId());
+ mergeItem.setWorkOrderId(workOrderId);
+ mergeItem.setQuantity(mps.getQuantity());
+ mergeItemMapper.insert(mergeItem);
+ }
+
+ log.info("[mergeAndIssueMps] MPS 鍚堝苟涓嬪彂鎴愬姛锛宮psIds={}, workOrderId={}, totalQuantity={}",
+ mpsIds, workOrderId, totalQuantity);
+ return workOrderId;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelMps(Long id) {
+ // 鏍￠獙瀛樺湪
+ MesProMpsDO mps = validateMpsExists(id);
+
+ // 鏍￠獙鐘舵�侊細鍙湁宸蹭笅鍙戠姸鎬佹墠鑳藉彇娑�
+ if (!MesProMpsStatusEnum.ISSUED.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_ISSUED);
+ }
+
+ // 绾ц仈鍙栨秷鍏宠仈鐨勭敓浜у伐鍗�
+ if (mps.getWorkOrderId() != null) {
+ try {
+ workOrderService.cancelWorkOrder(mps.getWorkOrderId());
+ log.info("[cancelMps] 绾ц仈鍙栨秷鐢熶骇宸ュ崟锛寃orkOrderId={}", mps.getWorkOrderId());
+ } catch (Exception e) {
+ // 宸ュ崟鍙兘宸插畬鎴愭垨宸插彇娑堬紝璁板綍鏃ュ織浣嗕笉闃绘 MPS 鍙栨秷
+ log.warn("[cancelMps] 鍙栨秷鐢熶骇宸ュ崟澶辫触锛寃orkOrderId={}锛屽師鍥狅細{}", mps.getWorkOrderId(), e.getMessage());
+ }
+ }
+
+ // 鏇存柊 MPS 鐘舵��
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(id)
+ .setStatus(MesProMpsStatusEnum.CANCELED.getStatus()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void finishMps(Long id) {
+ // 鏍￠獙瀛樺湪
+ MesProMpsDO mps = validateMpsExists(id);
+
+ // 鏍￠獙鐘舵�侊細鍙湁宸蹭笅鍙戠姸鎬佹墠鑳藉畬鎴�
+ if (!MesProMpsStatusEnum.ISSUED.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_ISSUED);
+ }
+
+ // 鏇存柊鐘舵��
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(id)
+ .setStatus(MesProMpsStatusEnum.FINISHED.getStatus())
+ .setFinishDate(LocalDateTime.now()));
+ }
+
+ @Override
+ public MesProMpsDO getMpsBySaleOrderItemId(Long saleOrderItemId) {
+ return mpsMapper.selectBySaleOrderItemId(saleOrderItemId);
+ }
+
+ @Override
+ public MesProMpsDO getMps(Long id) {
+ return mpsMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult<MesProMpsDO> getMpsPage(MesProMpsPageReqVO pageReqVO) {
+ // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return mpsMapper.selectPage(pageReqVO, permittedClientIds);
+ }
+
+ @Override
+ public List<MesProMpsDO> getMpsList(Collection<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return Collections.emptyList();
+ }
+ return mpsMapper.selectBatchIds(ids);
+ }
+
+ @Override
+ public List<MesProMpsDO> getMpsListBySaleOrderItemIds(Collection<Long> saleOrderItemIds) {
+ return mpsMapper.selectListBySaleOrderItemIds(saleOrderItemIds);
+ }
+
+ @Override
+ public List<MesProMpsDO> getMergeableMpsList(Long productId) {
+ return mpsMapper.selectMergeableList(productId);
+ }
+
+ @Override
+ public void updateProducedQuantity(Long id, BigDecimal incrQuantity) {
+ mpsMapper.updateProducedQuantity(id, incrQuantity);
+ }
+
+ // ========== 绉佹湁鏂规硶 ==========
+
+ /**
+ * 鐢熸垚 MPS 缂栫爜
+ */
+ private String generateMpsCode() {
+ try {
+ return autoCodeRecordService.generateAutoCode(MPS_CODE_RULE);
+ } catch (Exception e) {
+ // 濡傛灉缂栫爜瑙勫垯涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�
+ log.warn("[generateMpsCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�", MPS_CODE_RULE);
+ return "MPS" + System.currentTimeMillis();
+ }
+ }
+
+ /**
+ * 鐢熸垚鍚堝苟鎵规鍙�
+ */
+ private String generateMergeBatchNo() {
+ return "MERGE" + System.currentTimeMillis();
+ }
+
+ /**
+ * 鏍￠獙 MPS 瀛樺湪
+ */
+ private MesProMpsDO validateMpsExists(Long id) {
+ MesProMpsDO mps = mpsMapper.selectById(id);
+ if (mps == null) {
+ throw exception(PRO_MPS_NOT_EXISTS);
+ }
+ return mps;
+ }
+
+ /**
+ * 鏍￠獙 MPS 瀛樺湪 + 鑽夌鐘舵��
+ */
+ private MesProMpsDO validateMpsExistsAndDraft(Long id) {
+ MesProMpsDO mps = validateMpsExists(id);
+ if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_DRAFT);
+ }
+ return mps;
+ }
+
+ /**
+ * 鏍￠獙 MPS 缂栫爜鍞竴
+ */
+ private void validateMpsCodeUnique(Long id, String code) {
+ if (StrUtil.isBlank(code)) {
+ return;
+ }
+ MesProMpsDO mps = mpsMapper.selectByCode(code);
+ if (mps == null) {
+ return;
+ }
+ if (id == null) {
+ throw exception(PRO_MPS_CODE_DUPLICATE);
+ }
+ if (!id.equals(mps.getId())) {
+ throw exception(PRO_MPS_CODE_DUPLICATE);
+ }
+ }
+
+ /**
+ * 鏍规嵁 MPS 鍒涘缓鐢熶骇宸ュ崟
+ */
+ private Long createWorkOrderFromMps(MesProMpsDO mps, BigDecimal quantity) {
+ MesProWorkOrderSaveReqVO workOrderReq = new MesProWorkOrderSaveReqVO();
+ workOrderReq.setCode(generateWorkOrderCode());
+ workOrderReq.setName("鐢熶骇宸ュ崟-" + mps.getCode());
+ workOrderReq.setType(1); // 鑷鐢熶骇
+ workOrderReq.setOrderSourceType(MesProWorkOrderSourceTypeEnum.ORDER.getType());
+ workOrderReq.setOrderSourceCode(mps.getSaleOrderNo());
+ workOrderReq.setProductId(mps.getProductId());
+ workOrderReq.setQuantity(quantity);
+ workOrderReq.setClientId(mps.getClientId());
+ workOrderReq.setRequestDate(mps.getRequestDate() != null ? mps.getRequestDate() : LocalDateTime.now());
+ workOrderReq.setRemark("鏉ヨ嚜 MPS: " + mps.getCode());
+
+ Long workOrderId = workOrderService.createWorkOrder(workOrderReq);
+
+ // 宸ュ崟鐩存帴纭涓哄凡纭鐘舵�侊紙璺宠繃鑽夌锛�
+ workOrderService.confirmWorkOrder(workOrderId);
+
+ return workOrderId;
+ }
+
+ /**
+ * 鐢熸垚鐢熶骇宸ュ崟缂栫爜
+ */
+ private String generateWorkOrderCode() {
+ try {
+ return autoCodeRecordService.generateAutoCode("WO");
+ } catch (Exception e) {
+ log.warn("[generateWorkOrderCode] 缂栫爜瑙勫垯 WO 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�");
+ return "WO" + System.currentTimeMillis();
+ }
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3