From 6d1bf32bc0b51dc12048fe6bb70badfbd31d67ac Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 13:44:10 +0800
Subject: [PATCH] fix: 修复销售订单审批及开票回款搜索
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java | 5 +-
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 37 ++++++++++--------
yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/enums/MdmItemTypeEnum.java | 7 +++
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java | 5 +-
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java | 11 +++--
5 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
index cafc397..ccb8247 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
@@ -104,7 +104,7 @@
default PageResult<CrmInvoiceDO> selectPageByCustomerId(CrmInvoicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CrmInvoiceDO>()
.eq(CrmInvoiceDO::getCustomerId, reqVO.getCustomerId()) // 蹇呴』浼犻��
- .eqIfPresent(CrmInvoiceDO::getNo, reqVO.getNo())
+ .likeIfPresent(CrmInvoiceDO::getNo, reqVO.getNo())
.eqIfPresent(CrmInvoiceDO::getContractId, reqVO.getContractId())
.orderByDesc(CrmInvoiceDO::getId));
}
@@ -116,7 +116,8 @@
CrmInvoiceDO::getId, userId, pageReqVO.getSceneType());
// 鎷兼帴鑷韩鐨勬煡璇㈡潯浠�
query.selectAll(CrmInvoiceDO.class)
- .eqIfPresent(CrmInvoiceDO::getNo, pageReqVO.getNo())
+ .likeIfPresent(CrmInvoiceDO::getNo, pageReqVO.getNo())
+ .eqIfPresent(CrmInvoiceDO::getCustomerId, pageReqVO.getCustomerId())
.eqIfPresent(CrmInvoiceDO::getContractId, pageReqVO.getContractId())
.eqIfPresent(CrmInvoiceDO::getAuditStatus, pageReqVO.getAuditStatus())
.orderByDesc(CrmInvoiceDO::getId);
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
index 7739e71..3ce231e 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
@@ -43,7 +43,7 @@
default PageResult<CrmReceivableDO> selectPageByCustomerId(CrmReceivablePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CrmReceivableDO>()
.eq(CrmReceivableDO::getCustomerId, reqVO.getCustomerId()) // 蹇呴』浼犻��
- .eqIfPresent(CrmReceivableDO::getNo, reqVO.getNo())
+ .likeIfPresent(CrmReceivableDO::getNo, reqVO.getNo())
.eqIfPresent(CrmReceivableDO::getContractId, reqVO.getContractId())
.eqIfPresent(CrmReceivableDO::getPlanId, reqVO.getPlanId())
.orderByDesc(CrmReceivableDO::getId));
@@ -56,7 +56,8 @@
CrmReceivableDO::getId, userId, pageReqVO.getSceneType());
// 鎷兼帴鑷韩鐨勬煡璇㈡潯浠�
query.selectAll(CrmReceivableDO.class)
- .eqIfPresent(CrmReceivableDO::getNo, pageReqVO.getNo())
+ .likeIfPresent(CrmReceivableDO::getNo, pageReqVO.getNo())
+ .eqIfPresent(CrmReceivableDO::getCustomerId, pageReqVO.getCustomerId())
.eqIfPresent(CrmReceivableDO::getPlanId, pageReqVO.getPlanId())
.eqIfPresent(CrmReceivableDO::getContractId, pageReqVO.getContractId())
.eqIfPresent(CrmReceivableDO::getAuditStatus, pageReqVO.getAuditStatus())
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
index 9258b67..7d122c8 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
@@ -47,6 +47,7 @@
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
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.enums.MdmItemTypeEnum;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -584,16 +585,18 @@
createReqDTO.setRemark("鐢卞悎鍚屻��" + contract.getNo() + "銆戣嚜鍔ㄧ敓鎴�");
// 5. 鏋勫缓璁㈠崟椤�
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(contractProducts, CrmContractProductDO::getItemId));
List<ErpSaleOrderCreateReqDTO.Item> items = contractProducts.stream()
.map(cp -> {
ErpSaleOrderCreateReqDTO.Item item = new ErpSaleOrderCreateReqDTO.Item();
item.setProductId(cp.getItemId());
item.setProductPrice(cp.getContractPrice());
item.setCount(cp.getCount());
- // 鍚堝悓浜у搧榛樿闇�瑕佺敓浜э細璁㈠崟瀹℃壒閫氳繃鍚庢墠鑳借嚜鍔ㄥ垱寤� MPS锛�
- // 鍚﹀垯銆屽悎鍚� 鈫� 璁㈠崟 鈫� 鐢熶骇銆嶉摼璺湪鍚堝悓鏉ユ簮鐨勮鍗曚笂浼氭柇鎺夈��
- // 鑻ヤ釜鍒骇鍝佷负澶栬喘/杞敭锛屽彲鍦ㄩ攢鍞鍗曟槑缁嗕腑鎶娿�岄渶瑕佺敓浜с�嶆敼涓哄惁銆�
- item.setNeedProduction(1);
+ // 鍙湁浜у搧鎵嶈繘鍏ョ敓浜ц鍒掞紱娓╂帶绛夊璐墿鏂欏彲闅忓悎鍚岃繘鍏ラ攢鍞鍗曪紝
+ // 浣嗕笉鑳藉垱寤� MPS锛屽惁鍒欎細瀵艰嚧鏁寸瑪閿�鍞鍗曞鎵瑰洖婊氥��
+ MdmItemRespDTO mdmItem = itemMap.get(cp.getItemId());
+ item.setNeedProduction(mdmItem != null && MdmItemTypeEnum.isProduct(mdmItem.getItemType()) ? 1 : 0);
return item;
})
.toList();
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 2d6a18d..32cd823 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
@@ -30,6 +30,7 @@
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.enums.MdmItemTypeEnum;
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;
@@ -221,8 +222,22 @@
int createdCount = 0;
int reusedCount = 0;
+ int skippedCount = 0;
for (ErpSaleOrderItemDO item : items) {
if (item.getNeedProduction() == null || item.getNeedProduction() != 1) {
+ continue;
+ }
+
+ MdmItemRespDTO mdmItem = mdmItemApi.getItem(item.getProductId()).getCheckedData();
+ if (mdmItem == null || !MdmItemTypeEnum.isProduct(mdmItem.getItemType())) {
+ // 鍏煎淇鍓嶇敱鍚堝悓鐢熸垚鐨勫巻鍙茶鍗曪細褰撴椂鎵�鏈夋槑缁嗛兘浼氳鏍囪涓洪渶瑕佺敓浜с��
+ // 闈炰骇鍝佹槑缁嗕笉搴斿垱寤� MPS锛屽悓鏃剁籂姝f爣璁帮紝閬垮厤鍚庣画鍙戣揣鐘舵�佷竴鐩寸瓑寰呯敓浜у畬鎴愩��
+ saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
+ .setId(item.getId())
+ .setNeedProduction(0));
+ skippedCount++;
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗曟槑缁�({}) 涓洪潪浜у搧鐗╂枡({})锛岃烦杩� MPS 骞跺彇娑堥渶瑕佺敓浜ф爣璁�",
+ item.getId(), item.getProductId());
continue;
}
@@ -241,7 +256,7 @@
}
// 涓庨攢鍞鍗曞鏍稿叡鐢ㄤ簨鍔★紱浠讳竴鏄庣粏鍒涘缓澶辫触閮戒細鍥炴粴瀹℃牳鐘舵�佸拰鏈宸插垱寤虹殑 MPS
- Long mpsId = createMpsForSaleOrderItem(saleOrder, item);
+ Long mpsId = createMpsForSaleOrderItem(saleOrder, item, mdmItem);
saleOrderItemMapper.updateById(new ErpSaleOrderItemDO()
.setId(item.getId())
.setMpsId(mpsId));
@@ -254,31 +269,21 @@
.set(ErpSaleOrderDO::getProductionStatus, ErpSaleOrderProductionStatusEnum.NOT_FINISHED.getStatus())
.set(ErpSaleOrderDO::getProductionFinishTime, null));
}
- log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉★紝澶嶇敤 MPS {} 鏉�",
- orderId, createdCount, reusedCount);
+ log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉★紝澶嶇敤 MPS {} 鏉★紝璺宠繃闈炰骇鍝� {} 鏉�",
+ orderId, createdCount, reusedCount, skippedCount);
}
/**
* 涓洪攢鍞鍗曟槑缁嗗垱寤� MPS
*/
- private Long createMpsForSaleOrderItem(ErpSaleOrderDO saleOrder, ErpSaleOrderItemDO item) {
- // 鑾峰彇 MDM 鐗╂枡淇℃伅锛堢敤浜庤幏鍙栦骇鍝佸悕绉帮級
- String productName = null;
- try {
- MdmItemRespDTO mdmItem = mdmItemApi.getItem(item.getProductId()).getCheckedData();
- if (mdmItem != null) {
- productName = mdmItem.getName();
- }
- } catch (Exception e) {
- log.warn("[createMpsForSaleOrderItem] 鑾峰彇 MDM 鐗╂枡淇℃伅澶辫触锛宲roductId={}", item.getProductId(), e);
- }
-
+ private Long createMpsForSaleOrderItem(ErpSaleOrderDO saleOrder, ErpSaleOrderItemDO item,
+ MdmItemRespDTO mdmItem) {
MesProMpsCreateReqDTO createReqDTO = new MesProMpsCreateReqDTO();
createReqDTO.setSaleOrderId(saleOrder.getId());
createReqDTO.setSaleOrderNo(saleOrder.getNo());
createReqDTO.setSaleOrderItemId(item.getId());
createReqDTO.setMdmItemId(item.getProductId());
- createReqDTO.setProductName(productName);
+ createReqDTO.setProductName(mdmItem.getName());
createReqDTO.setQuantity(item.getCount());
createReqDTO.setClientId(saleOrder.getCustomerId());
createReqDTO.setRequestDate(formatRequestDate(saleOrder.getOrderTime()));
diff --git a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/enums/MdmItemTypeEnum.java b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/enums/MdmItemTypeEnum.java
index 8f4d21c..916684a 100644
--- a/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/enums/MdmItemTypeEnum.java
+++ b/yudao-module-mdm-api/src/main/java/cn/iocoder/yudao/module/mdm/enums/MdmItemTypeEnum.java
@@ -39,4 +39,11 @@
return null;
}
+ /**
+ * 鍒ゆ柇缁欏畾绫诲瀷鏄惁涓哄彲鐢熶骇鐨勪骇鍝併��
+ */
+ public static boolean isProduct(Integer type) {
+ return PRODUCT.getType().equals(type);
+ }
+
}
--
Gitblit v1.9.3