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 | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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 eb42a1f..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,7 +18,8 @@
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.client.MesMdClientService;
+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;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
@@ -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.*;
@@ -51,7 +56,7 @@
@Resource
private MesWmSalesNoticeLineService salesNoticeLineService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private ErpSaleOrderApi saleOrderApi;
@@ -64,6 +69,8 @@
private MesWmProductSalesLineMapper productSalesLineMapper;
@Resource
private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
+ @Resource
+ private MesMdItemService mdItemService;
@Override
public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
@@ -108,7 +115,7 @@
@Override
public PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO) {
- return salesNoticeMapper.selectPage(pageReqVO);
+ return salesNoticeMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -166,7 +173,7 @@
validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
// 鏍￠獙瀹㈡埛瀛樺湪
if (saveReqVO.getClientId() != null) {
- clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
+ customerApi.validateCustomer(saveReqVO.getClientId());
}
}
@@ -183,22 +190,28 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long generateSalesNoticeFromSaleOrder(Long saleOrderId) {
- // 1. 鑾峰彇閿�鍞鍗曚俊鎭�
+ // 1. 鏍￠獙鏄惁宸茬敓鎴愯繃鍙戣揣閫氱煡鍗曪紙闃叉閲嶅鐢熸垚锛�
+ MesWmSalesNoticeDO existNotice = salesNoticeMapper.selectBySaleOrderId(saleOrderId);
+ if (existNotice != null) {
+ throw exception(WM_SALES_NOTICE_ALREADY_EXISTS);
+ }
+
+ // 2. 鑾峰彇閿�鍞鍗曚俊鎭�
ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
if (saleOrder == null) {
throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
}
- // 2. 鑾峰彇閿�鍞鍗曟槑缁�
+ // 3. 鑾峰彇閿�鍞鍗曟槑缁�
List<ErpSaleOrderItemRespDTO> saleOrderItems = saleOrderApi.getSaleOrderItemList(saleOrderId).getCheckedData();
if (CollUtil.isEmpty(saleOrderItems)) {
throw exception(WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY);
}
- // 3. 鐢熸垚鍙戣揣閫氱煡鍗曠紪鐮�
+ // 4. 鐢熸垚鍙戣揣閫氱煡鍗曠紪鐮�
String code = autoCodeRecordService.generateAutoCode("SALESNOTICE_CODE", null);
- // 4. 鍒涘缓鍙戣揣閫氱煡鍗曚富琛�
+ // 5. 鍒涘缓鍙戣揣閫氱煡鍗曚富琛�
MesWmSalesNoticeDO notice = new MesWmSalesNoticeDO();
notice.setCode(code);
notice.setName("閿�鍞鍗昜" + saleOrder.getNo() + "]鍙戣揣閫氱煡");
@@ -209,7 +222,7 @@
notice.setStatus(PREPARE.getStatus());
salesNoticeMapper.insert(notice);
- // 5. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
+ // 6. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
line.setNoticeId(notice.getId());
@@ -315,16 +328,21 @@
throw exception(WM_SALES_NOTICE_STATUS_NOT_APPROVED);
}
- // 2. 鑾峰彇鍙戣揣閫氱煡鍗曡
+ // 2. 鏍￠獙鏄惁宸茬敓鎴愯繃閿�鍞嚭搴撳崟锛堥槻姝㈤噸澶嶇敓鎴愶級
+ if (productSalesMapper.selectByNoticeId(noticeId) != null) {
+ throw exception(WM_PRODUCT_SALES_ALREADY_EXISTS);
+ }
+
+ // 3. 鑾峰彇鍙戣揣閫氱煡鍗曡
List<MesWmSalesNoticeLineDO> noticeLines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(noticeId);
if (CollUtil.isEmpty(noticeLines)) {
throw exception(WM_SALES_NOTICE_LINE_EMPTY);
}
- // 3. 鐢熸垚閿�鍞嚭搴撳崟缂栫爜
+ // 4. 鐢熸垚閿�鍞嚭搴撳崟缂栫爜
String code = autoCodeRecordService.generateAutoCode("WM_PRODUCT_SALES_CODE", null);
- // 4. 鍒涘缓閿�鍞嚭搴撳崟涓昏〃
+ // 5. 鍒涘缓閿�鍞嚭搴撳崟涓昏〃
MesWmProductSalesDO productSales = new MesWmProductSalesDO();
productSales.setCode(code);
productSales.setName("鍙戣揣閫氱煡鍗昜" + notice.getCode() + "]鍑哄簱");
@@ -340,7 +358,9 @@
productSales.setStatus(MesWmProductSalesStatusEnum.PREPARE.getStatus());
productSalesMapper.insert(productSales);
- // 5. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
+ // 6. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
+ Map<Long, MesMdItemDO> itemMap = mdItemService.getItemMap(
+ convertSet(noticeLines, MesWmSalesNoticeLineDO::getItemId));
for (MesWmSalesNoticeLineDO noticeLine : noticeLines) {
MesWmProductSalesLineDO salesLine = new MesWmProductSalesLineDO();
salesLine.setSalesId(productSales.getId());
@@ -351,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