From eccad5a129106377a275be4f7cdc58e99e9b95d4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 七月 2026 13:45:14 +0800
Subject: [PATCH] feat(mes): 实现库存移库功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 199 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 184 insertions(+), 15 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 9301bb6..a233210 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,20 +6,29 @@
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.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;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesLineMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeLineMapper;
+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.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;
+import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.math.BigDecimal;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -42,12 +51,19 @@
@Resource
private MesWmSalesNoticeLineService salesNoticeLineService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private ErpSaleOrderApi saleOrderApi;
@Resource
private MesMdAutoCodeRecordService autoCodeRecordService;
+
+ @Resource
+ private MesWmProductSalesMapper productSalesMapper;
+ @Resource
+ private MesWmProductSalesLineMapper productSalesLineMapper;
+ @Resource
+ private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
@Override
public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
@@ -87,19 +103,29 @@
@Override
public MesWmSalesNoticeDO getSalesNotice(Long id) {
- return salesNoticeMapper.selectById(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;
}
@Override
public PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO) {
- return salesNoticeMapper.selectPage(pageReqVO);
+ // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return salesNoticeMapper.selectPage(pageReqVO, permittedClientIds);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void submitSalesNotice(Long id) {
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateSalesNoticeExistsAndDraft(id);
+ MesWmSalesNoticeDO notice = validateSalesNoticeExistsAndDraft(id);
// 1.2 妫�鏌ユ槸鍚︽湁琛岄」鐩�
List<MesWmSalesNoticeLineDO> lines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(id);
if (CollUtil.isEmpty(lines)) {
@@ -109,6 +135,12 @@
// 2. 鏇存柊鐘舵�侊細鑽夌 鈫� 寰呭嚭搴�
salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
.setId(id).setStatus(APPROVED.getStatus()));
+
+ // 3. 鍥炲啓 ERP 閿�鍞鍗曞嚭搴撶姸鎬佷负"宸查鐣�"
+ if (notice.getSaleOrderId() != null) {
+ saleOrderApi.updateOrderOutStatusTo(notice.getSaleOrderId(),
+ ErpSaleOrderOutStatusEnum.RESERVED.getStatus());
+ }
}
@Override
@@ -144,7 +176,7 @@
validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
// 鏍￠獙瀹㈡埛瀛樺湪
if (saveReqVO.getClientId() != null) {
- clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
+ customerApi.validateCustomer(saveReqVO.getClientId());
}
}
@@ -161,22 +193,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() + "]鍙戣揣閫氱煡");
@@ -187,7 +225,7 @@
notice.setStatus(PREPARE.getStatus());
salesNoticeMapper.insert(notice);
- // 5. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
+ // 6. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
line.setNoticeId(notice.getId());
@@ -202,11 +240,142 @@
@Override
public void finishSalesNotice(Long id) {
- // 鏍￠獙瀛樺湪
- MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
- // 鏇存柊鐘舵�佷负宸插畬鎴�
+ // 宸插簾寮冿紝淇濈暀鍏煎鎬�
+ updateSalesNoticeOutStatus(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSalesNoticeLineOutCount(Long noticeLineId, BigDecimal outCount) {
+ if (noticeLineId == null || outCount == null) {
+ return;
+ }
+ // 1. 鑾峰彇鍙戣揣閫氱煡鍗曡
+ MesWmSalesNoticeLineDO line = salesNoticeLineMapper.selectById(noticeLineId);
+ if (line == null) {
+ return;
+ }
+ // 2. 绱姞鍑哄簱鏁伴噺
+ BigDecimal newOutCount = (line.getOutCount() != null ? line.getOutCount() : BigDecimal.ZERO).add(outCount);
+ // 3. 鏇存柊琛�
+ salesNoticeLineMapper.updateById(new MesWmSalesNoticeLineDO()
+ .setId(noticeLineId)
+ .setOutCount(newOutCount));
+ // 4. 鏇存柊涓诲崟鍑哄簱鐘舵��
+ updateSalesNoticeOutStatus(line.getNoticeId());
+ }
+
+ @Override
+ public void updateSalesNoticeOutStatus(Long noticeId) {
+ if (noticeId == null) {
+ return;
+ }
+ // 1. 鑾峰彇鍙戣揣閫氱煡鍗�
+ MesWmSalesNoticeDO notice = salesNoticeMapper.selectById(noticeId);
+ if (notice == null) {
+ return;
+ }
+ // 2. 鑾峰彇鍙戣揣閫氱煡鍗曡
+ List<MesWmSalesNoticeLineDO> lines = salesNoticeLineMapper.selectListByNoticeId(noticeId);
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+ // 3. 璁＄畻鍑哄簱鐘舵��
+ int outStatus = calculateOutStatus(lines);
+ // 4. 鏇存柊鍑哄簱鐘舵��
salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
- .setId(id).setStatus(FINISHED.getStatus()));
+ .setId(noticeId)
+ .setOutStatus(outStatus));
+ // 5. 濡傛灉鍏ㄩ儴鍑哄簱锛屾洿鏂板崟鎹姸鎬佷负宸插畬鎴�
+ if (outStatus == MesWmOutStatusEnum.ALL_OUT.getStatus()) {
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
+ .setId(noticeId)
+ .setStatus(FINISHED.getStatus()));
+ }
+ }
+
+ /**
+ * 璁＄畻鍑哄簱鐘舵��
+ */
+ private int calculateOutStatus(List<MesWmSalesNoticeLineDO> lines) {
+ boolean allOut = true;
+ boolean anyOut = false;
+
+ for (MesWmSalesNoticeLineDO line : lines) {
+ BigDecimal quantity = line.getQuantity() != null ? line.getQuantity() : BigDecimal.ZERO;
+ BigDecimal outCount = line.getOutCount() != null ? line.getOutCount() : BigDecimal.ZERO;
+
+ if (outCount.compareTo(BigDecimal.ZERO) > 0) {
+ anyOut = true;
+ }
+ if (outCount.compareTo(quantity) < 0) {
+ allOut = false;
+ }
+ }
+
+ if (allOut) {
+ return MesWmOutStatusEnum.ALL_OUT.getStatus();
+ } else if (anyOut) {
+ return MesWmOutStatusEnum.PART_OUT.getStatus();
+ } else {
+ return MesWmOutStatusEnum.NOT_OUT.getStatus();
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generateProductSalesFromNotice(Long noticeId) {
+ // 1. 鏍￠獙鍙戣揣閫氱煡鍗曞瓨鍦ㄤ笖涓哄緟鍑哄簱鐘舵��
+ MesWmSalesNoticeDO notice = validateSalesNoticeExists(noticeId);
+ if (ObjUtil.notEqual(APPROVED.getStatus(), notice.getStatus())) {
+ throw exception(WM_SALES_NOTICE_STATUS_NOT_APPROVED);
+ }
+
+ // 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);
+ }
+
+ // 4. 鐢熸垚閿�鍞嚭搴撳崟缂栫爜
+ String code = autoCodeRecordService.generateAutoCode("WM_PRODUCT_SALES_CODE", null);
+
+ // 5. 鍒涘缓閿�鍞嚭搴撳崟涓昏〃
+ MesWmProductSalesDO productSales = new MesWmProductSalesDO();
+ productSales.setCode(code);
+ productSales.setName("鍙戣揣閫氱煡鍗昜" + notice.getCode() + "]鍑哄簱");
+ productSales.setClientId(notice.getClientId());
+ productSales.setSaleOrderId(notice.getSaleOrderId());
+ productSales.setSalesOrderCode(notice.getSaleOrderCode());
+ productSales.setNoticeId(noticeId);
+ productSales.setSalesDate(notice.getSalesDate());
+ // 鏀惰揣淇℃伅浠庡彂璐ч�氱煡鍗曞甫鍏�
+ productSales.setContactName(notice.getRecipientName());
+ productSales.setContactTelephone(notice.getRecipientTelephone());
+ productSales.setContactAddress(notice.getRecipientAddress());
+ productSales.setStatus(MesWmProductSalesStatusEnum.PREPARE.getStatus());
+ productSalesMapper.insert(productSales);
+
+ // 6. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
+ for (MesWmSalesNoticeLineDO noticeLine : noticeLines) {
+ MesWmProductSalesLineDO salesLine = new MesWmProductSalesLineDO();
+ salesLine.setSalesId(productSales.getId());
+ salesLine.setSaleOrderItemId(noticeLine.getSaleOrderItemId());
+ salesLine.setNoticeLineId(noticeLine.getId());
+ salesLine.setItemId(noticeLine.getItemId());
+ salesLine.setQuantity(noticeLine.getQuantity());
+ salesLine.setBatchId(noticeLine.getBatchId());
+ salesLine.setBatchCode(noticeLine.getBatchCode());
+ salesLine.setOqcCheckFlag(noticeLine.getOqcCheckFlag());
+ productSalesLineMapper.insert(salesLine);
+ }
+
+ return productSales.getId();
}
}
--
Gitblit v1.9.3