From b3fe06c151dc8455649bf0a46e481ceb83e3ea2a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 13:37:54 +0800
Subject: [PATCH] feat: 完成好水川 MOM 需求1/2/4/5/8（装箱、BOM成本、销售合同、劳动合同、留样）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 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 18985aa..182c2f8 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
@@ -7,6 +7,7 @@
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.framework.operatelog.core.util.OperateLogUtils;
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;
@@ -17,6 +18,8 @@
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.crm.api.contract.dto.CrmContractCreateFromSaleOrderReqDTO;
+import cn.iocoder.yudao.module.crm.api.contract.dto.CrmContractRespDTO;
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;
@@ -36,6 +39,7 @@
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 com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import org.flowable.engine.repository.ProcessDefinition;
import lombok.extern.slf4j.Slf4j;
@@ -59,6 +63,7 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.erp.enums.LogRecordConstants.*;
/**
* ERP 閿�鍞鍗� Service 瀹炵幇绫�
@@ -190,6 +195,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = ERP_SALE_ORDER_TYPE, subType = ERP_SALE_ORDER_IMPORT_SUB_TYPE, bizNo = "0",
+ success = ERP_SALE_ORDER_IMPORT_SUCCESS)
public ErpSaleOrderImportRespVO importSaleOrderList(List<ErpSaleOrderImportExcelVO> importList) {
ErpSaleOrderImportRespVO respVO = ErpSaleOrderImportRespVO.builder()
.createList(new ArrayList<>())
@@ -197,6 +204,8 @@
.failureList(new LinkedHashMap<>())
.build();
if (CollUtil.isEmpty(importList)) {
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
return respVO;
}
@@ -235,6 +244,8 @@
respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
}
}
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
return respVO;
}
@@ -392,6 +403,16 @@
}
// 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛�
+ // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+ if (processInstanceApi.isGlobalAutoApprove()) {
+ saleOrderMapper.updateById(new ErpSaleOrderDO()
+ .setId(id)
+ .setStatus(ErpAuditStatus.APPROVING.getStatus())
+ .setProcessInstanceId(""));
+ updateSaleOrderAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(processDefinitionKey)
@@ -421,9 +442,10 @@
.setId(id).setStatus(newStatus));
}
- // 3. 瀹℃牳閫氳繃鏃讹紝涓洪渶瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS
+ // 3. 瀹℃牳閫氳繃鏃讹紝涓洪渶瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS锛屽苟鑷姩鐢熸垚閿�鍞悎鍚岃崏绋�
if (ErpAuditStatus.APPROVE.getStatus().equals(newStatus)) {
createMpsForSaleOrder(id, saleOrder);
+ createContractForSaleOrder(saleOrder);
}
}
@@ -528,6 +550,58 @@
}
}
log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉�", orderId, mpsCount);
+ }
+
+ /**
+ * 閿�鍞鍗曞鎵归�氳繃鍚庯紝鑷姩鐢熸垚閿�鍞悎鍚岃崏绋匡紙涓嶆彁浜ゅ鎵癸級
+ */
+ private void createContractForSaleOrder(ErpSaleOrderDO saleOrder) {
+ // 璁㈠崟鏈韩鐢卞悎鍚岀敓鎴愶紝閬垮厤鍙嶅悜鐢熸垚
+ if (saleOrder.getContractId() != null) {
+ log.info("[createContractForSaleOrder] 閿�鍞鍗�({}) 宸插叧鑱斿悎鍚�({})锛岃烦杩囪嚜鍔ㄧ敓鎴�",
+ saleOrder.getNo(), saleOrder.getContractNo());
+ return;
+ }
+ try {
+ List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderId(saleOrder.getId());
+ if (CollUtil.isEmpty(items)) {
+ log.warn("[createContractForSaleOrder] 閿�鍞鍗�({}) 娌℃湁鏄庣粏锛岃烦杩囪嚜鍔ㄧ敓鎴愬悎鍚�", saleOrder.getNo());
+ return;
+ }
+ // 璐熻矗浜轰紭鍏堝彇閿�鍞憳锛屾湭濉啓鏃跺洖閫�鍒拌鍗曞垱寤轰汉
+ Long ownerUserId = saleOrder.getSaleUserId();
+ if (ownerUserId == null && StrUtil.isNumeric(saleOrder.getCreator())) {
+ ownerUserId = Long.valueOf(saleOrder.getCreator());
+ }
+
+ CrmContractCreateFromSaleOrderReqDTO createReqDTO = new CrmContractCreateFromSaleOrderReqDTO();
+ createReqDTO.setOrderId(saleOrder.getId());
+ createReqDTO.setOrderNo(saleOrder.getNo());
+ createReqDTO.setCustomerId(saleOrder.getCustomerId());
+ createReqDTO.setOwnerUserId(ownerUserId);
+ createReqDTO.setOrderTime(saleOrder.getOrderTime());
+ createReqDTO.setDiscountPercent(saleOrder.getDiscountPercent());
+ createReqDTO.setDepositPrice(saleOrder.getDepositPrice());
+ createReqDTO.setItems(items.stream().map(item -> {
+ CrmContractCreateFromSaleOrderReqDTO.Item contractItem = new CrmContractCreateFromSaleOrderReqDTO.Item();
+ contractItem.setItemId(item.getProductId());
+ contractItem.setItemUnitId(item.getProductUnitId());
+ contractItem.setPrice(item.getProductPrice());
+ contractItem.setCount(item.getCount());
+ return contractItem;
+ }).toList());
+
+ CrmContractRespDTO contract = contractApi.createContractDraftFromSaleOrder(createReqDTO).getCheckedData();
+ if (contract != null) {
+ saleOrderMapper.updateById(new ErpSaleOrderDO().setId(saleOrder.getId())
+ .setContractId(contract.getId()).setContractNo(contract.getNo()));
+ log.info("[createContractForSaleOrder] 閿�鍞鍗�({}) 鑷姩鐢熸垚鍚堝悓({}) 鎴愬姛",
+ saleOrder.getNo(), contract.getNo());
+ }
+ } catch (Exception e) {
+ // 鍚堝悓鐢熸垚澶辫触涓嶉樆濉炶鍗曞鎵癸紝璁板綍鏃ュ織渚夸簬鎺掓煡
+ log.error("[createContractForSaleOrder] 閿�鍞鍗�({}) 鑷姩鐢熸垚閿�鍞悎鍚屽け璐�", saleOrder.getNo(), e);
+ }
}
/**
@@ -724,8 +798,7 @@
@Override
public PageResult<ErpSaleOrderDO> getSaleOrderPage(ErpSaleOrderPageReqVO pageReqVO) {
- List<Long> permittedCustomerIds = customerApi.getPermittedCustomerIds();
- return saleOrderMapper.selectPage(pageReqVO, permittedCustomerIds);
+ return saleOrderMapper.selectPage(pageReqVO);
}
// ==================== 璁㈠崟椤� ====================
--
Gitblit v1.9.3