diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java index 523faa16b..9d42fc6cf 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java @@ -1301,40 +1301,40 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl wrapper = - new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper() - .eq(MaterialInventory::getShipperId, shipperId) - .eq(MaterialInventory::getMaterialBaseInfoId, materialBaseInfoId) - .eq(MaterialInventory::getBatchNumber, batchNumber) - .eq(MaterialInventory::getDelFlag, 1) - .eq(MaterialInventory::getInOrderNumber, currentInOrderNumber); - - // 如果库存属性值不为空,需要精确匹配;如果为空,查询库存属性值为空或null的记录 - if (materialStatusCode != null && !materialStatusCode.trim().isEmpty()) { - wrapper.eq(MaterialInventory::getMaterialStatusCode, materialStatusCode); - } else { - wrapper.and(w -> w.isNull(MaterialInventory::getMaterialStatusCode) - .or() - .eq(MaterialInventory::getMaterialStatusCode, "")); - } - - List existingInventoryList = materialInventoryMapper.selectList(wrapper); - - if (!CollectionUtils.isEmpty(existingInventoryList)) { - String statusCodeDesc = (materialStatusCode != null && !materialStatusCode.trim().isEmpty()) - ? ",库存属性值:" + materialStatusCode - : ",库存属性值:空"; - throw new ServiceException("批次号【" + batchNumber + "】在本入库单「" + currentInOrderNumber - + "」下已存在库存,货主ID【" + shipperId + "】+商品ID【" + materialBaseInfoId + "】" + statusCodeDesc - + ",不允许重复使用"); - } - } +// if (shipperId != null && materialBaseInfoId != null && batchNumber != null && !batchNumber.trim().isEmpty()) { +// if (StringUtils.isBlank(currentInOrderNumber)) { +// log.warn("batchReceiptUpdate:未解析到入库单号,跳过库存批次重复校验,receiptOrderNumber={}", +// receiptMaterialDetailDO != null ? receiptMaterialDetailDO.getReceiptOrderNumber() : null); +// return; +// } +// com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper wrapper = +// new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper() +// .eq(MaterialInventory::getShipperId, shipperId) +// .eq(MaterialInventory::getMaterialBaseInfoId, materialBaseInfoId) +// .eq(MaterialInventory::getBatchNumber, batchNumber) +// .eq(MaterialInventory::getDelFlag, 1) +// .eq(MaterialInventory::getInOrderNumber, currentInOrderNumber); +// +// // 如果库存属性值不为空,需要精确匹配;如果为空,查询库存属性值为空或null的记录 +// if (materialStatusCode != null && !materialStatusCode.trim().isEmpty()) { +// wrapper.eq(MaterialInventory::getMaterialStatusCode, materialStatusCode); +// } else { +// wrapper.and(w -> w.isNull(MaterialInventory::getMaterialStatusCode) +// .or() +// .eq(MaterialInventory::getMaterialStatusCode, "")); +// } +// +// List existingInventoryList = materialInventoryMapper.selectList(wrapper); +// +// if (!CollectionUtils.isEmpty(existingInventoryList)) { +// String statusCodeDesc = (materialStatusCode != null && !materialStatusCode.trim().isEmpty()) +// ? ",库存属性值:" + materialStatusCode +// : ",库存属性值:空"; +// throw new ServiceException("批次号【" + batchNumber + "】在本入库单「" + currentInOrderNumber +// + "」下已存在库存,货主ID【" + shipperId + "】+商品ID【" + materialBaseInfoId + "】" + statusCodeDesc +// + ",不允许重复使用"); +// } +// } } } \ No newline at end of file