feat: 完善质检、生产、销售、财务与人事模块并接入审批流程

gaoluyang

5 天以前 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java

@@ -31,6 +31,8 @@
import java.time.LocalDateTime;
import java.util.List;

import cn.iocoder.yudao.framework.common.exception.ServiceException;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;

@@ -89,12 +91,15 @@
            if (materialStock == null) {
                throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
            }
            // 校验物料、批次、仓库等维度一致（防止传入错误的 materialStockId）
            // 校验物料、批次、仓库等维度一致（防止传入错误的 materialStockId）。
            // 若此处不一致，通常是该库存已被移库/合并/拆分，需退回重新拣货，故给出针对性提示
            if (ObjUtil.notEqual(materialStock.getItemId(), reqDTO.getItemId())
                    || ObjUtil.notEqual(materialStock.getWarehouseId(), reqDTO.getWarehouseId())
                    || ObjUtil.notEqual(materialStock.getLocationId(), reqDTO.getLocationId())
                    || ObjUtil.notEqual(materialStock.getAreaId(), reqDTO.getAreaId())) {
                throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
                    || ObjUtil.notEqual(materialStock.getAreaId(), reqDTO.getAreaId())
                    || ObjUtil.notEqual(materialStock.getBatchId(), reqDTO.getBatchId())) {
                throw new ServiceException(WM_MATERIAL_STOCK_SELECTION_MISMATCH.getCode(),
                        "该库存记录已变动（可能被移库/合并/拆分），与出库明细不一致，无法扣减，请退回重新拣货");
            }
        } else if (isInbound) {
            // 入库事务：根据 forceCreateNewStock 标志决定是创建新记录还是查找/创建
@@ -139,6 +144,7 @@
                .itemId(reqDTO.getItemId()).batchId(reqDTO.getBatchId()).batchCode(reqDTO.getBatchCode())
                .warehouseId(reqDTO.getWarehouseId()).locationId(reqDTO.getLocationId()).areaId(reqDTO.getAreaId())
                .bizType(reqDTO.getBizType()).bizId(reqDTO.getBizId()).bizCode(reqDTO.getBizCode()).bizLineId(reqDTO.getBizLineId())
                .workOrderId(reqDTO.getWorkOrderId())
                .materialStockId(materialStock.getId()).relatedTransactionId(reqDTO.getRelatedTransactionId())
                .build();
        transactionMapper.insert(transaction);