From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 140 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
index c3f4e56..9a317b4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
@@ -2,11 +2,16 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
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.workorder.vo.MesProWorkOrderImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemBatchConfigDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum;
@@ -24,7 +29,11 @@
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -33,6 +42,7 @@
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -41,7 +51,7 @@
/**
* MES 鐢熶骇宸ュ崟 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -69,11 +79,17 @@
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ @Lazy // 閬垮厤 erpSaleOrderApiImpl -> ... -> mesProWorkOrderServiceImpl 鐨勫惊鐜緷璧�
+ private ErpSaleOrderApi saleOrderApi;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createWorkOrder(MesProWorkOrderSaveReqVO createReqVO) {
// 1. 鏍￠獙鏁版嵁
validateWorkOrderSaveData(null, createReqVO);
+ // 1.1 鍏宠仈钀ラ攢璁㈠崟淇℃伅鍥炲～
+ fillSaleOrderInfo(createReqVO);
// 2.1 璁剧疆榛樿鍊�
if (createReqVO.getParentId() == null) {
@@ -84,8 +100,10 @@
workOrder.setStatus(MesProWorkOrderStatusEnum.PREPARE.getStatus());
workOrderMapper.insert(workOrder);
- // 3. 鑷姩鐢熸垚 BOM锛氭牴鎹骇鍝� BOM 鐢熸垚宸ュ崟 BOM
- workOrderBomService.generateWorkOrderBom(workOrder.getId(), createReqVO, false);
+ // 3. 鑷姩鐢熸垚 BOM锛氭牴鎹骇鍝� BOM 鐢熸垚宸ュ崟 BOM锛堟棤浜у搧鐨勮繍缁�/鍙戠數/妫�淇被宸ュ崟璺宠繃锛�
+ if (createReqVO.getProductId() != null) {
+ workOrderBomService.generateWorkOrderBom(workOrder.getId(), createReqVO, false);
+ }
// 4. 宸ュ簭鐢卞墠绔�夋嫨浜у搧鍚庡甫鍏ワ紝涓嶅啀鑷姩鐢熸垚
@@ -105,11 +123,13 @@
}
// 1.2 鏍￠獙鏁版嵁
validateWorkOrderSaveData(updateReqVO.getId(), updateReqVO);
+ // 1.3 鍏宠仈钀ラ攢璁㈠崟淇℃伅鍥炲～
+ fillSaleOrderInfo(updateReqVO);
- // 2. 鍒ゆ柇浜у搧鎴栨暟閲忔槸鍚﹀彉鏇达紝濡傛灉鍙樻洿鍒欓噸鏂扮敓鎴� BOM锛坲pdated=true 浼氬厛娓呯悊鏃ф暟鎹級
+ // 2. 鍒ゆ柇浜у搧鎴栨暟閲忔槸鍚﹀彉鏇达紝濡傛灉鍙樻洿鍒欓噸鏂扮敓鎴� BOM锛坲pdated=true 浼氬厛娓呯悊鏃ф暟鎹紱鏃犱骇鍝佺殑杩愮淮绫诲伐鍗曡烦杩囷級
boolean productChanged = ObjUtil.notEqual(oldWorkOrder.getProductId(), updateReqVO.getProductId());
boolean quantityChanged = oldWorkOrder.getQuantity().compareTo(updateReqVO.getQuantity()) != 0;
- if (productChanged || quantityChanged) {
+ if ((productChanged || quantityChanged) && updateReqVO.getProductId() != null) {
workOrderBomService.generateWorkOrderBom(updateReqVO.getId(), updateReqVO, true);
}
// 2.1 宸ュ簭鐢卞墠绔鐞嗭紝浜у搧鍙樻洿鏃跺墠绔細閲嶆柊鑾峰彇宸ヨ壓璺嚎宸ュ簭
@@ -160,10 +180,86 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesProWorkOrderImportRespVO importWorkOrderList(List<MesProWorkOrderImportExcelVO> importList,
+ boolean updateSupport) {
+ // 1. 鏍￠獙闈炵┖
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MES_PRO_WORK_ORDER_IMPORT_LIST_IS_EMPTY);
+ }
+
+ // 2. 閫愯澶勭悊
+ MesProWorkOrderImportRespVO respVO = MesProWorkOrderImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getCode())) {
+ respVO.getFailureCodes().put(key, "宸ュ崟缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "宸ュ崟鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ // 2.1 瑙ｆ瀽浜у搧
+ Long productId = null;
+ if (StrUtil.isNotBlank(importItem.getProductCode())) {
+ MesMdItemDO item = itemService.getItemByCode(importItem.getProductCode().trim());
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "浜у搧缂栫爜[" + importItem.getProductCode() + "]涓嶅瓨鍦�");
+ return;
+ }
+ productId = item.getId();
+ }
+ // 2.2 瑙ｆ瀽瀹㈡埛
+ Long clientId = null;
+ if (StrUtil.isNotBlank(importItem.getClientName())) {
+ CrmCustomerRespDTO customer = customerApi.getCustomerByName(importItem.getClientName().trim());
+ if (customer == null) {
+ respVO.getFailureCodes().put(key, "瀹㈡埛鍚嶇О[" + importItem.getClientName() + "]涓嶅瓨鍦�");
+ return;
+ }
+ clientId = customer.getId();
+ }
+ // 2.3 鏋勫缓璇锋眰骞跺垱寤�/鏇存柊锛堝鐢ㄧ幇鏈� create/update 鏈嶅姟锛屼繚鐣� BOM 涓庢潯鐮佺敓鎴愰�昏緫锛�
+ MesProWorkOrderSaveReqVO reqVO = BeanUtils.toBean(importItem, MesProWorkOrderSaveReqVO.class);
+ reqVO.setProductId(productId);
+ reqVO.setClientId(clientId);
+ MesProWorkOrderDO existWorkOrder = workOrderMapper.selectByCode(importItem.getCode());
+ try {
+ if (existWorkOrder == null) {
+ reqVO.setId(null);
+ createWorkOrder(reqVO);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ reqVO.setId(existWorkOrder.getId());
+ updateWorkOrder(reqVO);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "宸ュ崟缂栫爜宸插瓨鍦�");
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ @Override
public PageResult<MesProWorkOrderDO> getWorkOrderPage(MesProWorkOrderPageReqVO pageReqVO) {
// 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
return workOrderMapper.selectPage(pageReqVO, permittedClientIds);
+ }
+
+ @Override
+ public PageResult<MesProWorkOrderDO> getWorkOrderSchedulePage(MesProWorkOrderPageReqVO pageReqVO) {
+ // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return workOrderMapper.selectSchedulePage(pageReqVO, permittedClientIds);
}
@Override
@@ -205,6 +301,20 @@
if (ObjUtil.notEqual(workOrder.getStatus(), MesProWorkOrderStatusEnum.CONFIRMED.getStatus())) {
throw exception(PRO_WORK_ORDER_NOT_CONFIRMED);
}
+ if (workOrder.getQuantityProduced() == null
+ || workOrder.getQuantity() == null
+ || workOrder.getQuantityProduced().compareTo(workOrder.getQuantity()) < 0) {
+ throw exception(PRO_WORK_ORDER_PRODUCTION_NOT_COMPLETE);
+ }
+ // 鏍￠獙姣忎釜浠诲姟鐨勫疄闄呬骇鍑烘槸鍚﹀凡杈炬垚璁″垝鏁伴噺锛堜换鍔＄姸鎬佸彧鏈夊湪宸ュ崟瀹屾垚鏃剁敱绾ц仈鏂规硶缃负宸插畬鎴愶紝涓嶈兘鍦ㄦ鏍￠獙鐘舵�侊級
+ List<MesProTaskDO> tasks = taskService.getTaskListByWorkOrderIds(Collections.singletonList(id));
+ boolean hasUnfinishedTask = CollUtil.isEmpty(tasks) || tasks.stream().anyMatch(task ->
+ task.getProducedQuantity() == null
+ || task.getQuantity() == null
+ || task.getProducedQuantity().compareTo(task.getQuantity()) < 0);
+ if (hasUnfinishedTask) {
+ throw exception(PRO_WORK_ORDER_PRODUCTION_NOT_COMPLETE);
+ }
// 2. 绾ц仈瀹屾垚鎵�鏈夊叧鑱斾换鍔�
taskService.finishTaskByOrderId(id);
@@ -238,12 +348,14 @@
private void validateWorkOrderSaveData(Long id, MesProWorkOrderSaveReqVO reqVO) {
// 1. 鏍￠獙缂栫爜鍞竴
validateWorkOrderCodeUnique(id, reqVO.getCode());
- // 2. 鏍￠獙浜у搧瀛樺湪
- itemService.validateItemExists(reqVO.getProductId());
- // 3. 鏍￠獙鎵规閰嶇疆锛堝鏋滀骇鍝佹湁 clientFlag=true锛屽垯 clientId 蹇呭～锛�
- MesMdItemBatchConfigDO batchConfig = itemBatchConfigService.getItemBatchConfigByItemId(reqVO.getProductId());
- if (batchConfig != null && Boolean.TRUE.equals(batchConfig.getClientFlag()) && reqVO.getClientId() == null) {
- throw exception(MD_CLIENT_NOT_EXISTS);
+ // 2. 浜у搧闈炵┖鏃舵牎楠屼骇鍝佸瓨鍦紙杩愮淮/鍙戠數/妫�淇被宸ュ崟鍙棤浜у搧锛�
+ if (reqVO.getProductId() != null) {
+ itemService.validateItemExists(reqVO.getProductId());
+ // 3. 鏍￠獙鎵规閰嶇疆锛堝鏋滀骇鍝佹湁 clientFlag=true锛屽垯 clientId 蹇呭～锛�
+ MesMdItemBatchConfigDO batchConfig = itemBatchConfigService.getItemBatchConfigByItemId(reqVO.getProductId());
+ if (batchConfig != null && Boolean.TRUE.equals(batchConfig.getClientFlag()) && reqVO.getClientId() == null) {
+ throw exception(MD_CLIENT_NOT_EXISTS);
+ }
}
}
@@ -260,6 +372,23 @@
}
}
+ /**
+ * 鍏宠仈钀ラ攢璁㈠崟锛圗RP 閿�鍞鍗曪級锛氭牎楠屽瓨鍦ㄦ�у苟鍥炲～鍗曞彿銆佸鎴�
+ */
+ private void fillSaleOrderInfo(MesProWorkOrderSaveReqVO reqVO) {
+ if (reqVO.getSaleOrderId() == null) {
+ return;
+ }
+ ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(reqVO.getSaleOrderId()).getCheckedData();
+ if (saleOrder == null) {
+ throw exception(PRO_WORK_ORDER_SALE_ORDER_NOT_EXISTS);
+ }
+ reqVO.setSaleOrderNo(saleOrder.getNo());
+ if (reqVO.getClientId() == null && saleOrder.getCustomerId() != null) {
+ reqVO.setClientId(saleOrder.getCustomerId());
+ }
+ }
+
@Override
public void updateProducedQuantity(Long id, BigDecimal incrQuantityProduced) {
// 鏍￠獙宸ュ崟瀛樺湪
--
Gitblit v1.9.3