From 569df4daf76eb586f1add62707d0ffa2b7ff20f2 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 04 九月 2026 13:11:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 273 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index f8f4734..4f368d9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -3,10 +3,15 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
@@ -16,9 +21,14 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
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.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
@@ -28,19 +38,24 @@
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;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.stream.Collectors;
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.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -63,6 +78,9 @@
private MesWmWarehouseAreaService areaService;
@Resource
@Lazy
+ private MesWmWarehouseLocationService locationService;
+ @Resource
+ @Lazy
private MesWmWarehouseService warehouseService;
@Resource
@Lazy
@@ -70,6 +88,12 @@
@Resource
@Lazy
private MesWmBatchService batchService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private SrmSupplierApi srmSupplierApi;
+ @Resource
+ private PlatformTransactionManager transactionManager;
@Override
public MesWmMaterialStockDO getMaterialStock(Long id) {
@@ -179,6 +203,13 @@
}
// 2. 涓嶅瓨鍦ㄥ垯鏂板缓
+ return createMaterialStock(itemId, warehouseId, locationId, areaId, batchId, batchCode, vendorId, receiptTime);
+ }
+
+ @Override
+ public MesWmMaterialStockDO createMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
+ Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {
+ // 濮嬬粓鍒涘缓鏂板簱瀛樿褰�
MesMdmItemDO item = mdmItemService.validateItemExists(itemId);
MesWmMaterialStockDO newStock = MesWmMaterialStockDO.builder()
.itemId(itemId).itemTypeId(item.getCategoryId())
@@ -189,7 +220,7 @@
.frozen(false)
.build();
materialStockMapper.insert(newStock);
- // 3. 閲嶆柊鏌ヨ锛岀‘淇濇嬁鍒版暟鎹簱鐢熸垚鐨勫畬鏁磋褰曪紙id銆乧reateTime 绛夛級
+ // 閲嶆柊鏌ヨ锛岀‘淇濇嬁鍒版暟鎹簱鐢熸垚鐨勫畬鏁磋褰曪紙id銆乧reateTime 绛夛級
MesWmMaterialStockDO inserted = materialStockMapper.selectById(newStock.getId());
return inserted != null ? inserted : newStock;
}
@@ -494,4 +525,245 @@
wmTransactionService.createTransaction(inTransaction);
}
+ @Override
+ public MesWmMaterialStockImportRespVO importMaterialStockList(List<MesWmMaterialStockImportExcelVO> importList) {
+ // 鎿嶄綔绫诲瀷鍙栧�硷細澧炲姞 / 鍑忓皯 / 瑕嗙洊
+ final String OP_ADD = "澧炲姞";
+ final String OP_REDUCE = "鍑忓皯";
+ final String OP_COVER = "瑕嗙洊";
+ // 1. 杩囨护鍏ㄧ┖琛�
+ importList = filterList(importList, item -> StrUtil.isNotBlank(item.getItemCode())
+ || StrUtil.isNotBlank(item.getBatchCode()) || item.getQuantity() != null);
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 棰勫姞杞� 缂栫爜/鍚嶇О -> 瀹炰綋 鏄犲皠锛堢紪鐮佷紭鍏堬紝鍚嶇О鍏滃簳锛�
+ Map<String, MdmItemRespDTO> itemMap = mdmItemApi.getItemListByStatus(null).getCheckedData().stream()
+ .collect(Collectors.toMap(MdmItemRespDTO::getCode, item -> item, (v1, v2) -> v1));
+ Map<String, MesWmWarehouseDO> warehouseCodeMap = new HashMap<>();
+ Map<String, MesWmWarehouseDO> warehouseNameMap = new HashMap<>();
+ for (MesWmWarehouseDO warehouse : warehouseService.getWarehouseList()) {
+ warehouseCodeMap.putIfAbsent(warehouse.getCode(), warehouse);
+ warehouseNameMap.putIfAbsent(warehouse.getName(), warehouse);
+ }
+ Map<String, MesWmWarehouseLocationDO> locationCodeMap = new HashMap<>();
+ Map<String, MesWmWarehouseLocationDO> locationNameMap = new HashMap<>();
+ for (MesWmWarehouseLocationDO location : locationService.getWarehouseLocationList((Long) null)) {
+ locationCodeMap.putIfAbsent(location.getCode(), location);
+ locationNameMap.putIfAbsent(location.getName(), location);
+ }
+ Map<String, MesWmWarehouseAreaDO> areaCodeMap = new HashMap<>();
+ Map<String, MesWmWarehouseAreaDO> areaNameMap = new HashMap<>();
+ for (MesWmWarehouseAreaDO area : areaService.getWarehouseAreaList((Long) null)) {
+ areaCodeMap.putIfAbsent(area.getCode(), area);
+ areaNameMap.putIfAbsent(area.getName(), area);
+ }
+ Map<String, SrmSupplierRespDTO> supplierCodeMap = new HashMap<>();
+ Map<String, SrmSupplierRespDTO> supplierNameMap = new HashMap<>();
+ for (SrmSupplierRespDTO supplier : srmSupplierApi.getSupplierSimpleList().getCheckedData()) {
+ supplierCodeMap.putIfAbsent(supplier.getCode(), supplier);
+ supplierNameMap.putIfAbsent(supplier.getName(), supplier);
+ }
+ // 3. 閫愭潯澶勭悊
+ MesWmMaterialStockImportRespVO respVO = MesWmMaterialStockImportRespVO.builder()
+ .createNames(new ArrayList<>())
+ .updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>())
+ .build();
+ TransactionTemplate importTxTemplate = new TransactionTemplate(transactionManager);
+ for (MesWmMaterialStockImportExcelVO importStock : importList) {
+ String key = StrUtil.blankToDefault(importStock.getItemCode(), "") + "-"
+ + StrUtil.blankToDefault(importStock.getWarehouse(), "");
+ try {
+ importTxTemplate.executeWithoutResult(status -> {
+ // 3.1 鐗╂枡
+ MdmItemRespDTO item = resolveImportItem(itemMap, importStock.getItemCode());
+ // 3.2 浠撳簱/搴撳尯/搴撲綅锛堢紪鐮佷紭鍏堛�佸悕绉板厹搴曪紝鍚埗瀛愬叧绯绘牎楠岋級
+ MesWmWarehouseDO warehouse = resolveImportWarehouse(warehouseCodeMap, warehouseNameMap,
+ importStock.getWarehouse());
+ Long locationId = null;
+ if (StrUtil.isNotBlank(importStock.getLocation())) {
+ MesWmWarehouseLocationDO location = resolveImportLocationOrArea(locationCodeMap,
+ locationNameMap, importStock.getLocation(), WM_MATERIAL_STOCK_IMPORT_LOCATION_NOT_EXISTS);
+ if (ObjUtil.notEqual(location.getWarehouseId(), warehouse.getId())) {
+ throw exception(WM_WAREHOUSE_AREA_WAREHOUSE_MISMATCH);
+ }
+ locationId = location.getId();
+ }
+ Long areaId = null;
+ if (StrUtil.isNotBlank(importStock.getArea())) {
+ MesWmWarehouseAreaDO area = resolveImportLocationOrArea(areaCodeMap,
+ areaNameMap, importStock.getArea(), WM_MATERIAL_STOCK_IMPORT_AREA_NOT_EXISTS);
+ if (ObjUtil.notEqual(area.getLocationId(),
+ locationId != null ? locationId : null)) {
+ throw exception(WM_WAREHOUSE_AREA_RELATION_INVALID);
+ }
+ areaId = area.getId();
+ }
+ // 3.3 鎵规锛堢墿鏂欏惎鐢ㄦ壒娆＄鐞嗘椂蹇呭～锛屼笖鎵规闇�褰掑睘璇ョ墿鏂欙級
+ Long batchId = null;
+ String batchCode = null;
+ if (Boolean.TRUE.equals(item.getIsBatchManaged())) {
+ if (StrUtil.isBlank(importStock.getBatchCode())) {
+ throw exception(WM_TRANSACTION_BATCH_REQUIRED);
+ }
+ MesWmBatchDO batch = batchService.getBatchByCode(importStock.getBatchCode().trim());
+ if (batch == null || ObjUtil.notEqual(batch.getItemId(), item.getId())) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_BATCH_NOT_EXISTS,
+ importStock.getBatchCode().trim());
+ }
+ batchId = batch.getId();
+ batchCode = batch.getCode();
+ }
+ // 3.4 渚涘簲鍟嗭紙鍙�夛級
+ Long vendorId = resolveImportVendor(supplierCodeMap, supplierNameMap, importStock.getVendor());
+ // 3.5 鎿嶄綔绫诲瀷锛堝繀濉細澧炲姞/鍑忓皯/瑕嗙洊锛�
+ String operationType = importStock.getOperationType() == null
+ ? null : importStock.getOperationType().trim();
+ if (StrUtil.isBlank(operationType)) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_FIELD_REQUIRED, "鎿嶄綔绫诲瀷");
+ }
+ if (!OP_ADD.equals(operationType) && !OP_REDUCE.equals(operationType)
+ && !OP_COVER.equals(operationType)) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_OPERATION_INVALID, operationType);
+ }
+ // 3.6 鏁伴噺鏍￠獙锛氬鍔�/鍑忓皯涓哄彉鍔ㄩ噺椤讳负姝ｆ暟锛涜鐩栦负鐩爣鐜版湁閲忛』 >= 0
+ BigDecimal quantity = importStock.getQuantity();
+ boolean cover = OP_COVER.equals(operationType);
+ if (quantity == null || quantity.compareTo(BigDecimal.ZERO) < 0
+ || (!cover && quantity.compareTo(BigDecimal.ZERO) == 0)) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_QUANTITY_INVALID,
+ quantity == null ? "绌�" : quantity);
+ }
+ // 3.7 鎸夋搷浣滅被鍨嬪畾浣嶅苟澶勭悊搴撳瓨璁板綍锛堜笉瀛樺湪鍒欏垱寤猴紝瀛樺湪鍒欒皟鏁存暟閲忥級
+ MesWmMaterialStockDO existStock = materialStockMapper.selectByCompositeKey(
+ item.getId(), warehouse.getId(), locationId, areaId, batchId, vendorId);
+ Long wId = warehouse.getId();
+ if (OP_REDUCE.equals(operationType)) {
+ // 鍑忓皯锛氬簱瀛樺繀椤诲瓨鍦紝鎵ｅ噺涓嶈冻鏃剁敱鍑哄簱娴佹按鏍￠獙骞跺け璐�
+ if (existStock == null) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_STOCK_NOT_EXISTS);
+ }
+ createImportTransaction(existStock, item.getId(), batchId, batchCode,
+ wId, locationId, areaId, vendorId, quantity.negate());
+ respVO.getUpdateNames().add(key);
+ } else if (OP_ADD.equals(operationType)) {
+ // 澧炲姞锛氫笉瀛樺湪鍒欏缓搴撳瓨鍐嶅叆搴擄紱宸插瓨鍦ㄥ垯鐩存帴杩藉姞鍙樺姩閲�
+ if (existStock == null) {
+ MesWmMaterialStockDO newStock = getOrCreateMaterialStock(
+ item.getId(), wId, locationId, areaId,
+ batchId, batchCode, vendorId, LocalDateTime.now());
+ createImportTransaction(newStock, item.getId(), batchId, batchCode,
+ wId, locationId, areaId, vendorId, quantity);
+ respVO.getCreateNames().add(key);
+ } else {
+ createImportTransaction(existStock, item.getId(), batchId, batchCode,
+ wId, locationId, areaId, vendorId, quantity);
+ respVO.getUpdateNames().add(key);
+ }
+ } else {
+ // 瑕嗙洊锛氭暟閲忎负鐩爣鐜版湁閲忥紱涓嶅瓨鍦ㄥ垯鏂板缓骞剁疆閲忥紝宸插瓨鍦ㄦ寜宸鍑哄叆搴�
+ if (existStock == null) {
+ MesWmMaterialStockDO newStock = getOrCreateMaterialStock(
+ item.getId(), wId, locationId, areaId,
+ batchId, batchCode, vendorId, LocalDateTime.now());
+ if (quantity.compareTo(BigDecimal.ZERO) > 0) {
+ createImportTransaction(newStock, item.getId(), batchId, batchCode,
+ wId, locationId, areaId, vendorId, quantity);
+ }
+ respVO.getCreateNames().add(key);
+ } else {
+ BigDecimal currentQty = existStock.getQuantity() != null
+ ? existStock.getQuantity() : BigDecimal.ZERO;
+ BigDecimal diff = quantity.subtract(currentQty);
+ if (diff.compareTo(BigDecimal.ZERO) != 0) {
+ createImportTransaction(existStock, item.getId(), batchId, batchCode,
+ wId, locationId, areaId, vendorId, diff);
+ }
+ respVO.getUpdateNames().add(key);
+ }
+ }
+ });
+ } catch (Exception ex) {
+ respVO.getFailureNames().put(key, ex.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ private MdmItemRespDTO resolveImportItem(Map<String, MdmItemRespDTO> itemMap, String itemCode) {
+ if (StrUtil.isBlank(itemCode)) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_FIELD_REQUIRED, "鐗╂枡缂栫爜");
+ }
+ MdmItemRespDTO item = itemMap.get(itemCode.trim());
+ if (item == null) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_ITEM_NOT_EXISTS, itemCode.trim());
+ }
+ return item;
+ }
+
+ private MesWmWarehouseDO resolveImportWarehouse(Map<String, MesWmWarehouseDO> codeMap,
+ Map<String, MesWmWarehouseDO> nameMap, String value) {
+ if (StrUtil.isBlank(value)) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_FIELD_REQUIRED, "浠撳簱");
+ }
+ String trimmed = value.trim();
+ MesWmWarehouseDO warehouse = codeMap.get(trimmed) != null ? codeMap.get(trimmed) : nameMap.get(trimmed);
+ if (warehouse == null) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_WAREHOUSE_NOT_EXISTS, trimmed);
+ }
+ return warehouse;
+ }
+
+ private <T> T resolveImportLocationOrArea(Map<String, T> codeMap, Map<String, T> nameMap,
+ String value, ErrorCode errorCode) {
+ String trimmed = value.trim();
+ T result = codeMap.get(trimmed) != null ? codeMap.get(trimmed) : nameMap.get(trimmed);
+ if (result == null) {
+ throw exception(errorCode, trimmed);
+ }
+ return result;
+ }
+
+ private Long resolveImportVendor(Map<String, SrmSupplierRespDTO> codeMap,
+ Map<String, SrmSupplierRespDTO> nameMap, String value) {
+ if (StrUtil.isBlank(value)) {
+ return null;
+ }
+ String trimmed = value.trim();
+ SrmSupplierRespDTO supplier = codeMap.get(trimmed) != null ? codeMap.get(trimmed) : nameMap.get(trimmed);
+ if (supplier == null) {
+ throw exception(WM_MATERIAL_STOCK_IMPORT_VENDOR_NOT_EXISTS, trimmed);
+ }
+ return supplier.getId();
+ }
+
+ /**
+ * 鍒涘缓瀵煎叆浜х敓鐨勫簱瀛樹簨鍔℃祦姘达紙澶嶇敤搴撳瓨璋冩暣鐨勬祦姘存ā寮忥級
+ *
+ * @param quantity 鍙樺姩鏁伴噺锛堟鏁�=鍏ュ簱锛岃礋鏁�=鍑哄簱锛�
+ */
+ private void createImportTransaction(MesWmMaterialStockDO stock, Long itemId, Long batchId, String batchCode,
+ Long warehouseId, Long locationId, Long areaId, Long vendorId,
+ BigDecimal quantity) {
+ boolean inbound = quantity.compareTo(BigDecimal.ZERO) > 0;
+ MesWmTransactionSaveReqDTO transaction = new MesWmTransactionSaveReqDTO()
+ .setType(inbound ? MesWmTransactionTypeEnum.IN.getType() : MesWmTransactionTypeEnum.OUT.getType())
+ .setBizType(inbound ? MesBizTypeConstants.WM_STOCK_ADJUST_IN : MesBizTypeConstants.WM_STOCK_ADJUST_OUT)
+ .setBizId(stock.getId())
+ .setBizCode("STOCK_IMPORT_" + stock.getId())
+ .setBizLineId(stock.getId())
+ .setItemId(itemId)
+ .setQuantity(quantity.abs())
+ .setBatchId(batchId)
+ .setBatchCode(batchCode)
+ .setWarehouseId(warehouseId)
+ .setLocationId(locationId)
+ .setAreaId(areaId)
+ .setVendorId(vendorId)
+ .setReceiptTime(LocalDateTime.now())
+ .setCheckFlag(!inbound);
+ wmTransactionService.createTransaction(transaction);
+ }
+
}
--
Gitblit v1.9.3