From 2e2692b06e468f9767d6a31bdb2c6982e92dc7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Fri, 31 Oct 2025 09:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E6=8B=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InventoryMoveServiceImpl.java | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java index 29e214f..e9999e3 100644 --- a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java +++ b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java @@ -373,13 +373,13 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { group.partNo, group.lotBatchNo, group.sourceLocationNo)); continue; } - BigDecimal reservedQty = new BigDecimal(matchedStock.getQtyReserved()); - if(reservedQty.compareTo(new BigDecimal(0))>0){ - insufficientStockErrors.add(String.format( - "物料%s批次%s在库位%s在ifs中被预留：%s", - group.partNo, group.lotBatchNo, group.sourceLocationNo, - matchedStock.getQtyReserved())); - } + // BigDecimal reservedQty = new BigDecimal(matchedStock.getQtyReserved()); + // if(reservedQty.compareTo(new BigDecimal(0))>0){ + // insufficientStockErrors.add(String.format( + // "物料%s批次%s在库位%s在ifs中被预留：%s", + // group.partNo, group.lotBatchNo, group.sourceLocationNo, + // matchedStock.getQtyReserved())); + // } // 计算可用库存（在库数量 - 预留数量） BigDecimal availableQty = matchedStock.getAvailableQty(); @@ -494,48 +494,48 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { // 获取该站点指定物料的库存信息 - List inventoryList=new ArrayList<>(); - try { - inventoryList = ifsApiService.getInventoryPartInStock(group.site, group.partNo); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - - log.info("获取站点{}物料{}的库存信息，共{}条记录", group.site, group.partNo, inventoryList.size()); - - IfsInventoryPartInStock matchedStock = findMatchingStock(inventoryList, group); - boolean failedFlag=false; - if (matchedStock == null) { - failedFlag=true; - } - - - if (matchedStock != null) { - BigDecimal reservedQty = new BigDecimal(matchedStock.getQtyReserved()); - if(reservedQty.compareTo(new BigDecimal(0))>0){ - failedFlag=true; - } - } - if(failedFlag){ - log.warn("IFS移库同步失败 - 物料: {}, 批次: {}, 在库位:{}的库存被预留，无法移库", - group.partNo, group.lotBatchNo,group.sourceLocationNo); - // 记录到错误日志表 - rqrq - ifsCallErrorLogService.logIfsError( - group.site, - "MoveInventoryPart", - "库存移库（栈板）", - group.partNo, - group.lotBatchNo, - group.sourceLocationNo, - group.destLocationNo, - group.totalQty, - group.expiredDate, - "ifs库存被预留或者查不到库存，无法移库", - "ifs库存被预留或者查不到库存，无法移库", - "ifs库存被预留或者查不到库存，无法移库" - ); - return; - } + // List inventoryList=new ArrayList<>(); + // try { + // inventoryList = ifsApiService.getInventoryPartInStock(group.site, group.partNo); + // } catch (JsonProcessingException e) { + // throw new RuntimeException(e); + // } + // + // log.info("获取站点{}物料{}的库存信息，共{}条记录", group.site, group.partNo, inventoryList.size()); + // + // IfsInventoryPartInStock matchedStock = findMatchingStock(inventoryList, group); + // boolean failedFlag=false; + // if (matchedStock == null) { + // failedFlag=true; + // } + // + // + // if (matchedStock != null) { + // BigDecimal reservedQty = new BigDecimal(matchedStock.getQtyReserved()); + // if(reservedQty.compareTo(new BigDecimal(0))>0){ + // failedFlag=true; + // } + // } + // if(failedFlag){ + // log.warn("IFS移库同步失败 - 物料: {}, 批次: {}, 在库位:{}的库存被预留，无法移库", + // group.partNo, group.lotBatchNo,group.sourceLocationNo); + // // 记录到错误日志表 - rqrq + // ifsCallErrorLogService.logIfsError( + // group.site, + // "MoveInventoryPart", + // "库存移库（栈板）", + // group.partNo, + // group.lotBatchNo, + // group.sourceLocationNo, + // group.destLocationNo, + // group.totalQty, + // group.expiredDate, + // "ifs库存被预留或者查不到库存，无法移库", + // "ifs库存被预留或者查不到库存，无法移库", + // "ifs库存被预留或者查不到库存，无法移库" + // ); + // return; + // } //校验库存预留结束