From 0857cf1830039d60ce73005f386f284cf575e511 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 14:00:19 +0800
Subject: [PATCH] feat(mes): 新增ERP销售订单生产状态枚举及MES工艺路线优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 163 insertions(+), 11 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..1bbffa3 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,27 +2,41 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+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.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.contract.CrmContractApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportRespVO;
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.dal.dataobject.finance.ErpAccountDO;
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.finance.ErpAccountMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpSaleOrderProductionStatusEnum;
import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
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 cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -32,8 +46,10 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -50,6 +66,8 @@
@Validated
@Slf4j
public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
+
+ private static final Integer MPS_STATUS_CANCELED = 3;
@Resource
private ErpSaleOrderMapper saleOrderMapper;
@@ -71,6 +89,10 @@
@Resource
private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private ErpAccountMapper accountMapper;
@Resource
private MesProMpsApi mpsApi;
@@ -101,6 +123,7 @@
// 2.1 鎻掑叆璁㈠崟
ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
.setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setDepositPrice(ObjectUtil.defaultIfNull(createReqVO.getDepositPrice(), BigDecimal.ZERO))
.setOutCount(BigDecimal.ZERO).setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
saleOrderMapper.insert(saleOrder);
@@ -136,6 +159,7 @@
// 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 鏇存柊璁㈠崟椤�
@@ -198,25 +222,43 @@
return;
}
- int mpsCount = 0;
+ int createdCount = 0;
+ int reusedCount = 0;
for (ErpSaleOrderItemDO item : items) {
if (item.getNeedProduction() == null || item.getNeedProduction() != 1) {
continue;
}
- try {
- Long mpsId = createMpsForSaleOrderItem(saleOrder, item);
- if (mpsId != null) {
- mpsCount++;
- // 鏇存柊閿�鍞鍗曟槑缁嗙殑 MPS 鍏宠仈
+
+ // 鍚屼竴閿�鍞槑缁嗗彧淇濈暀涓�鏉℃湁鏁� MPS锛岄伩鍏嶅弽瀹℃牳鍚庡啀娆″鏍镐骇鐢熼噸澶嶈鍒�
+ MesProMpsRespDTO existingMps = mpsApi.getMpsBySaleOrderItemId(item.getId());
+ if (existingMps != null && ObjectUtil.notEqual(existingMps.getStatus(), MPS_STATUS_CANCELED)) {
+ if (ObjectUtil.notEqual(item.getMpsId(), existingMps.getId())) {
saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
.setId(item.getId())
- .setMpsId(mpsId));
+ .setMpsId(existingMps.getId()));
}
- } catch (Exception e) {
- log.error("[createMpsForSaleOrder] 鍒涘缓 MPS 澶辫触锛宻aleOrderItemId={}", item.getId(), e);
+ reusedCount++;
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗曟槑缁�({}) 宸插瓨鍦ㄦ湁鏁� MPS({})锛岃烦杩囬噸澶嶅垱寤�",
+ item.getId(), existingMps.getId());
+ continue;
}
+
+ // 涓庨攢鍞鍗曞鏍稿叡鐢ㄤ簨鍔★紱浠讳竴鏄庣粏鍒涘缓澶辫触閮戒細鍥炴粴瀹℃牳鐘舵�佸拰鏈宸插垱寤虹殑 MPS
+ Long mpsId = createMpsForSaleOrderItem(saleOrder, item);
+ saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
+ .setId(item.getId())
+ .setMpsId(mpsId));
+ createdCount++;
}
- log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉�", orderId, mpsCount);
+ // 閲嶆柊鐢熸垚鐢熶骇璁″垝鍚庯紝璁㈠崟鐢熶骇鐘舵�佸洖鍒版湭瀹屾垚锛堣鐩栨鍓嶇殑鈥滃凡鍙栨秷鈥濓級
+ if (createdCount > 0) {
+ saleOrderMapper.update(null, new LambdaUpdateWrapper<ErpSaleOrderDO>()
+ .eq(ErpSaleOrderDO::getId, orderId)
+ .set(ErpSaleOrderDO::getProductionStatus, ErpSaleOrderProductionStatusEnum.NOT_FINISHED.getStatus())
+ .set(ErpSaleOrderDO::getProductionFinishTime, null));
+ }
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉★紝澶嶇敤 MPS {} 鏉�",
+ orderId, createdCount, reusedCount);
}
/**
@@ -478,4 +520,114 @@
}
}
-}
\ No newline at end of file
+ @Override
+ public ErpSaleOrderImportRespVO importSaleOrderList(List<ErpSaleOrderImportExcelVO> importOrders,
+ ErpSaleOrderImportReqVO importReqVO) {
+ // 1. 鏍¢獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
+ importOrders = filterList(importOrders, item -> StrUtil.isNotBlank(item.getProductCode()));
+ if (CollUtil.isEmpty(importOrders)) {
+ throw exception(SALE_ORDER_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 鎸夈�屽崟鍙枫�嶅垎缁勶細鐩稿悓鍗曞彿鐨勫琛屽悎骞舵垚涓�寮犻攢鍞鍗曪紱鍗曞彿涓虹┖鏃舵瘡琛屽悇鑷垚涓�寮犺鍗�
+ List<List<ErpSaleOrderImportExcelVO>> groups = new ArrayList<>();
+ Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
+ int rowIndex = 0;
+ for (ErpSaleOrderImportExcelVO row : importOrders) {
+ rowIndex++;
+ String groupKey = StrUtil.isNotBlank(row.getNo()) ? row.getNo() : ("__row_" + rowIndex);
+ Integer index = groupIndexMap.get(groupKey);
+ if (index == null) {
+ index = groups.size();
+ groupIndexMap.put(groupKey, index);
+ groups.add(new ArrayList<>());
+ }
+ groups.get(index).add(row);
+ }
+ // 3. 閫愮粍鍚堝苟鍒涘缓閿�鍞鍗�
+ ErpSaleOrderImportRespVO respVO = ErpSaleOrderImportRespVO.builder()
+ .createSaleOrderNos(new ArrayList<>())
+ .failureSaleOrderNos(new LinkedHashMap<>())
+ .build();
+ for (List<ErpSaleOrderImportExcelVO> group : groups) {
+ String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
+ : "绗�" + (importOrders.indexOf(group.get(0)) + 1) + "琛�";
+ try {
+ ErpSaleOrderSaveReqVO createReqVO = buildSaleOrderImportSaveReqVO(group);
+ Long orderId = createSaleOrder(createReqVO);
+ respVO.getCreateSaleOrderNos().add(saleOrderMapper.selectById(orderId).getNo());
+ } catch (ServiceException ex) {
+ respVO.getFailureSaleOrderNos().put(groupKey, ex.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 灏嗗悓涓�寮犻攢鍞鍗曠殑澶氳鏄庣粏杞崲鎴愬垱寤� Request VO
+ */
+ private ErpSaleOrderSaveReqVO buildSaleOrderImportSaveReqVO(List<ErpSaleOrderImportExcelVO> group) {
+ ErpSaleOrderImportExcelVO first = group.get(0);
+ // 1. 鏍¢獙骞惰В鏋愬鎴�
+ if (StrUtil.isBlank(first.getCustomerName())) {
+ throw exception(SALE_ORDER_IMPORT_CUSTOMER_NOT_EXISTS, "");
+ }
+ CrmCustomerRespDTO customer = customerApi.getCustomerByName(first.getCustomerName());
+ if (customer == null) {
+ throw exception(SALE_ORDER_IMPORT_CUSTOMER_NOT_EXISTS, first.getCustomerName());
+ }
+ if (first.getOrderTime() == null) {
+ throw exception(SALE_ORDER_IMPORT_ORDER_TIME_REQUIRED);
+ }
+ // 2. 瑙f瀽缁撶畻璐︽埛锛堝彲閫夛級
+ Long accountId = null;
+ if (StrUtil.isNotBlank(first.getAccountName())) {
+ ErpAccountDO account = accountMapper.selectByName(first.getAccountName());
+ if (account == null) {
+ throw exception(SALE_ORDER_IMPORT_ACCOUNT_NOT_EXISTS, first.getAccountName());
+ }
+ accountId = account.getId();
+ }
+ // 3. 瑙f瀽閿�鍞憳锛堝彲閫夛級
+ Long saleUserId = null;
+ if (StrUtil.isNotBlank(first.getSaleUserName())) {
+ List<AdminUserRespDTO> users = adminUserApi.getUserListByNickname(first.getSaleUserName());
+ if (CollUtil.isEmpty(users)) {
+ throw exception(SALE_ORDER_IMPORT_SALE_USER_NOT_EXISTS, first.getSaleUserName());
+ }
+ saleUserId = users.get(0).getId();
+ }
+ // 4. 缁勮鏄庣粏
+ List<ErpSaleOrderSaveReqVO.Item> items = new ArrayList<>();
+ for (ErpSaleOrderImportExcelVO row : group) {
+ MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
+ if (product == null) {
+ throw exception(SALE_ORDER_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
+ }
+ MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
+ if (unit == null) {
+ throw exception(SALE_ORDER_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
+ }
+ ErpSaleOrderSaveReqVO.Item item = new ErpSaleOrderSaveReqVO.Item()
+ .setProductId(product.getId())
+ .setProductUnitId(unit.getId())
+ .setProductPrice(row.getProductPrice())
+ .setCount(row.getCount())
+ .setTaxPercent(row.getTaxPercent())
+ .setNeedProduction(row.getNeedProduction())
+ .setRemark(row.getItemRemark());
+ items.add(item);
+ }
+ // 5. 缁勮涓昏〃
+ ErpSaleOrderSaveReqVO createReqVO = new ErpSaleOrderSaveReqVO()
+ .setCustomerId(customer.getId())
+ .setOrderTime(first.getOrderTime())
+ .setSaleUserId(saleUserId)
+ .setAccountId(accountId)
+ .setDiscountPercent(ObjectUtil.defaultIfNull(first.getDiscountPercent(), BigDecimal.ZERO))
+ .setDepositPrice(ObjectUtil.defaultIfNull(first.getDepositPrice(), BigDecimal.ZERO))
+ .setRemark(first.getRemark())
+ .setItems(items);
+ return createReqVO;
+ }
+
+}
--
Gitblit v1.9.3