From 4301a9b1078a8da61a8c0aa19538dec0462a47d4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 20 十一月 2026 17:57:22 +0800
Subject: [PATCH] feat(wls/erp/crm): 万通无生产场景改造与客户项目字段
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 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 4ac3fac..7101f7b 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
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.erp.service.sale;
+import org.springframework.context.annotation.Lazy;
+import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -85,6 +87,10 @@
private static final String SALE_ORDER_APPROVE_PROCESS_DEFINITION_KEY = "sale_order_approve";
@Resource
+ @Lazy
+ private MesWmSalesNoticeApi salesNoticeApi;
+
+ @Resource
private ErpSaleOrderMapper saleOrderMapper;
@Resource
private ErpSaleOrderItemMapper saleOrderItemMapper;
@@ -132,10 +138,11 @@
if (createReqVO.getSaleUserId() != null) {
adminUserApi.validateUser(createReqVO.getSaleUserId());
}
- // 1.5 纭畾璁㈠崟鍙凤紙鍓嶇濉啓鍒欑敤鑷畾涔夊崟鍙凤紝鐣欑┖鍒欒嚜鍔ㄧ敓鎴愶級锛屽苟鏍¢獙鍞竴鎬�
+ // 1.5 纭畾璁㈠崟鍙凤紙鍓嶇濉啓鍒欑敤鑷畾涔夊崟鍙凤紝鐣欑┖鍒欒嚜鍔ㄧ敓鎴愶級锛屽苟鏍¢獙鍞竴鎬э紱
+ // 鑷姩鐢熸垚鏃剁紪鍙蜂腑鐨勬棩鏈熶互涓嬪崟鏃堕棿涓哄噯锛岃�屼笉鏄疄闄呭綍鍏ュ綋澶�
String customNo = StrUtil.trim(createReqVO.getNo());
String no = StrUtil.isNotBlank(customNo) ? customNo
- : noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
+ : noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX, createReqVO.getOrderTime());
if (saleOrderMapper.selectByNo(no) != null) {
throw exception(SALE_ORDER_NO_EXISTS);
}
@@ -147,8 +154,8 @@
.setOutCount(BigDecimal.ZERO).setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
saleOrderMapper.insert(saleOrder);
- // 2.2 鎻掑叆璁㈠崟椤�
- saleOrderItems.forEach(o -> o.setOrderId(saleOrder.getId()));
+ // 2.2 鎻掑叆璁㈠崟椤癸紙涓囬�氭棤鐢熶骇锛氭槑缁嗙粺涓�鏍囪涓轰笉闇�瑕佺敓浜э級
+ saleOrderItems.forEach(o -> o.setOrderId(saleOrder.getId()).setNeedProduction(0));
saleOrderItemMapper.insertBatch(saleOrderItems);
// 2.3 缁戝畾闄勪欢
storageAttachmentApi.bindAttachments("file", "erp_sale_order",
@@ -289,9 +296,10 @@
items.add(itemVO);
}
- // 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚
+ // 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚锛涜嚜鍔ㄧ敓鎴愭椂鏃ユ湡浠ュ鍏ョ殑涓嬪崟鏃堕棿涓哄噯
+ LocalDateTime orderTime = parseImportOrderTime(head.getOrderTime());
String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
- : noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
+ : noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX, orderTime);
if (saleOrderMapper.selectByNo(no) != null) {
throw new IllegalArgumentException("閿�鍞崟缂栧彿宸插瓨鍦細" + no);
}
@@ -301,7 +309,7 @@
saleOrder.setNo(no);
saleOrder.setCustomerId(customerId);
saleOrder.setContractNo(head.getContractNo());
- saleOrder.setOrderTime(parseImportOrderTime(head.getOrderTime()));
+ saleOrder.setOrderTime(orderTime);
saleOrder.setRemark(head.getRemark());
saleOrder.setStatus(ErpAuditStatus.DRAFT.getStatus());
saleOrder.setDepositPrice(BigDecimal.ZERO);
@@ -423,9 +431,22 @@
.setId(id).setStatus(newStatus));
}
- // 3. 瀹℃牳閫氳繃鏃讹紝涓洪渶瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS
+ // 3. 瀹℃牳閫氳繃鏃讹紝涓洪渶瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS锛涗竾閫氭棤鐢熶骇锛屾槑缁嗛粯璁や笉闇�瑕佺敓浜э紝姝ゅ涓嶄細鐢熸垚
if (ErpAuditStatus.APPROVE.getStatus().equals(newStatus)) {
- createMpsForSaleOrder(id, saleOrder);
+ try {
+ createMpsForSaleOrder(id, saleOrder);
+ } catch (Exception e) {
+ log.error("[updateSaleOrderAuditStatus] 鍒涘缓 MPS 澶辫触锛宱rderId={}", id, e);
+ }
+ // 4. 瀹℃壒閫氳繃鍚庣洿鎺ョ敓鎴愬彂璐ч�氱煡鍗曪紙澶辫触涓嶅奖鍝嶅鎵圭粨鏋滐級
+ try {
+ Long noticeId = salesNoticeApi.generateSalesNoticeBySaleOrder(id);
+ if (noticeId != null) {
+ log.info("[updateSaleOrderAuditStatus] 閿�鍞鍗�({}) 宸茬敓鎴愬彂璐ч�氱煡鍗�({})", id, noticeId);
+ }
+ } catch (Exception e) {
+ log.warn("[updateSaleOrderAuditStatus] 閿�鍞鍗�({}) 鐢熸垚鍙戣揣閫氱煡鍗曞け璐ワ細{}", id, e.getMessage());
+ }
}
}
@@ -627,13 +648,17 @@
private List<ErpSaleOrderItemDO> validateSaleOrderItems(List<ErpSaleOrderSaveReqVO.Item> list) {
// 杞寲涓� ErpSaleOrderItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛�
return convertList(list, o -> BeanUtils.toBean(o, ErpSaleOrderItemDO.class, item -> {
- item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
- if (item.getTotalPrice() == null) {
+ // 鍗曚环涓哄惈绋庡崟浠凤細鍚◣閲戦 = 鍗曚环 脳 鏁伴噺锛涚◣棰� = 鍚◣閲戦 脳 绋庣巼锛涗笉鍚◣閲戦 = 鍚◣閲戦 - 绋庨
+ BigDecimal taxInclusivePrice = MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount());
+ if (taxInclusivePrice == null) {
return;
}
+ BigDecimal taxPrice = null;
if (item.getTaxPercent() != null) {
- item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
+ taxPrice = MoneyUtils.priceMultiplyPercent(taxInclusivePrice, item.getTaxPercent());
}
+ item.setTaxPrice(taxPrice);
+ item.setTotalPrice(taxPrice != null ? taxInclusivePrice.subtract(taxPrice) : taxInclusivePrice);
}));
}
--
Gitblit v1.9.3