From 5f708178b260cabf081f9049cf51e9ad66ae2911 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 10 九月 2026 14:49:29 +0800
Subject: [PATCH] feat(erp/mes): 新增采购订单/销售订单/计量器具 Excel 导入，含导入菜单权限 SQL
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 335 insertions(+), 23 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index b1db5b2..18985aa 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -2,13 +2,25 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.crm.api.contract.CrmContractApi;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderItemMapper;
@@ -21,19 +33,26 @@
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsCreateReqDTO;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
+import org.flowable.engine.repository.ProcessDefinition;
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.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -50,6 +69,20 @@
@Validated
@Slf4j
public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
+
+ /**
+ * MPS 鐘舵�侊細宸插彇娑堬紙瀵瑰簲 MES 妯″潡 MesProMpsStatusEnum.CANCELED 鐨勫�� 3锛�
+ */
+ private static final Integer MPS_STATUS_CANCELED = 3;
+
+ /**
+ * BPM 閿�鍞鍗曞鎵瑰垎绫荤紪鐮�
+ */
+ private static final String SALE_ORDER_APPROVE_CATEGORY_CODE = "sale_order_approve";
+ /**
+ * BPM 閿�鍞鍗曞鎵规祦绋嬪畾涔� Key锛堟彁浜ゅ悗杩涘叆鍗忓悓鍔炲叕瀹℃壒锛�
+ */
+ private static final String SALE_ORDER_APPROVE_PROCESS_DEFINITION_KEY = "sale_order_approve";
@Resource
private ErpSaleOrderMapper saleOrderMapper;
@@ -77,6 +110,13 @@
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createSaleOrder(ErpSaleOrderSaveReqVO createReqVO) {
@@ -98,9 +138,10 @@
throw exception(SALE_ORDER_NO_EXISTS);
}
- // 2.1 鎻掑叆璁㈠崟
+ // 2.1 鎻掑叆璁㈠崟锛堝垱寤哄悗涓烘湭鎻愪氦鐘舵�侊紝闇�鎵嬪姩鎻愪氦瀹℃壒鍒板崗鍚屽姙鍏級
ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus())
+ .setDepositPrice(ObjectUtil.defaultIfNull(createReqVO.getDepositPrice(), BigDecimal.ZERO))
.setOutCount(BigDecimal.ZERO).setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
saleOrderMapper.insert(saleOrder);
@@ -118,10 +159,12 @@
public void updateSaleOrder(ErpSaleOrderSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪
ErpSaleOrderDO saleOrder = validateSaleOrderExists(updateReqVO.getId());
- if (ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ // 1.2 鏍￠獙鐘舵�侊細鍙湁鏈彁浜ゆ垨宸查┏鍥炵殑閿�鍞鍗曟墠鑳戒慨鏀�
+ if (!ErpAuditStatus.DRAFT.getStatus().equals(saleOrder.getStatus())
+ && !ErpAuditStatus.REJECT.getStatus().equals(saleOrder.getStatus())) {
throw exception(SALE_ORDER_UPDATE_FAIL_APPROVE, saleOrder.getNo());
}
- // 1.2 鏍￠獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
+ // 1.3 鏍￠獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
customerApi.validateCustomer(updateReqVO.getCustomerId());
// 1.3 鏍￠獙缁撶畻璐︽埛
if (updateReqVO.getAccountId() != null) {
@@ -136,12 +179,187 @@
// 2.1 鏇存柊璁㈠崟
ErpSaleOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpSaleOrderDO.class);
+ updateObj.setDepositPrice(ObjectUtil.defaultIfNull(updateReqVO.getDepositPrice(), BigDecimal.ZERO));
calculateTotalPrice(updateObj, saleOrderItems);
saleOrderMapper.updateById(updateObj);
// 2.2 鏇存柊璁㈠崟椤�
updateSaleOrderItemList(updateReqVO.getId(), saleOrderItems);
// 2.3 鏇存柊闄勪欢
storageAttachmentApi.updateAttachments("file", "erp_sale_order", updateReqVO.getId(), updateReqVO.getBlobIds());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public ErpSaleOrderImportRespVO importSaleOrderList(List<ErpSaleOrderImportExcelVO> importList) {
+ ErpSaleOrderImportRespVO respVO = ErpSaleOrderImportRespVO.builder()
+ .createList(new ArrayList<>())
+ .updateList(new ArrayList<>())
+ .failureList(new LinkedHashMap<>())
+ .build();
+ if (CollUtil.isEmpty(importList)) {
+ return respVO;
+ }
+
+ // 1. 棰勭儹鈥滃鎴峰悕绉� -> 瀹㈡埛缂栧彿鈥濇槧灏勶紙瀹㈡埛涓绘暟鎹湪 CRM 妯″潡锛�
+ Map<String, Long> customerIdMap = new HashMap<>();
+ List<CrmCustomerRespDTO> customers = customerApi.getCustomerSimpleList();
+ if (CollUtil.isNotEmpty(customers)) {
+ customers.forEach(customer -> {
+ if (StrUtil.isNotBlank(customer.getName())) {
+ customerIdMap.putIfAbsent(customer.getName().trim(), customer.getId());
+ }
+ });
+ }
+
+ // 2. 鎸夆�滈攢鍞崟缂栧彿鈥濆垎缁勶細鍚岀紪鍙峰琛� = 涓�寮犺鍗曠殑澶氭潯鏄庣粏锛涚紪鍙蜂负绌哄垯姣忚鐙珛鎴愬崟
+ Map<String, List<ErpSaleOrderImportExcelVO>> orderGroups = new LinkedHashMap<>();
+ for (int i = 0; i < importList.size(); i++) {
+ ErpSaleOrderImportExcelVO row = importList.get(i);
+ if (row == null || (StrUtil.isBlank(row.getCustomerName()) && StrUtil.isBlank(row.getProductCode())
+ && StrUtil.isBlank(row.getNo()))) {
+ continue; // 璺宠繃绌鸿
+ }
+ String key = StrUtil.isNotBlank(row.getNo()) ? row.getNo().trim() : "__row_" + (i + 2);
+ orderGroups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
+ }
+
+ // 3. 閫愪釜璁㈠崟瀵煎叆锛堝崟寮犺鍗曞け璐ヤ笉褰卞搷鍏跺畠锛�
+ for (Map.Entry<String, List<ErpSaleOrderImportExcelVO>> entry : orderGroups.entrySet()) {
+ List<ErpSaleOrderImportExcelVO> rows = entry.getValue();
+ String label = StrUtil.isNotBlank(rows.get(0).getNo()) ? rows.get(0).getNo().trim()
+ : "绗� " + entry.getKey().substring("__row_".length()) + " 琛�";
+ try {
+ ErpSaleOrderDO saleOrder = createSaleOrderByImport(rows, customerIdMap);
+ respVO.getCreateList().add(saleOrder.getNo());
+ } catch (Exception ex) {
+ respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 渚濇嵁瀵煎叆鏁版嵁鍒涘缓涓�寮犻攢鍞鍗曪紙鍚槑缁嗭級銆�
+ *
+ * 娉ㄦ剰锛氭澶勪笉璋冪敤 submitSaleOrder锛屽洜姝や笉浼氬垱寤� BPM 宸ヤ綔娴侊紱璁㈠崟鐘舵�佸浐瀹氫负鈥滄湭鎻愪氦(0)鈥濓紝
+ * 鍙湪鍒楄〃涓户缁紪杈戞垨鎻愪氦瀹℃壒銆�
+ */
+ private ErpSaleOrderDO createSaleOrderByImport(List<ErpSaleOrderImportExcelVO> rows,
+ Map<String, Long> customerIdMap) {
+ // 1. 瀹㈡埛锛堝彇璇ョ粍棣栬锛�
+ ErpSaleOrderImportExcelVO head = rows.get(0);
+ if (StrUtil.isBlank(head.getCustomerName())) {
+ throw new IllegalArgumentException("瀹㈡埛鍚嶇О涓嶈兘涓虹┖");
+ }
+ Long customerId = customerIdMap.get(head.getCustomerName().trim());
+ if (customerId == null) {
+ throw new IllegalArgumentException("瀹㈡埛涓嶅瓨鍦細" + head.getCustomerName());
+ }
+ customerApi.validateCustomer(customerId);
+
+ // 2. 鏄庣粏
+ List<ErpSaleOrderSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpSaleOrderImportExcelVO row : rows) {
+ if (StrUtil.isBlank(row.getProductCode())) {
+ throw new IllegalArgumentException("浜у搧缂栫爜涓嶈兘涓虹┖");
+ }
+ CommonResult<MdmItemRespDTO> itemResult = mdmItemApi.getItemByCode(row.getProductCode().trim());
+ MdmItemRespDTO item = itemResult == null ? null : itemResult.getData();
+ if (item == null) {
+ throw new IllegalArgumentException("浜у搧涓嶅瓨鍦細" + row.getProductCode());
+ }
+ if (row.getCount() == null) {
+ throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鐨勬暟閲忎笉鑳戒负绌�");
+ }
+ if (item.getUnitMeasureId() == null) {
+ throw new IllegalArgumentException("浜у搧[" + row.getProductCode() + "]鏈厤缃閲忓崟浣嶏紝璇峰厛鍦ㄧ墿鏂欎腑缁存姢");
+ }
+ ErpSaleOrderSaveReqVO.Item itemVO = new ErpSaleOrderSaveReqVO.Item();
+ itemVO.setProductId(item.getId());
+ itemVO.setProductUnitId(item.getUnitMeasureId());
+ // 鍗曚环锛氭湭濉啓鏃跺彇鐗╂枡鐨勯攢鍞环锛堜笌椤甸潰閫変骇鍝佸悗鐨勯粯璁ゅ�间竴鑷达級
+ itemVO.setProductPrice(row.getProductPrice() != null ? row.getProductPrice()
+ : ObjectUtil.defaultIfNull(item.getSalesPrice(), BigDecimal.ZERO));
+ itemVO.setCount(row.getCount());
+ itemVO.setTaxPercent(row.getTaxPercent());
+ itemVO.setNeedProduction(parseNeedProduction(row.getNeedProduction()));
+ itemVO.setRemark(row.getRemark());
+ items.add(itemVO);
+ }
+
+ // 3. 鍗曞彿锛氬～浜嗗氨鐢紙鏍￠獙鍞竴锛夛紝娌″～鑷姩鐢熸垚
+ String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
+ : noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
+ if (saleOrderMapper.selectByNo(no) != null) {
+ throw new IllegalArgumentException("閿�鍞崟缂栧彿宸插瓨鍦細" + no);
+ }
+
+ // 4. 缁勮涓昏〃锛氬鍏ュ悗鍥哄畾涓衡�滄湭鎻愪氦(0)鈥濈姸鎬�
+ ErpSaleOrderDO saleOrder = new ErpSaleOrderDO();
+ saleOrder.setNo(no);
+ saleOrder.setCustomerId(customerId);
+ saleOrder.setContractNo(head.getContractNo());
+ saleOrder.setOrderTime(parseImportOrderTime(head.getOrderTime()));
+ saleOrder.setRemark(head.getRemark());
+ saleOrder.setStatus(ErpAuditStatus.DRAFT.getStatus());
+ saleOrder.setDepositPrice(BigDecimal.ZERO);
+ saleOrder.setOutCount(BigDecimal.ZERO);
+ saleOrder.setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus());
+
+ List<ErpSaleOrderItemDO> itemDOs = validateSaleOrderItems(items);
+ calculateTotalPrice(saleOrder, itemDOs);
+ saleOrderMapper.insert(saleOrder);
+ itemDOs.forEach(item -> item.setOrderId(saleOrder.getId()));
+ saleOrderItemMapper.insertBatch(itemDOs);
+ return saleOrder;
+ }
+
+ /**
+ * 瑙ｆ瀽鈥滄槸鍚﹂渶瑕佺敓浜р�濓細鐣欑┖榛樿鈥滄槸(1)鈥濓紝濉�滃惁/0/涓嶉渶瑕佲�濆垯涓衡�滃惁(0)鈥�
+ */
+ private Integer parseNeedProduction(String text) {
+ if (StrUtil.isBlank(text)) {
+ return 1; // 涓庨〉闈㈡柊澧炴槑缁嗙殑榛樿鍊间竴鑷�
+ }
+ String value = text.trim();
+ boolean no = "鍚�".equals(value) || "0".equals(value) || "涓嶉渶瑕�".equals(value)
+ || "false".equalsIgnoreCase(value) || "no".equalsIgnoreCase(value);
+ return no ? 0 : 1;
+ }
+
+ /**
+ * 瑙ｆ瀽瀵煎叆鐨勪笅鍗曟椂闂达紝鍏煎澶氱甯歌鏍煎紡锛涗负绌哄彇褰撳墠鏃堕棿
+ */
+ private LocalDateTime parseImportOrderTime(String text) {
+ if (StrUtil.isBlank(text)) {
+ return LocalDateTime.now();
+ }
+ String value = text.trim();
+ for (String pattern : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd HH:mm:ss"}) {
+ try {
+ return LocalDateTime.parse(value, DateTimeFormatter.ofPattern(pattern));
+ } catch (Exception ignored) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
+ }
+ }
+ for (String pattern : new String[]{"yyyy-MM-dd", "yyyy/M/d"}) {
+ try {
+ return LocalDate.parse(value, DateTimeFormatter.ofPattern(pattern)).atStartOfDay();
+ } catch (Exception ignored) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
+ }
+ }
+ throw new IllegalArgumentException("涓嬪崟鏃堕棿鏍煎紡涓嶆纭細" + text + "锛岀ず渚� 2026-01-01 10:00:00");
+ }
+
+ /**
+ * 鎻愬彇瀵煎叆澶辫触鍘熷洜锛圫erviceException 鍙栦笟鍔℃彁绀猴級
+ */
+ private String resolveImportErrorMessage(Exception ex) {
+ if (ex instanceof cn.iocoder.yudao.framework.common.exception.ServiceException serviceException) {
+ return serviceException.getMessage();
+ }
+ return StrUtil.blankToDefault(ex.getMessage(), "瀵煎叆澶辫触");
}
private void calculateTotalPrice(ErpSaleOrderDO saleOrder, List<ErpSaleOrderItemDO> saleOrderItems) {
@@ -159,31 +377,117 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateSaleOrderStatus(Long id, Integer status) {
- boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
- // 1.1 鏍￠獙瀛樺湪
+ public void submitSaleOrder(Long id, String processDefinitionKey, Long userId) {
+ // 1. 鏍￠獙瀛樺湪
ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
- // 1.2 鏍￠獙鐘舵��
- if (saleOrder.getStatus().equals(status)) {
- throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
+ // 2. 鏍￠獙鐘舵�侊細鍙湁鏈彁浜ゆ垨宸查┏鍥炵殑閿�鍞鍗曟墠鑳芥彁浜�
+ if (!ErpAuditStatus.DRAFT.getStatus().equals(saleOrder.getStatus())
+ && !ErpAuditStatus.REJECT.getStatus().equals(saleOrder.getStatus())) {
+ throw exception(SALE_ORDER_SUBMIT_FAIL_STATUS, saleOrder.getNo());
}
- // 1.3 瀛樺湪閿�鍞嚭搴撳崟锛屾棤娉曞弽瀹℃牳
- BigDecimal outCount = saleOrder.getOutCount() != null ? saleOrder.getOutCount() : BigDecimal.ZERO;
- if (!approve && outCount.compareTo(BigDecimal.ZERO) > 0) {
- throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_OUT);
+ // 3. 鏍￠獙璁㈠崟椤逛笉鑳戒负绌�
+ List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderId(id);
+ if (CollUtil.isEmpty(items)) {
+ throw exception(SALE_ORDER_SUBMIT_FAIL_ITEM_EMPTY, saleOrder.getNo());
}
- // 2. 鏇存柊鐘舵��
- int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
- new ErpSaleOrderDO().setStatus(status));
- if (updateCount == 0) {
- throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛�
+ String processInstanceId = processInstanceApi.createProcessInstance(userId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 5. 鏇存柊閿�鍞鍗曠姸鎬佷负瀹℃壒涓紝璁板綍娴佺▼瀹炰緥缂栧彿
+ saleOrderMapper.updateById(new ErpSaleOrderDO()
+ .setId(id)
+ .setStatus(ErpAuditStatus.APPROVING.getStatus())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSaleOrderAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+ if (!ErpAuditStatus.APPROVING.getStatus().equals(saleOrder.getStatus())) {
+ log.warn("[updateSaleOrderAuditStatus] 閿�鍞鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝璺宠繃", id);
+ return;
+ }
+
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToAuditStatus(bpmResult);
+ if (newStatus != null) {
+ saleOrderMapper.updateById(new ErpSaleOrderDO()
+ .setId(id).setStatus(newStatus));
}
// 3. 瀹℃牳閫氳繃鏃讹紝涓洪渶瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS
- if (approve) {
+ if (ErpAuditStatus.APPROVE.getStatus().equals(newStatus)) {
createMpsForSaleOrder(id, saleOrder);
}
+ }
+
+ @Override
+ public List<Map<String, Object>> getSaleOrderApproveProcessDefinitionList() {
+ // 1. 鏍￠獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
+ validateSaleOrderApproveCategoryAndProcessDefinition();
+
+ // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALE_ORDER_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ return Collections.emptyList();
+ }
+
+ // 3. 閬嶅巻鑾峰彇娴佺▼瀹氫箟璇︽儏锛岃繃婊ゆ縺娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
+ ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
+ if (pd == null || pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+
+ // 4. 杩斿洖娴佺▼瀹氫箟鍒楄〃
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ result.add(item);
+ }
+ return result;
+ }
+
+ /**
+ * 鏍￠獙閿�鍞鍗曞鎵瑰垎绫绘槸鍚﹀瓨鍦�
+ */
+ private void validateSaleOrderApproveCategoryAndProcessDefinition() {
+ // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
+ List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
+ Collections.singletonList(SALE_ORDER_APPROVE_CATEGORY_CODE));
+ if (CollUtil.isEmpty(categories)) {
+ throw exception(SALE_ORDER_BPM_CATEGORY_NOT_EXISTS);
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓哄鏍哥姸鎬�
+ */
+ private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.CANCEL.getStatus();
+ }
+ return null;
}
/**
@@ -201,6 +505,13 @@
int mpsCount = 0;
for (ErpSaleOrderItemDO item : items) {
if (item.getNeedProduction() == null || item.getNeedProduction() != 1) {
+ continue;
+ }
+ // 閬垮厤瀹℃壒/鍙嶅鎵归噸澶嶆搷浣滃鑷村悓涓�涓攢鍞鍗曞彿浜х敓澶氭潯 MPS
+ MesProMpsRespDTO existingMps = mpsApi.getMpsBySaleOrderItemId(item.getId());
+ if (existingMps != null && ObjectUtil.notEqual(existingMps.getStatus(), MPS_STATUS_CANCELED)) {
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗曟槑缁�({}) 宸插瓨鍦� MPS({})锛岀姸鎬�={}锛岃烦杩囧垱寤�",
+ item.getId(), existingMps.getId(), existingMps.getStatus());
continue;
}
try {
@@ -366,13 +677,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteSaleOrder(List<Long> ids) {
- // 1. 鏍￠獙涓嶅浜庡凡瀹℃壒
+ // 1. 鏍￠獙鐘舵�侊細鍙湁鏈彁浜ゆ垨宸查┏鍥炵殑閿�鍞鍗曟墠鑳藉垹闄�
List<ErpSaleOrderDO> saleOrders = saleOrderMapper.selectByIds(ids);
if (CollUtil.isEmpty(saleOrders)) {
return;
}
saleOrders.forEach(saleOrder -> {
- if (ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ if (!ErpAuditStatus.DRAFT.getStatus().equals(saleOrder.getStatus())
+ && !ErpAuditStatus.REJECT.getStatus().equals(saleOrder.getStatus())) {
throw exception(SALE_ORDER_DELETE_FAIL_APPROVE, saleOrder.getNo());
}
});
@@ -478,4 +790,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3