From cbadfd8e691ab335965202a984db16e55ac8e42c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 17:51:06 +0800
Subject: [PATCH] 诚发五金：按技术方案重构业务功能并补齐库结构
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 217 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 193 insertions(+), 24 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
index e380ac7..1326d89 100644
--- 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
@@ -5,9 +5,17 @@
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.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseRequestApi;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseRequestCreateReqDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsAuditReqVO;
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.MesProWorkOrderItemRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
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;
@@ -22,7 +30,9 @@
import cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderSourceTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
+import cn.iocoder.yudao.module.mes.service.pro.material.MesProMaterialRequirementService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
@@ -45,6 +55,8 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -53,7 +65,7 @@
/**
* MES 鐢熶骇涓昏鍒掞紙MPS锛塖ervice 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -87,6 +99,12 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private MesProMaterialRequirementService materialRequirementService;
+ @Resource
+ private ErpPurchaseOrderApi purchaseOrderApi;
+ @Resource
+ private ErpPurchaseRequestApi purchaseRequestApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -140,6 +158,13 @@
public Long createMps(MesProMpsSaveReqVO createReqVO) {
// 鏍￠獙浜у搧瀛樺湪
itemService.validateItemExists(createReqVO.getProductId());
+ // 璁￠噺鍗曚綅鏈～鍐欐椂锛岄粯璁ゅ彇浜у搧鍗曚綅
+ if (createReqVO.getUnitMeasureId() == null) {
+ MesMdItemDO product = itemService.getItem(createReqVO.getProductId());
+ if (product != null) {
+ createReqVO.setUnitMeasureId(product.getUnitMeasureId());
+ }
+ }
// 濡傛灉鏈～鍐欑紪鐮侊紝鑷姩鐢熸垚
if (StrUtil.isBlank(createReqVO.getCode())) {
@@ -163,22 +188,25 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateMps(MesProMpsSaveReqVO updateReqVO) {
- // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateMpsExistsAndDraft(updateReqVO.getId());
+ // 鏍￠獙瀛樺湪 + 鍙紪杈戠姸鎬侊紙鏈紑濮嬨�佸鏍镐腑锛�
+ MesProMpsDO mps = validateMpsExistsAndEditable(updateReqVO.getId());
// 鏍￠獙缂栫爜鍞竴
validateMpsCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
- // 鏇存柊
+ // 鏇存柊锛涘鏍镐腑鐨勮鍒掕淇敼鍚庨渶瑕侀噸鏂版彁浜ゅ鏍�
MesProMpsDO updateObj = BeanUtils.toBean(updateReqVO, MesProMpsDO.class);
+ if (MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
+ updateObj.setStatus(MesProMpsStatusEnum.DRAFT.getStatus());
+ }
mpsMapper.updateById(updateObj);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteMps(Long id) {
- // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- MesProMpsDO mps = validateMpsExistsAndDraft(id);
+ // 鏍￠獙瀛樺湪 + 鍙紪杈戠姸鎬侊紙鏈紑濮嬨�佸鏍镐腑锛�
+ MesProMpsDO mps = validateMpsExistsAndEditable(id);
// 鏍￠獙鏄惁宸插叧鑱斿伐鍗�
if (mps.getWorkOrderId() != null) {
@@ -191,9 +219,98 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public void submitMps(Long id) {
+ MesProMpsDO mps = validateMpsExists(id);
+ if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())
+ && !MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_DRAFT);
+ }
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(id)
+ .setStatus(MesProMpsStatusEnum.AUDITING.getStatus()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditMps(MesProMpsAuditReqVO reqVO) {
+ MesProMpsDO mps = validateMpsExists(reqVO.getId());
+ if (!MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_AUDITING);
+ }
+ boolean approved = Boolean.TRUE.equals(reqVO.getApproved());
+ if (!approved && StrUtil.isBlank(reqVO.getAuditRemark())) {
+ throw exception(PRO_MPS_AUDIT_REMARK_REQUIRED);
+ }
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(reqVO.getId())
+ .setStatus(approved ? MesProMpsStatusEnum.APPROVED.getStatus()
+ : MesProMpsStatusEnum.DRAFT.getStatus())
+ .setAuditUserId(SecurityFrameworkUtils.getLoginUserId())
+ .setAuditTime(LocalDateTime.now())
+ .setAuditRemark(approved
+ ? StrUtil.blankToDefault(reqVO.getAuditRemark(), "瀹℃牳閫氳繃")
+ : reqVO.getAuditRemark()));
+ }
+
+ @Override
+ public List<MesProWorkOrderItemRespVO> getMpsItemList(Long id) {
+ MesProMpsDO mps = validateMpsExists(id);
+ // 鎸変骇鍝� BOM锛堜紭鍏堝伐鑹鸿矾绾� BOM锛夊睍寮�鍙跺瓙鐗╂枡锛屽苟鎸夎鍒掓暟閲忔姌绠楅渶姹傦紱
+ // 璁″垝灏氭湭鐢熸垚宸ュ崟锛屾棤鏉ユ簮涓烘湰璁″垝鐨勫湪閫旈噰璐紝鐩存帴鎸夊彲鐢ㄥ簱瀛樺垽鏂槸鍚﹀厖瓒�
+ return materialRequirementService.getItemListByProduct(mps.getProductId(), mps.getQuantity());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generatePurchaseRequest(Long id) {
+ MesProMpsDO mps = validateMpsExists(id);
+ if (!MesProMpsStatusEnum.APPROVED.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_APPROVED);
+ }
+ // 1. 鍙缂哄彛鐗╂枡鐢熸垚閲囪喘鏄庣粏锛氱己鍙� = 闇�姹� - 鍙敤搴撳瓨 - 鍦ㄩ�旈噰璐�
+ List<ErpPurchaseRequestCreateReqDTO.Item> shortageItems = new ArrayList<>();
+ for (MesProWorkOrderItemRespVO item : getMpsItemList(id)) {
+ if (Boolean.TRUE.equals(item.getStockSufficient())) {
+ continue;
+ }
+ BigDecimal supply = nullToZero(item.getStockQuantity())
+ .add(nullToZero(item.getPurchaseOrderQuantity()));
+ BigDecimal shortage = nullToZero(item.getQuantity()).subtract(supply);
+ if (shortage.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ MesMdItemDO itemDO = itemService.getItem(item.getItemId());
+ if (itemDO == null) {
+ continue;
+ }
+ shortageItems.add(new ErpPurchaseRequestCreateReqDTO.Item()
+ .setProductId(item.getItemId())
+ .setProductUnitId(itemDO.getUnitMeasureId())
+ .setCount(shortage)
+ .setDemandTime(mps.getRequestDate() != null ? mps.getRequestDate().toLocalDate() : null)
+ .setRemark("鐢熶骇璁″垝 " + mps.getCode() + " 搴撳瓨缂哄彛 " + shortage.stripTrailingZeros().toPlainString()));
+ }
+ if (CollUtil.isEmpty(shortageItems)) {
+ throw exception(PRO_MPS_NO_MATERIAL_SHORTAGE);
+ }
+ // 2. 鐢熸垚閲囪喘鐢宠鍗曪紙鑽夌锛屾棤渚涘簲鍟嗭紝鍚庣画鐢遍噰璐汉鍛樿ˉ鍏呭苟鎸夋祦绋嬫彁浜わ級
+ ErpPurchaseRequestCreateReqDTO createReqDTO = new ErpPurchaseRequestCreateReqDTO()
+ .setRequestTime(LocalDateTime.now())
+ .setRequestReason("鐢熶骇璁″垝 " + mps.getCode() + " 杈呮枡閲囪喘")
+ .setRemark("鐢辩敓浜ц鍒掕嚜鍔ㄧ敓鎴愶紝鍏� " + shortageItems.size() + " 椤圭墿鏂欏簱瀛樹笉瓒�")
+ .setItems(shortageItems);
+ Long purchaseRequestId = purchaseRequestApi.createPurchaseRequest(createReqDTO).getCheckedData();
+ // 3. 鍥炲啓閲囪喘鐢宠鍗曠紪鍙凤紝渚夸簬浠庤鍒掕拷婧�
+ mpsMapper.updateById(new MesProMpsDO().setId(id).setPurchaseRequestId(purchaseRequestId));
+ log.info("[generatePurchaseRequest] 璁″垝({}) 鐢熸垚閲囪喘鐢宠鍗�({})锛屾槑缁� {} 椤�", mps.getCode(), purchaseRequestId, shortageItems.size());
+ return purchaseRequestId;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public Long issueMps(Long id) {
- // 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- MesProMpsDO mps = validateMpsExistsAndDraft(id);
+ // 鏍￠獙瀛樺湪 + 宸插鏍哥姸鎬�
+ MesProMpsDO mps = validateMpsExistsAndApproved(id);
// 鍒涘缓鐢熶骇宸ュ崟
Long workOrderId = createWorkOrderFromMps(mps, mps.getQuantity());
@@ -222,11 +339,11 @@
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 (!MesProMpsStatusEnum.APPROVED.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_APPROVED);
}
if (productId == null) {
productId = mps.getProductId();
@@ -282,14 +399,32 @@
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
+ Long feedbackCount = feedbackMapper.selectCount(MesProFeedbackDO::getWorkOrderId, mps.getWorkOrderId());
+ if (feedbackCount != null && feedbackCount > 0) {
+ throw exception(PRO_MPS_WORK_ORDER_HAS_FEEDBACK);
+ }
+
+ // 1. 缁熻璇ュ伐鍗曡澶氬皯鏉� MPS 寮曠敤锛氬悎骞朵笅鍙戠殑澶氭潯 MPS 鍏变韩鍚屼竴涓伐鍗�
+ Long refCount = mpsMapper.selectCount(MesProMpsDO::getWorkOrderId, mps.getWorkOrderId());
+ if (refCount != null && refCount > 1) {
+ // 鍏变韩宸ュ崟锛氬彧鍙栨秷褰撳墠 MPS锛屼笉鍔ㄥ伐鍗�
+ log.info("[cancelMps] 鐢熶骇宸ュ崟({}) 琚� {} 鏉� MPS 鍏辩敤锛岃烦杩囩骇鑱斿彇娑堝伐鍗�",
+ mps.getWorkOrderId(), refCount);
+ } else {
+ MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(mps.getWorkOrderId());
+ if (workOrder != null
+ && MesProWorkOrderStatusEnum.CONFIRMED.getStatus().equals(workOrder.getStatus())) {
+ // 鍙湁"宸茬‘璁�"鐘舵�佺殑宸ュ崟鎵嶉渶瑕佺骇鑱斿彇娑�
+ workOrderService.cancelWorkOrder(mps.getWorkOrderId());
+ log.info("[cancelMps] 绾ц仈鍙栨秷鐢熶骇宸ュ崟锛寃orkOrderId={}", mps.getWorkOrderId());
+ } else {
+ // 宸ュ崟宸叉槸鑽夌/宸插畬鎴�/宸插彇娑堬紝鏃犻渶绾ц仈鍙栨秷锛岀洿鎺ュ彇娑� MPS
+ log.info("[cancelMps] 鐢熶骇宸ュ崟({}) 鐘舵�佷负 {}锛屾棤闇�绾ц仈鍙栨秷",
+ mps.getWorkOrderId(), workOrder != null ? workOrder.getStatus() : "null");
+ }
}
}
@@ -329,9 +464,7 @@
@Override
public PageResult<MesProMpsDO> getMpsPage(MesProMpsPageReqVO pageReqVO) {
- // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
- List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
- return mpsMapper.selectPage(pageReqVO, permittedClientIds);
+ return mpsMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -424,6 +557,10 @@
* 鍒ゆ柇鍗曚釜 MPS 鏄惁瀹屾垚
*/
private boolean isMpsFinished(MesProMpsDO mps) {
+ // 宸插彇娑堢殑 MPS 瑙嗕负缁堟�侊紝涓嶅啀闃诲鐢熶骇瀹屾垚鍒ゆ柇锛堜笌 checkCanCreateSalesNotice 鐨勫彛寰勪繚鎸佷竴鑷达級
+ if (MesProMpsStatusEnum.CANCELED.getStatus().equals(mps.getStatus())) {
+ return true;
+ }
// 1. 宸茬敓浜ф暟閲� >= 璁″垝鏁伴噺
BigDecimal quantityProduced = ObjUtil.defaultIfNull(mps.getQuantityProduced(), BigDecimal.ZERO);
if (quantityProduced.compareTo(mps.getQuantity()) < 0) {
@@ -490,6 +627,33 @@
}
/**
+ * 鏍￠獙 MPS 瀛樺湪 + 宸插鏍哥姸鎬�
+ */
+ private MesProMpsDO validateMpsExistsAndApproved(Long id) {
+ MesProMpsDO mps = validateMpsExists(id);
+ if (!MesProMpsStatusEnum.APPROVED.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_APPROVED);
+ }
+ return mps;
+ }
+
+ /**
+ * 鏍￠獙 MPS 瀛樺湪 + 鍙紪杈戠姸鎬侊紙鏈紑濮嬨�佸鏍镐腑锛�
+ */
+ private MesProMpsDO validateMpsExistsAndEditable(Long id) {
+ MesProMpsDO mps = validateMpsExists(id);
+ if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())
+ && !MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
+ throw exception(PRO_MPS_NOT_DRAFT);
+ }
+ return mps;
+ }
+
+ private static BigDecimal nullToZero(BigDecimal value) {
+ return value != null ? value : BigDecimal.ZERO;
+ }
+
+ /**
* 鏍￠獙 MPS 缂栫爜鍞竴
*/
private void validateMpsCodeUnique(Long id, String code) {
@@ -519,8 +683,9 @@
}
Long routeId = routeProduct.getRouteId();
- // 2. 鏍￠獙宸ヨ壓璺嚎鏄惁鏈夊伐搴�
- List<MesProRouteProcessDO> routeProcesses = routeProcessService.getRouteProcessListByRouteId(routeId);
+ // 2. 鏍￠獙宸ヨ壓璺嚎鏄惁鏈夊伐搴忥紙鎸変骇鍝佽繃婊ゅ叾瀹冧骇鍝佺殑浜у嚭鐗╂枡锛�
+ List<MesProRouteProcessDO> routeProcesses = routeProcessService
+ .getRouteProcessListByProductId(mps.getProductId());
if (CollUtil.isEmpty(routeProcesses)) {
throw exception(PRO_ROUTE_ENABLE_NO_PROCESS);
}
@@ -560,6 +725,10 @@
.map(Long::valueOf).collect(Collectors.toList()));
}
process.setColorCode(rp.getColorCode());
+ // 甯﹀叆宸ヨ壓璺嚎浜у搧閰嶇疆鐨勬姤宸ヤ粨搴�
+ process.setWarehouseId(routeProduct.getWarehouseId());
+ process.setLocationId(routeProduct.getLocationId());
+ process.setAreaId(routeProduct.getAreaId());
// 甯﹀叆宸ュ簭鎶曟枡BOM
List<MesProRouteProductBomDO> routeBomItems = bomMap != null ? bomMap.get(rp.getProcessId()) : null;
if (CollUtil.isNotEmpty(routeBomItems)) {
@@ -595,4 +764,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3