From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java |  136 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 136 insertions(+), 0 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
index 100627f..8730d3e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
@@ -2,13 +2,20 @@
 
 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.productreceipt.vo.MesWmProductReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptImportRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO;
@@ -16,10 +23,14 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptLineMapper;
 import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
 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.wm.warehouse.MesWmWarehouseAreaService;
@@ -31,7 +42,11 @@
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -45,6 +60,8 @@
 
     @Resource
     private MesWmProductReceiptMapper productReceiptMapper;
+    @Resource
+    private MesWmProductReceiptLineMapper productReceiptLineMapper;
 
     @Resource
     private MesWmProductReceiptLineService productReceiptLineService;
@@ -55,11 +72,17 @@
     @Resource
     private MesProWorkOrderService workOrderService;
     @Resource
+    private MesMdItemService mdItemService;
+    @Resource
+    private MesWmMaterialStockService materialStockService;
+    @Resource
     private MesWmWarehouseService warehouseService;
     @Resource
     private MesWmWarehouseLocationService locationService;
     @Resource
     private MesWmWarehouseAreaService areaService;
+    @Resource
+    private cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceDetailService productProduceDetailService;
 
     @Override
     public Long createProductReceipt(MesWmProductReceiptSaveReqVO createReqVO) {
@@ -73,6 +96,73 @@
         }
         receipt.setStatus(MesWmProductReceiptStatusEnum.PREPARE.getStatus());
         productReceiptMapper.insert(receipt);
+        return receipt.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long generateProductReceipt(MesWmProductProduceDO produce,
+                                       List<MesWmProductProduceLineDO> produceLines) {
+        List<MesWmProductProduceLineDO> qualifiedLines = produceLines.stream()
+                .filter(line -> ObjUtil.equal(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus()))
+                .filter(line -> line.getQuantity() != null && line.getQuantity().compareTo(BigDecimal.ZERO) > 0)
+                .toList();
+        if (CollUtil.isEmpty(qualifiedLines)) {
+            return null;
+        }
+
+        String code = "AUTO-PR-" + produce.getId();
+        MesWmProductReceiptDO existing = productReceiptMapper.selectByCode(code);
+        if (existing != null) {
+            return existing.getId();
+        }
+
+        MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(produce.getWorkOrderId());
+        MesMdItemDO firstItem = mdItemService.getItem(qualifiedLines.get(0).getItemId());
+        Long firstMdmItemId = firstItem != null && firstItem.getMdmItemId() != null
+                ? firstItem.getMdmItemId() : qualifiedLines.get(0).getItemId();
+        String workOrderCode = workOrder != null ? workOrder.getCode() : String.valueOf(produce.getWorkOrderId());
+
+        MesWmProductReceiptDO receipt = MesWmProductReceiptDO.builder()
+                .code(code)
+                .name("鐢熶骇瀹屾垚鑷姩鍏ュ簱-" + workOrderCode)
+                .workOrderId(produce.getWorkOrderId())
+                .itemId(firstMdmItemId)
+                .receiptDate(LocalDateTime.now())
+                .status(MesWmProductReceiptStatusEnum.PREPARE.getStatus())
+                .remark("鏈亾宸ュ簭浜у嚭鑷姩鐢熸垚锛屼骇鍑哄崟ID锛�" + produce.getId())
+                .build();
+        productReceiptMapper.insert(receipt);
+
+        MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(
+                MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
+        MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(
+                MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
+        MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(
+                MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
+
+        for (MesWmProductProduceLineDO produceLine : qualifiedLines) {
+            MesMdItemDO item = mdItemService.getItem(produceLine.getItemId());
+            Long mdmItemId = item != null && item.getMdmItemId() != null
+                    ? item.getMdmItemId() : produceLine.getItemId();
+            List<cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO> details =
+                    productProduceDetailService.getProductProduceDetailListByLineId(produceLine.getId());
+            Long warehouseId = CollUtil.isNotEmpty(details) ? details.get(0).getWarehouseId() : virtualWarehouse.getId();
+            Long locationId = CollUtil.isNotEmpty(details) ? details.get(0).getLocationId() : virtualLocation.getId();
+            Long areaId = CollUtil.isNotEmpty(details) ? details.get(0).getAreaId() : virtualArea.getId();
+            MesWmMaterialStockDO stock = materialStockService.getMaterialStockByCompositeKey(
+                    mdmItemId, warehouseId, locationId, areaId,
+                    produceLine.getBatchId(), null);
+            productReceiptLineMapper.insert(MesWmProductReceiptLineDO.builder()
+                    .receiptId(receipt.getId())
+                    .itemId(mdmItemId)
+                    .materialStockId(stock != null ? stock.getId() : null)
+                    .quantity(produceLine.getQuantity())
+                    .batchId(produceLine.getBatchId())
+                    .batchCode(produceLine.getBatchCode())
+                    .remark("鏈亾宸ュ簭鍚堟牸鍝佽嚜鍔ㄧ敓鎴�")
+                    .build());
+        }
         return receipt.getId();
     }
 
@@ -277,4 +367,50 @@
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MesWmProductReceiptImportRespVO importProductReceiptList(List<MesWmProductReceiptImportExcelVO> importList, boolean updateSupport) {
+        if (CollUtil.isEmpty(importList)) {
+            throw exception(WM_PRODUCT_RECPT_IMPORT_LIST_IS_EMPTY);
+        }
+        MesWmProductReceiptImportRespVO respVO = MesWmProductReceiptImportRespVO.builder()
+                .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+                .failureCodes(new LinkedHashMap<>()).build();
+        AtomicInteger index = new AtomicInteger(1);
+        importList.forEach(importItem -> {
+            int currentIndex = index.getAndIncrement();
+            String code = importItem.getCode();
+            String key = StrUtil.blankToDefault(code, "绗� " + currentIndex + " 琛�");
+            if (StrUtil.isBlank(code)) {
+                respVO.getFailureCodes().put(key, "鍗曞彿涓嶈兘涓虹┖");
+                return;
+            }
+            if (StrUtil.isBlank(importItem.getName())) {
+                respVO.getFailureCodes().put(key, "鍚嶇О涓嶈兘涓虹┖");
+                return;
+            }
+            MesWmProductReceiptDO existing = productReceiptMapper.selectByCode(code);
+            if (existing != null && updateSupport) {
+                if (!MesWmProductReceiptStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
+                    respVO.getFailureCodes().put(key, "鍗曟嵁闈炶崏绋跨姸鎬侊紝涓嶅厑璁歌鐩栨洿鏂�");
+                    return;
+                }
+                MesWmProductReceiptDO updateObj = BeanUtils.toBean(importItem, MesWmProductReceiptDO.class);
+                updateObj.setId(existing.getId());
+                updateObj.setStatus(existing.getStatus());
+                productReceiptMapper.updateById(updateObj);
+                respVO.getUpdateCodes().add(code);
+            } else if (existing != null) {
+                respVO.getFailureCodes().put(key, "鍗曞彿宸插瓨鍦細" + code);
+            } else {
+                MesWmProductReceiptDO createObj = BeanUtils.toBean(importItem, MesWmProductReceiptDO.class);
+                createObj.setId(null);
+                createObj.setStatus(MesWmProductReceiptStatusEnum.PREPARE.getStatus());
+                productReceiptMapper.insert(createObj);
+                respVO.getCreateCodes().add(code);
+            }
+        });
+        return respVO;
+    }
+
 }

--
Gitblit v1.9.3