From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 388 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 370 insertions(+), 18 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 b167ca2..b3b7ec6 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
@@ -8,7 +8,10 @@
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.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;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmStockSummaryRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
@@ -16,11 +19,19 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
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.MesWmStockStateEnum;
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.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
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.materialstockbag.MesWmMaterialStockBagService;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstockbag.MesWmMaterialStockBagMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstockbag.MesWmMaterialStockBagDO;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import jakarta.annotation.Resource;
@@ -32,8 +43,11 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -50,6 +64,8 @@
@Resource
private MesMdmItemService mdmItemService;
@Resource
+ private MesMdItemService mdItemService;
+ @Resource
private MesMdItemTypeService itemTypeService;
@Resource
private MesWmWarehouseAreaService areaService;
@@ -59,6 +75,14 @@
@Resource
@Lazy
private MesWmTransactionService wmTransactionService;
+ @Resource
+ @Lazy
+ private MesWmBatchService batchService;
+
+ @Resource
+ private MesWmMaterialStockBagMapper materialStockBagMapper;
+ @Resource
+ private MesWmMaterialStockBagService materialStockBagService;
@Override
public MesWmMaterialStockDO getMaterialStock(Long id) {
@@ -88,10 +112,13 @@
List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(pageReqVO.getItemTypeId());
itemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
}
- // 1.2 瑙ｆ瀽 itemId
+ // 1.2 瑙ｆ瀽 itemId锛氬墠绔紶鐨勬槸 mes_md_item.id锛屽簱瀛樿〃瀛樼殑鏄� mdm_item_id锛岄渶瑕佽浆鎹�
Set<Long> itemIds = null;
if (pageReqVO.getItemId() != null) {
- itemIds = SetUtils.asSet(pageReqVO.getItemId());
+ MesMdItemDO item = mdItemService.getItem(pageReqVO.getItemId());
+ if (item != null && item.getMdmItemId() != null) {
+ itemIds = SetUtils.asSet(item.getMdmItemId());
+ }
}
// 1.3 瑙ｆ瀽 virtualFilter锛氳浆鎹负铏氭嫙浠� warehouseId
Long virtualWarehouseId = null;
@@ -103,9 +130,27 @@
Assert.notNull(virtualWarehouse, "铏氭嫙浠撳簱锛圵IP_VIRTUAL_WAREHOUSE锛変笉瀛樺湪");
virtualWarehouseId = virtualWarehouse.getId();
}
+ // 1.4 瑙ｆ瀽 warehouseType锛氳浆鎹负璇ョ被鍨嬩粨搴� warehouseIds锛堜笌 warehouseId / virtualFilter 骞跺瓨锛屼繚鐣欏吋瀹癸級
+ List<Long> warehouseIds = resolveWarehouseIdsByType(pageReqVO.getWarehouseType());
+ if (warehouseIds != null && warehouseIds.isEmpty()) {
+ return PageResult.empty();
+ }
// 2. 鍒嗛〉鏌ヨ
- return materialStockMapper.selectPage(pageReqVO, itemTypeIds, itemIds, virtualWarehouseId);
+ return materialStockMapper.selectPage(pageReqVO, itemTypeIds, itemIds, virtualWarehouseId, warehouseIds);
+ }
+
+ /**
+ * 灏嗕粨搴撶被鍨嬭В鏋愪负浠撳簱 id 闆嗗悎锛坵arehouseType 涓� null 鏃朵笉鍔犺繃婊わ紝杩斿洖 null锛�
+ *
+ * @param warehouseType 浠撳簱绫诲瀷锛岃 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmWarehouseTypeEnum}
+ * @return 璇ョ被鍨嬩粨搴� id 闆嗗悎锛泈arehouseType 涓� null 杩斿洖 null锛涜绫诲瀷鏃犱粨搴撹繑鍥炵┖闆嗗悎
+ */
+ private List<Long> resolveWarehouseIdsByType(Integer warehouseType) {
+ if (warehouseType == null) {
+ return null;
+ }
+ return convertList(warehouseService.getWarehouseListByType(warehouseType), MesWmWarehouseDO::getId);
}
@Override
@@ -151,7 +196,91 @@
@Override
public List<MesWmMaterialStockDO> getMaterialStockList(MesWmMaterialStockListReqVO reqVO) {
- return materialStockMapper.selectList(reqVO);
+ List<Long> warehouseIds = resolveWarehouseIdsByType(reqVO.getWarehouseType());
+ if (warehouseIds != null && warehouseIds.isEmpty()) {
+ return Collections.emptyList();
+ }
+ return materialStockMapper.selectList(reqVO, warehouseIds);
+ }
+
+ @Override
+ public List<MesWmStockSummaryRespVO> getStockSummaryByItem(MesWmMaterialStockListReqVO reqVO) {
+ List<MesWmMaterialStockDO> stocks = getMaterialStockList(reqVO);
+ List<MesWmStockSummaryRespVO> list = buildStockSummary(stocks,
+ stock -> String.valueOf(stock.getItemId()),
+ (vo, stock) -> vo.setItemId(stock.getItemId()));
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
+ convertSet(stocks, MesWmMaterialStockDO::getItemId));
+ list.forEach(vo -> {
+ MesMdmItemDO item = itemMap.get(vo.getItemId());
+ if (item != null) {
+ vo.setItemCode(item.getCode()).setItemName(item.getName());
+ }
+ });
+ return list;
+ }
+
+ @Override
+ public List<MesWmStockSummaryRespVO> getStockSummaryByBatch(MesWmMaterialStockListReqVO reqVO) {
+ List<MesWmMaterialStockDO> stocks = getMaterialStockList(reqVO);
+ return buildStockSummary(stocks,
+ stock -> stock.getBatchId() + "|" + (stock.getBatchCode() != null ? stock.getBatchCode() : ""),
+ (vo, stock) -> vo.setBatchId(stock.getBatchId()).setBatchCode(stock.getBatchCode()));
+ }
+
+ @Override
+ public List<MesWmStockSummaryRespVO> getStockSummaryByWarehouse(MesWmMaterialStockListReqVO reqVO) {
+ List<MesWmMaterialStockDO> stocks = getMaterialStockList(reqVO);
+ List<MesWmStockSummaryRespVO> list = buildStockSummary(stocks,
+ stock -> String.valueOf(stock.getWarehouseId()),
+ (vo, stock) -> vo.setWarehouseId(stock.getWarehouseId()));
+ Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
+ convertSet(stocks, MesWmMaterialStockDO::getWarehouseId));
+ list.forEach(vo -> {
+ MesWmWarehouseDO warehouse = warehouseMap.get(vo.getWarehouseId());
+ if (warehouse != null) {
+ vo.setWarehouseName(warehouse.getName());
+ }
+ });
+ return list;
+ }
+
+ /**
+ * 鍐呭瓨鑱氬悎搴撳瓨鏁伴噺锛氭寜缁村害閿� + 搴撳瓨鐘舵�佸垎缁勶紝绱姞鍦ㄥ簱鏁伴噺
+ */
+ private List<MesWmStockSummaryRespVO> buildStockSummary(List<MesWmMaterialStockDO> stocks,
+ Function<MesWmMaterialStockDO, String> dimKeyFn,
+ BiConsumer<MesWmStockSummaryRespVO, MesWmMaterialStockDO> dimSetter) {
+ if (CollUtil.isEmpty(stocks)) {
+ return Collections.emptyList();
+ }
+ Map<String, MesWmStockSummaryRespVO> map = new LinkedHashMap<>();
+ for (MesWmMaterialStockDO stock : stocks) {
+ String key = dimKeyFn.apply(stock) + "|" + stock.getStockState();
+ MesWmStockSummaryRespVO vo = map.computeIfAbsent(key, k -> {
+ MesWmStockSummaryRespVO newVo = new MesWmStockSummaryRespVO();
+ dimSetter.accept(newVo, stock);
+ newVo.setStockState(stock.getStockState());
+ newVo.setStockStateName(stockStateName(stock.getStockState()));
+ newVo.setTotalQuantity(BigDecimal.ZERO);
+ return newVo;
+ });
+ BigDecimal qty = stock.getQuantity() != null ? stock.getQuantity() : BigDecimal.ZERO;
+ vo.setTotalQuantity(vo.getTotalQuantity().add(qty));
+ }
+ return new ArrayList<>(map.values());
+ }
+
+ private String stockStateName(Integer state) {
+ if (state == null) {
+ return "";
+ }
+ for (MesWmStockStateEnum e : MesWmStockStateEnum.values()) {
+ if (e.getState().equals(state)) {
+ return e.getName();
+ }
+ }
+ return String.valueOf(state);
}
@Override
@@ -172,10 +301,34 @@
.batchId(batchId).batchCode(batchCode).vendorId(vendorId)
.quantity(BigDecimal.ZERO) // 鍒濆鏁伴噺涓� 0锛岀敱 updateMaterialStockQuantity 鏇存柊
.receiptTime(receiptTime != null ? receiptTime : LocalDateTime.now())
+ .stockState(MesWmStockStateEnum.TEMP.getState())
.frozen(false)
.build();
materialStockMapper.insert(newStock);
- return newStock;
+ // 3. 閲嶆柊鏌ヨ锛岀‘淇濇嬁鍒版暟鎹簱鐢熸垚鐨勫畬鏁磋褰曪紙id銆乧reateTime 绛夛級
+ MesWmMaterialStockDO inserted = materialStockMapper.selectById(newStock.getId());
+ return inserted != null ? inserted : newStock;
+ }
+
+ @Override
+ public MesWmMaterialStockDO getMaterialStockByCompositeKey(Long itemId, Long warehouseId, Long locationId, Long areaId,
+ Long batchId, Long vendorId) {
+ // 鍑哄簱/鍗犵敤鍙粠鍚堟牸搴撳尮閰嶏紝閬垮厤鎵ｅ埌鍚屾壒娆＄殑鏆傚瓨搴擄紙绉嶅瓙璐ㄦ鎸夎鎷嗘暟閲忓悗鍚屾壒娆″弻鐘舵�佸苟瀛橈級
+ return materialStockMapper.selectQualifiedByCompositeKey(itemId, warehouseId, locationId, areaId, batchId, vendorId);
+ }
+
+ @Override
+ public List<MesWmMaterialStockDO> getQualifiedMaterialStockListByItemAndBatch(Long itemId, Long batchId) {
+ List<Long> qualifiedWarehouseIds = warehouseService.getQualifiedWarehouseIds();
+ if (CollUtil.isEmpty(qualifiedWarehouseIds)) {
+ return Collections.emptyList();
+ }
+ return materialStockMapper.selectQualifiedListByItemAndBatch(itemId, batchId, qualifiedWarehouseIds);
+ }
+
+ @Override
+ public List<MesWmMaterialStockDO> getMaterialStockListByItemAndBatch(Long itemId, Long batchId) {
+ return materialStockMapper.selectListByItemAndBatch(itemId, batchId);
}
@Override
@@ -185,6 +338,11 @@
if (updatedRows == 0) {
throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
}
+ }
+
+ @Override
+ public void updateMaterialStockState(Long id, Integer stockState) {
+ materialStockMapper.updateById(new MesWmMaterialStockDO().setId(id).setStockState(stockState));
}
@Override
@@ -234,7 +392,11 @@
|| ObjUtil.notEqual(stock.getAreaId(), areaId)) {
throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
}
- // 3. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝鏋滃墠绔紶浜� quantity锛屽垯蹇呴』淇濊瘉搴撳瓨鏁伴噺 >= quantity锛�
+ // 3. 鏍￠獙搴撳瓨璁板綍蹇呴』鏄悎鏍煎簱锛堟殏瀛樺簱瀛樻湭璐ㄦ锛屼笉鍙敤浜庡嚭搴�/鍗犵敤锛�
+ if (!MesWmStockStateEnum.QUALIFIED.getState().equals(stock.getStockState())) {
+ throw exception(WM_MATERIAL_STOCK_NOT_QUALIFIED);
+ }
+ // 4. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝鏋滃墠绔紶浜� quantity锛屽垯蹇呴』淇濊瘉搴撳瓨鏁伴噺 >= quantity锛�
if (quantity != null && stock.getQuantity() != null && stock.getQuantity().compareTo(quantity) < 0) {
throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
}
@@ -264,28 +426,41 @@
// 1. 鏍￠獙鐗╂枡瀛樺湪涓斿惎鐢�
MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
- // 2. 鏍￠獙搴撲綅娣锋斁瑙勫垯
- checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), reqVO.getBatchId());
+ // 2. 澶勭悊鎵规锛堜粎鍏ュ簱鏃堕渶瑕佸鐞嗘壒娆★級
+ Long batchId = reqVO.getBatchId();
+ String batchCode = reqVO.getBatchCode();
+ if (isInbound) {
+ MesWmBatchDO batch = resolveBatch(reqVO, item);
+ if (batch != null) {
+ batchId = batch.getId();
+ batchCode = batch.getCode();
+ }
+ } else {
+ // 鍑哄簱鏃舵牎楠屾壒娆″瓨鍦�
+ if (batchId != null) {
+ batchService.validateBatchExists(batchId, reqVO.getItemId());
+ }
+ }
- // 3. 鑾峰彇鎴栧垱寤哄簱瀛樿褰�
+ // 3. 鏍￠獙搴撲綅娣锋斁瑙勫垯
+ checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), batchId);
+
+ // 4. 鑾峰彇鎴栧垱寤哄簱瀛樿褰�
MesWmMaterialStockDO stock = getOrCreateMaterialStock(
reqVO.getItemId(),
reqVO.getWarehouseId(),
reqVO.getLocationId(),
reqVO.getAreaId(),
- reqVO.getBatchId(),
- reqVO.getBatchCode(),
+ batchId,
+ batchCode,
reqVO.getVendorId(),
LocalDateTime.now()
);
- // 4. 璁＄畻鍙樺姩鏁伴噺锛氬叆搴撲负姝ｏ紝鍑哄簱涓鸿礋
+ // 5. 璁＄畻鍙樺姩鏁伴噺锛氬叆搴撲负姝ｏ紝鍑哄簱涓鸿礋
BigDecimal quantity = isInbound ? reqVO.getQuantity() : reqVO.getQuantity().negate();
- // 5. 鏇存柊搴撳瓨鏁伴噺锛堝嚭搴撴椂鏍￠獙搴撳瓨鍏呰冻锛�
- updateMaterialStockQuantity(stock.getId(), quantity, !isInbound);
-
- // 6. 鍒涘缓搴撳瓨浜嬪姟娴佹按
+ // 6. 鍒涘缓搴撳瓨浜嬪姟娴佹按锛堝唴閮ㄤ細鏇存柊搴撳瓨鏁伴噺锛�
int bizType = isInbound ? MesBizTypeConstants.WM_STOCK_ADJUST_IN : MesBizTypeConstants.WM_STOCK_ADJUST_OUT;
MesWmTransactionSaveReqDTO transaction = new MesWmTransactionSaveReqDTO()
.setType(isInbound ? MesWmTransactionTypeEnum.IN.getType() : MesWmTransactionTypeEnum.OUT.getType())
@@ -295,8 +470,8 @@
.setBizLineId(stock.getId())
.setItemId(reqVO.getItemId())
.setQuantity(quantity)
- .setBatchId(reqVO.getBatchId())
- .setBatchCode(reqVO.getBatchCode())
+ .setBatchId(batchId)
+ .setBatchCode(batchCode)
.setWarehouseId(reqVO.getWarehouseId())
.setLocationId(reqVO.getLocationId())
.setAreaId(reqVO.getAreaId())
@@ -308,4 +483,181 @@
return stock.getId();
}
+ /**
+ * 瑙ｆ瀽鎵规
+ * <p>
+ * 鍏ュ簱鏃剁殑鎵规澶勭悊閫昏緫锛�
+ * 1. 鐗╂枡鏈惎鐢ㄦ壒娆＄鐞嗭細杩斿洖 null
+ * 2. 浼犲叆 batchId锛氭牎楠屽苟浣跨敤宸叉湁鎵规
+ * 3. 鏈紶 batchId锛氭牴鎹� batchCode 绛夊弬鏁拌嚜鍔ㄥ垱寤烘壒娆�
+ *
+ * @param reqVO 鍏ュ簱璇锋眰
+ * @param item 鐗╂枡淇℃伅
+ * @return 鎵规璁板綍锛堢墿鏂欐湭鍚敤鎵规绠＄悊鏃惰繑鍥� null锛�
+ */
+ private MesWmBatchDO resolveBatch(MesWmMaterialStockAdjustReqVO reqVO, MesMdmItemDO item) {
+ // 1. 鐗╂枡鏈惎鐢ㄦ壒娆＄鐞嗭紝杩斿洖 null
+ if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
+ return null;
+ }
+
+ // 2. 浼犲叆 batchId锛屾牎楠屽苟杩斿洖宸叉湁鎵规
+ if (reqVO.getBatchId() != null) {
+ return batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
+ }
+
+ // 3. 鏈紶 batchId锛岃嚜鍔ㄥ垱寤烘壒娆�
+ MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
+ .setItemId(reqVO.getItemId())
+ .setBatchCode(reqVO.getBatchCode())
+ .setVendorId(reqVO.getVendorId())
+ .setProduceDate(reqVO.getProduceDate() != null ? reqVO.getProduceDate().atStartOfDay() : null)
+ .setExpireDate(reqVO.getExpireDate() != null ? reqVO.getExpireDate().atStartOfDay() : null)
+ .setReceiptDate(LocalDateTime.now())
+ .setLotNumber(reqVO.getLotNumber())
+ .setQualityStatus(parseQualityStatus(reqVO.getQualityStatus()));
+ return batchService.getOrGenerateBatchCode(batchReqVO);
+ }
+
+ /**
+ * 瑙ｆ瀽璐ㄩ噺鐘舵�侊紙鏀寔鏁板瓧鎴栧瓧绗︿覆锛�
+ */
+ private Integer parseQualityStatus(Object qualityStatus) {
+ if (qualityStatus == null) {
+ return null;
+ }
+ if (qualityStatus instanceof Integer) {
+ return (Integer) qualityStatus;
+ }
+ if (qualityStatus instanceof String) {
+ String str = (String) qualityStatus;
+ // 鏀寔鏁板瓧瀛楃涓�
+ if (str.matches("\\d+")) {
+ return Integer.parseInt(str);
+ }
+ // 鏀寔甯歌瀛楃涓叉槧灏�
+ switch (str.toUpperCase()) {
+ case "PENDING":
+ case "寰呮楠�":
+ case "寰呮":
+ return 0;
+ case "PASS":
+ case "QUALIFIED":
+ case "鍚堟牸":
+ return 1;
+ case "FAIL":
+ case "UNQUALIFIED":
+ case "涓嶅悎鏍�":
+ return 2;
+ default:
+ throw new IllegalArgumentException("鏃犳晥鐨勮川閲忕姸鎬�: " + str);
+ }
+ }
+ throw new IllegalArgumentException("鏃犳晥鐨勮川閲忕姸鎬佺被鍨�: " + qualityStatus.getClass().getName());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void moveMaterialStock(MesWmMaterialStockMoveReqVO reqVO) {
+ // 1. 鏌ヨ鍘熷簱瀛樿褰�
+ MesWmMaterialStockDO sourceStock = validateMaterialStockExists(reqVO.getMaterialStockId());
+
+ // 2. 鏍￠獙搴撳瓨鏁伴噺鍏呰冻锛堝彲鐢ㄩ噺 = 鍦ㄥ簱鏁伴噺 - 鍐荤粨鏁伴噺 - 鍗犵敤閲忥級
+ BigDecimal availableQty = sourceStock.getQuantity() != null ? sourceStock.getQuantity() : BigDecimal.ZERO;
+ if (sourceStock.getFrozenQuantity() != null) {
+ availableQty = availableQty.subtract(sourceStock.getFrozenQuantity());
+ }
+ if (sourceStock.getReservedQuantity() != null) {
+ availableQty = availableQty.subtract(sourceStock.getReservedQuantity());
+ }
+ if (availableQty.compareTo(reqVO.getQuantity()) < 0) {
+ throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
+ }
+
+ // 3. 鏍￠獙搴撳瓨鏈喕缁�
+ if (Boolean.TRUE.equals(sourceStock.getFrozen())) {
+ throw exception(WM_MATERIAL_STOCK_FROZEN);
+ }
+
+ // 4. 鏍￠獙鐩爣搴撲綅娣锋斁瑙勫垯
+ checkAreaMixingRule(reqVO.getToAreaId(), sourceStock.getItemId(), sourceStock.getBatchId());
+
+ // 5. 鐢熸垚绉诲簱鍗曞彿
+ String moveCode = "MOVE_" + System.currentTimeMillis();
+
+ // 6. 鍒涘缓璋冩嫧绉诲嚭浜嬪姟锛堣礋鏁帮級
+ MesWmTransactionSaveReqDTO outTransaction = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.MOVE_OUT.getType())
+ .setBizType(MesBizTypeConstants.WM_TRANSFER_OUT)
+ .setBizId(sourceStock.getId())
+ .setBizCode(moveCode)
+ .setBizLineId(sourceStock.getId())
+ .setItemId(sourceStock.getItemId())
+ .setQuantity(reqVO.getQuantity().negate())
+ .setBatchId(sourceStock.getBatchId())
+ .setBatchCode(sourceStock.getBatchCode())
+ .setWarehouseId(sourceStock.getWarehouseId())
+ .setLocationId(sourceStock.getLocationId())
+ .setAreaId(sourceStock.getAreaId())
+ .setVendorId(sourceStock.getVendorId())
+ .setMaterialStockId(sourceStock.getId())
+ .setCheckFlag(true);
+ Long outTransactionId = wmTransactionService.createTransaction(outTransaction);
+
+ // 7. 鏌ユ壘鐩爣搴撲綅鐨勫簱瀛樿褰曪紙蹇界暐渚涘簲鍟嗭級锛岀敤浜庡悎骞跺簱瀛�
+ MesWmMaterialStockDO targetStock = materialStockMapper.selectByCompositeKeyIgnoreVendor(
+ sourceStock.getItemId(),
+ reqVO.getToWarehouseId(),
+ reqVO.getToLocationId(),
+ reqVO.getToAreaId(),
+ sourceStock.getBatchId()
+ );
+
+ // 8. 鍒涘缓璋冩嫧绉诲叆浜嬪姟锛堟鏁帮級锛屽叧鑱斿嚭搴撲簨鍔�
+ // 浣跨敤鐩爣搴撲綅宸叉湁搴撳瓨璁板綍鐨� vendorId锛堝鏋滄湁锛夛紝鍚﹀垯涓嶄紶
+ MesWmTransactionSaveReqDTO inTransaction = new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.MOVE_IN.getType())
+ .setBizType(MesBizTypeConstants.WM_TRANSFER_IN)
+ .setBizId(sourceStock.getId())
+ .setBizCode(moveCode)
+ .setBizLineId(sourceStock.getId())
+ .setItemId(sourceStock.getItemId())
+ .setQuantity(reqVO.getQuantity())
+ .setBatchId(sourceStock.getBatchId())
+ .setBatchCode(sourceStock.getBatchCode())
+ .setWarehouseId(reqVO.getToWarehouseId())
+ .setLocationId(reqVO.getToLocationId())
+ .setAreaId(reqVO.getToAreaId())
+ .setVendorId(targetStock != null ? targetStock.getVendorId() : null)
+ .setRelatedTransactionId(outTransactionId)
+ .setCheckFlag(false);
+ wmTransactionService.createTransaction(inTransaction);
+
+ // 9. 鏁翠綅缃Щ搴撴椂锛岄�愯杩佺Щ琚嬬爜鏄庣粏浣嶇疆锛堟暟閲忕瓑浜庢簮搴撲綅娲诲姩琚嬫暟涓斾负鏁存暟鎵嶈涓烘暣浣嶇Щ搴擄級
+ MesWmMaterialStockDO finalTargetStock = materialStockMapper.selectByCompositeKeyIgnoreVendor(
+ sourceStock.getItemId(), reqVO.getToWarehouseId(), reqVO.getToLocationId(),
+ reqVO.getToAreaId(), sourceStock.getBatchId());
+ relocateBagsForMove(sourceStock, reqVO.getQuantity(), inTransaction, finalTargetStock);
+ }
+
+ /**
+ * 鏁翠綅绉诲簱锛氬皢婧愬簱浣嶇殑娲诲姩琚嬬爜鏄庣粏杩佺Щ鍒扮洰鏍囧簱浣嶃��
+ * <p>
+ * 浠呭綋绉诲簱鏁伴噺绛変簬婧愬簱浣嶆椿鍔ㄨ鏁颁笖涓烘暣鏁版椂鎵ц锛堟暣浣嶇疆鎼Щ锛夛紝灏嗘瘡琚嬫槑缁嗙殑搴撳瓨姹囨�汇�佷粨搴撱�佸簱鍖恒�佸簱浣�
+ * 鏇存柊涓虹洰鏍囦綅缃紱閮ㄥ垎绉诲簱/鏃犺鐮佹槑缁嗙殑鏃у簱瀛樹笉鍋氳鐮佽縼绉伙紝淇濇寔姹囨�诲簱瀛樺彉鍔ㄥ嵆鍙��
+ */
+ private void relocateBagsForMove(MesWmMaterialStockDO sourceStock, BigDecimal quantity,
+ MesWmTransactionSaveReqDTO moveInReq, MesWmMaterialStockDO targetStock) {
+ List<MesWmMaterialStockBagDO> bags = materialStockBagMapper.selectActiveListByItemAndBatch(
+ sourceStock.getItemId(), sourceStock.getBatchId(), sourceStock.getStockState());
+ if (CollUtil.isEmpty(bags) || targetStock == null || quantity == null
+ || quantity.compareTo(BigDecimal.valueOf(bags.size())) != 0) {
+ return;
+ }
+ for (MesWmMaterialStockBagDO bag : bags) {
+ moveInReq.setBagCodeId(bag.getBagCodeId()).setBagCode(bag.getBagCode());
+ materialStockBagService.moveIn(moveInReq, targetStock, null);
+ }
+ }
+
}
--
Gitblit v1.9.3