From b5e1bceabb36fe1d1e5e88397280d12e7044c6dd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 15:32:31 +0800
Subject: [PATCH] 完善设备采集、安全管理及采购业务
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 272 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
index a1cedf7..7e23186 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -2,35 +2,56 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.line.MesWmProductSalesLineSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.vo.MesWmDocImportRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesShippingReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
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.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockReserveBizTypeEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
+import cn.iocoder.yudao.module.mes.service.wm.stockreserve.MesWmStockReserveService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
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.convertList;
@@ -39,27 +60,42 @@
/**
* MES 閿�鍞嚭搴撳崟 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
*/
@Service
@Validated
+@Slf4j
public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
@Resource
private MesWmProductSalesMapper productSalesMapper;
+ @Resource
+ private MesWmProductSalesLineMapper productSalesLineMapper;
@Resource
private MesWmProductSalesLineService productSalesLineService;
@Resource
private MesWmProductSalesDetailService productSalesDetailService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private MesWmSalesNoticeService salesNoticeService;
@Resource
private MesWmTransactionService wmTransactionService;
@Resource
private MesWmMaterialStockService materialStockService;
+ @Resource
+ private MesWmStockReserveService stockReserveService;
+ @Resource
+ @Lazy
+ private MesQcOqcService oqcService;
+
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
+
+ @Resource
+ @Lazy
+ private MesMdItemService mdItemService;
@Override
public Long createProductSales(MesWmProductSalesSaveReqVO createReqVO) {
@@ -105,7 +141,7 @@
@Override
public PageResult<MesWmProductSalesDO> getProductSalesPage(MesWmProductSalesPageReqVO pageReqVO) {
- return productSalesMapper.selectPage(pageReqVO);
+ return productSalesMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -125,10 +161,26 @@
}
}
+ // 鑾峰彇鍑哄簱鍗曚俊鎭�
+ MesWmProductSalesDO sales = productSalesMapper.selectById(id);
+
// 妫�鏌ユ墍鏈夎鐨� oqcCheckFlag锛氬鏋滄湁闇�瑕� OQC 妫�楠岀殑琛岋紝杩涘叆寰呮娴嬬姸鎬�
boolean needOqc = CollectionUtils.anyMatch(lines,
line -> Boolean.TRUE.equals(line.getOqcCheckFlag()));
if (needOqc) {
+ // 涓洪渶瑕� OQC 妫�楠屼笖灏氭湭鍒涘缓妫�楠屽崟鐨勬槑缁嗗垱寤� OQC 妫�楠屽崟
+ List<MesWmProductSalesLineDO> oqcLines = CollectionUtils.filterList(lines,
+ line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && line.getOqcId() == null);
+ for (MesWmProductSalesLineDO line : oqcLines) {
+ // 鐩存帴璋冪敤锛岃寮傚父鎶涘嚭锛屼繚璇佹暟鎹竴鑷存��
+ Long oqcId = oqcService.createOqcFromProductSales(
+ sales.getId(), line, sales.getCode(), sales.getClientId());
+ // 鏇存柊鍑哄簱鏄庣粏鐨� oqcId
+ productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
+ .setId(line.getId())
+ .setOqcId(oqcId));
+ }
+
// 鎵归噺鍒濆鍖� OQC 琛岀殑璐ㄩ噺鐘舵�佷负"寰呮楠�"
List<Long> oqcLineIds = convertList(
CollectionUtils.filterList(lines, line -> Boolean.TRUE.equals(line.getOqcCheckFlag())),
@@ -177,7 +229,7 @@
if (CollUtil.isEmpty(details)) {
throw exception(WM_PRODUCT_SALES_DETAILS_EMPTY);
}
- // 鏍¢獙搴撳瓨鍏呰冻
+ // 鏍¢獙搴撳瓨鍏呰冻骞跺垱寤哄崰鐢�
for (MesWmProductSalesDetailDO detail : details) {
materialStockService.validateSelectedStock(
detail.getMaterialStockId(),
@@ -189,12 +241,28 @@
detail.getAreaId(),
detail.getQuantity()
);
+ // 鍒涘缓搴撳瓨鍗犵敤
+ stockReserveService.createReserve(
+ detail.getMaterialStockId(),
+ MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(),
+ id,
+ sales.getCode(),
+ detail.getId(),
+ detail.getItemId(),
+ detail.getQuantity()
+ );
}
}
// 鎵ц鎷h揣锛堝緟鎷h揣 鈫� 寰呭~鍐欒繍鍗曪級
productSalesMapper.updateById(new MesWmProductSalesDO()
.setId(id).setStatus(MesWmProductSalesStatusEnum.SHIPPING.getStatus()));
+
+ // 鍥炲啓 ERP 閿�鍞鍗曞嚭搴撶姸鎬佷负"閮ㄥ垎鍑哄簱"锛堣〃绀哄凡鎷h揣/鍗犵敤锛�
+ if (sales.getSaleOrderId() != null) {
+ saleOrderApi.updateOrderOutStatusTo(sales.getSaleOrderId(),
+ ErpSaleOrderOutStatusEnum.PART_OUT.getStatus());
+ }
}
@Override
@@ -223,12 +291,71 @@
throw exception(WM_PRODUCT_SALES_CANNOT_FINISH);
}
- // 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
+ // 2. 纭鍗犵敤杞嚭搴擄紙閲婃斁鍗犵敤閲忥級
+ stockReserveService.confirmReserveToOutbound(MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(), id);
+
+ // 3. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
createTransactionList(sales);
- // 3. 鏇存柊鍑哄簱鍗曠姸鎬�
+ // 4. 鏇存柊鍑哄簱鍗曠姸鎬�
productSalesMapper.updateById(new MesWmProductSalesDO()
.setId(id).setStatus(MesWmProductSalesStatusEnum.FINISHED.getStatus()));
+
+ // 5. 鏇存柊鍏宠仈鐨勫彂璐ч�氱煡鍗曞嚭搴撴暟閲忓拰鐘舵��
+ if (sales.getNoticeId() != null) {
+ updateSalesNoticeOutCount(sales);
+ }
+
+ // 6. 鍥炲啓 ERP 閿�鍞鍗曠殑鍑哄簱鏁伴噺鍜岀姸鎬�
+ updateErpSaleOrderOutCount(sales);
+ }
+
+ /**
+ * 鏇存柊鍙戣揣閫氱煡鍗曠殑鍑哄簱鏁伴噺鍜岀姸鎬�
+ */
+ private void updateSalesNoticeOutCount(MesWmProductSalesDO sales) {
+ // 鑾峰彇鍑哄簱鍗曡
+ List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(sales.getId());
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+ // 閬嶅巻琛岋紝鎸� noticeLineId 鏇存柊鍑哄簱鏁伴噺
+ for (MesWmProductSalesLineDO line : lines) {
+ if (line.getNoticeLineId() != null && line.getQuantity() != null) {
+ salesNoticeService.updateSalesNoticeLineOutCount(line.getNoticeLineId(), line.getQuantity());
+ }
+ }
+ }
+
+ /**
+ * 鍥炲啓 ERP 閿�鍞鍗曠殑鍑哄簱鏁伴噺鍜岀姸鎬�
+ */
+ private void updateErpSaleOrderOutCount(MesWmProductSalesDO sales) {
+ // 鑾峰彇鍑哄簱鍗曡
+ List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(sales.getId());
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+ // 鐢ㄤ簬瀛樺偍閿�鍞鍗� ID锛岄伩鍏嶉噸澶嶆洿鏂�
+ Long saleOrderId = null;
+ // 閬嶅巻琛岋紝鎸� saleOrderItemId 鏇存柊鍑哄簱鏁伴噺
+ for (MesWmProductSalesLineDO line : lines) {
+ if (line.getSaleOrderItemId() != null && line.getQuantity() != null) {
+ saleOrderApi.updateOrderItemOutCount(line.getSaleOrderItemId(), line.getQuantity());
+ // 鑾峰彇閿�鍞鍗� ID锛堜粠绗竴涓湁鏁堢殑鏄庣粏椤硅幏鍙栵級
+ if (saleOrderId == null) {
+ cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO itemDTO =
+ saleOrderApi.getSaleOrderItem(line.getSaleOrderItemId()).getCheckedData();
+ if (itemDTO != null && itemDTO.getOrderId() != null) {
+ saleOrderId = itemDTO.getOrderId();
+ }
+ }
+ }
+ }
+ // 鏇存柊閿�鍞鍗曠殑鍑哄簱鐘舵��
+ if (saleOrderId != null) {
+ saleOrderApi.updateOrderOutStatus(saleOrderId);
+ }
}
private void createTransactionList(MesWmProductSalesDO sales) {
@@ -239,7 +366,8 @@
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
.setBizType(MesBizTypeConstants.WM_PRODUCT_SALES).setBizId(sales.getId())
- .setBizCode(sales.getCode()).setBizLineId(detail.getLineId())));
+ .setBizCode(sales.getCode()).setBizLineId(detail.getLineId())
+ .setMaterialStockId(detail.getMaterialStockId()))); // 鎸囧畾搴撳瓨璁板綍ID锛岄伩鍏嶉噸鏂板尮閰�
}
@Override
@@ -253,6 +381,8 @@
MesWmProductSalesStatusEnum.CANCELED.getStatus())) {
throw exception(WM_PRODUCT_SALES_CANNOT_CANCEL);
}
+ // 閲婃斁搴撳瓨鍗犵敤
+ stockReserveService.releaseReserve(MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(), id);
// 鍙栨秷
productSalesMapper.updateById(new MesWmProductSalesDO()
.setId(id).setStatus(MesWmProductSalesStatusEnum.CANCELED.getStatus()));
@@ -279,7 +409,7 @@
// 鏍¢獙缂栫爜鍞竴
validateCodeUnique(id, reqVO.getCode());
// 鏍¢獙瀹㈡埛瀛樺湪
- clientService.validateClientExistsAndEnable(reqVO.getClientId());
+ customerApi.validateCustomer(reqVO.getClientId());
// 鏍¢獙鍙戣揣閫氱煡鍗�
if (reqVO.getNoticeId() != null) {
MesWmSalesNoticeDO notice = salesNoticeService.validateSalesNoticeExists(reqVO.getNoticeId());
@@ -327,4 +457,137 @@
productSalesMapper.updateById(new MesWmProductSalesDO().setId(id).setStatus(status));
}
+ // ==================== 鎵归噺瀵煎叆 ====================
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesWmDocImportRespVO importProductSalesList(List<MesWmProductSalesImportExcelVO> importList) {
+ MesWmDocImportRespVO respVO = MesWmDocImportRespVO.empty();
+ if (CollUtil.isEmpty(importList)) {
+ return respVO;
+ }
+ // 1. 鎸夈�屽嚭搴撳崟鍙枫�嶅綊骞舵垚鍗曟嵁 + 鏄庣粏琛�
+ Map<String, List<MesWmProductSalesImportExcelVO>> grouped = new LinkedHashMap<>();
+ int index = 0;
+ for (MesWmProductSalesImportExcelVO row : importList) {
+ index++;
+ String code = StrUtil.trim(row.getSalesCode());
+ if (StrUtil.isBlank(code)) {
+ respVO.getFailureCodes().put("绗� " + index + " 琛�", "鍑哄簱鍗曞彿涓嶈兘涓虹┖");
+ continue;
+ }
+ grouped.computeIfAbsent(code, k -> new ArrayList<>()).add(row);
+ }
+
+ // 2. 棰勫姞杞藉鎴凤紝鎸夊悕绉板缓绱㈠紩
+ Map<String, Long> clientMap = new HashMap<>();
+ try {
+ List<CrmCustomerRespDTO> customers = customerApi.getCustomerSimpleList();
+ if (CollUtil.isNotEmpty(customers)) {
+ customers.forEach(c -> {
+ if (StrUtil.isNotBlank(c.getName())) {
+ clientMap.put(c.getName().trim(), c.getId());
+ }
+ });
+ }
+ } catch (Exception e) {
+ log.warn("[importProductSalesList][鍔犺浇瀹㈡埛澶辫触]", e);
+ }
+
+ // 3. 閫愬紶鍗曟嵁澶勭悊
+ for (Map.Entry<String, List<MesWmProductSalesImportExcelVO>> entry : grouped.entrySet()) {
+ String code = entry.getKey();
+ List<MesWmProductSalesImportExcelVO> rows = entry.getValue();
+ MesWmProductSalesImportExcelVO head = rows.get(0);
+ try {
+ // 3.1 鏍¢獙瀹㈡埛
+ String clientName = StrUtil.trim(head.getClientName());
+ Long clientId = clientName == null ? null : clientMap.get(clientName);
+ if (clientId == null) {
+ respVO.getFailureCodes().put(code, "瀹㈡埛[" + clientName + "]涓嶅瓨鍦�");
+ continue;
+ }
+ // 3.2 鏍¢獙鏃ユ湡涓庣紪鐮�
+ LocalDateTime salesDate = parseImportDateTime(head.getSalesDate());
+ if (salesDate == null) {
+ respVO.getFailureCodes().put(code, "鍑哄簱鏃ユ湡涓嶈兘涓虹┖鎴栨牸寮忎笉姝g‘锛堟敮鎸� yyyy-MM-dd / yyyy-MM-dd HH:mm:ss锛�");
+ continue;
+ }
+ if (productSalesMapper.selectByCode(code) != null) {
+ respVO.getFailureCodes().put(code, "鍑哄簱鍗曞彿宸插瓨鍦�");
+ continue;
+ }
+ // 3.3 鍒涘缓鍗曟嵁澶�
+ MesWmProductSalesSaveReqVO saveReqVO = new MesWmProductSalesSaveReqVO();
+ saveReqVO.setCode(code);
+ saveReqVO.setName(StrUtil.blankToDefault(StrUtil.trim(head.getSalesName()), code));
+ saveReqVO.setClientId(clientId);
+ saveReqVO.setSalesDate(salesDate);
+ saveReqVO.setSalesOrderCode(StrUtil.trim(head.getSalesOrderCode()));
+ saveReqVO.setContactName(StrUtil.trim(head.getContactName()));
+ saveReqVO.setContactTelephone(StrUtil.trim(head.getContactTelephone()));
+ saveReqVO.setContactAddress(StrUtil.trim(head.getContactAddress()));
+ saveReqVO.setCarrier(StrUtil.trim(head.getCarrier()));
+ saveReqVO.setShippingNumber(StrUtil.trim(head.getShippingNumber()));
+ saveReqVO.setRemark(StrUtil.trim(head.getRemark()));
+ Long salesId = createProductSales(saveReqVO);
+ // 3.4 閫愯鍒涘缓鏄庣粏
+ for (MesWmProductSalesImportExcelVO row : rows) {
+ createProductSalesLineByImport(salesId, row, respVO, code);
+ }
+ respVO.getCreateCodes().add(code);
+ } catch (Exception e) {
+ respVO.getFailureCodes().put(code, e.getMessage() == null ? "瀵煎叆澶辫触" : e.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 瀵煎叆鏃跺垱寤哄崟琛屾槑缁嗭紱澶辫触鍙褰曚笉鎶涘嚭锛岄伩鍏嶅奖鍝嶆暣寮犲崟鎹殑鍏跺畠琛�
+ */
+ private void createProductSalesLineByImport(Long salesId, MesWmProductSalesImportExcelVO row,
+ MesWmDocImportRespVO respVO, String salesCode) {
+ String itemCode = StrUtil.trim(row.getItemCode());
+ MesMdItemDO item = itemCode == null ? null : mdItemService.getItemByCode(itemCode);
+ if (item == null) {
+ respVO.getFailureCodes().put(salesCode, "鐗╂枡缂栫爜[" + itemCode + "]涓嶅瓨鍦紝璇ヨ宸茶烦杩�");
+ return;
+ }
+ if (row.getQuantity() == null || row.getQuantity().signum() <= 0) {
+ respVO.getFailureCodes().put(salesCode, "鐗╂枡[" + itemCode + "]鍑哄簱鏁伴噺蹇呴』澶т簬 0锛岃琛屽凡璺宠繃");
+ return;
+ }
+ try {
+ MesWmProductSalesLineSaveReqVO lineReqVO = new MesWmProductSalesLineSaveReqVO();
+ lineReqVO.setSalesId(salesId);
+ lineReqVO.setItemId(item.getId());
+ lineReqVO.setQuantity(row.getQuantity());
+ lineReqVO.setBatchCode(StrUtil.trim(row.getBatchCode()));
+ lineReqVO.setRemark(StrUtil.trim(row.getRemark()));
+ productSalesLineService.createProductSalesLine(lineReqVO);
+ } catch (Exception e) {
+ respVO.getFailureCodes().put(salesCode, "鐗╂枡[" + itemCode + "]鏄庣粏鍒涘缓澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 瑙f瀽瀵煎叆鏃ユ湡锛屾敮鎸� yyyy-MM-dd 涓� yyyy-MM-dd HH:mm:ss锛屽け璐ヨ繑鍥� null
+ */
+ private LocalDateTime parseImportDateTime(String text) {
+ if (StrUtil.isBlank(text)) {
+ return null;
+ }
+ String value = text.trim().replace('/', '-');
+ try {
+ if (value.length() <= 10) {
+ return LocalDate.parse(value).atStartOfDay();
+ }
+ return LocalDateTime.parse(value.replace(' ', 'T'));
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
}
+
--
Gitblit v1.9.3