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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index a233210..04eaf3f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
@@ -17,6 +18,7 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
@@ -29,11 +31,14 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum.*;
@@ -64,6 +69,8 @@
private MesWmProductSalesLineMapper productSalesLineMapper;
@Resource
private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
+ @Resource
+ private MesMdItemService mdItemService;
@Override
public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
@@ -103,22 +110,12 @@
@Override
public MesWmSalesNoticeDO getSalesNotice(Long id) {
- MesWmSalesNoticeDO notice = salesNoticeMapper.selectById(id);
- // 鏍￠獙瀹㈡埛鏉冮檺
- if (notice != null && notice.getClientId() != null) {
- List<Long> permittedIds = customerApi.getPermittedCustomerIds();
- if (permittedIds != null && !permittedIds.contains(notice.getClientId())) {
- return null; // 鏃犳潈闄愬垯杩斿洖 null
- }
- }
- return notice;
+ return salesNoticeMapper.selectById(id);
}
@Override
public PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO) {
- // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
- List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
- return salesNoticeMapper.selectPage(pageReqVO, permittedClientIds);
+ return salesNoticeMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -362,6 +359,8 @@
productSalesMapper.insert(productSales);
// 6. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
+ Map<Long, MesMdItemDO> itemMap = mdItemService.getItemMap(
+ convertSet(noticeLines, MesWmSalesNoticeLineDO::getItemId));
for (MesWmSalesNoticeLineDO noticeLine : noticeLines) {
MesWmProductSalesLineDO salesLine = new MesWmProductSalesLineDO();
salesLine.setSalesId(productSales.getId());
@@ -372,6 +371,14 @@
salesLine.setBatchId(noticeLine.getBatchId());
salesLine.setBatchCode(noticeLine.getBatchCode());
salesLine.setOqcCheckFlag(noticeLine.getOqcCheckFlag());
+ // 鎸� 鏁伴噺 / 鐗╂枡姣忕鏁伴噺 鍚戜笂鍙栨暣璁＄畻绠辨暟锛涙湭缁存姢姣忕鏁伴噺鏃惰 0
+ MesMdItemDO item = itemMap.get(noticeLine.getItemId());
+ if (item != null && item.getBoxQuantity() != null
+ && item.getBoxQuantity().compareTo(BigDecimal.ZERO) > 0
+ && noticeLine.getQuantity() != null) {
+ salesLine.setBoxCount(noticeLine.getQuantity()
+ .divide(item.getBoxQuantity(), 0, RoundingMode.CEILING).intValue());
+ }
productSalesLineMapper.insert(salesLine);
}
--
Gitblit v1.9.3