From b18fa5938a1906af15de00967449d645bc51a1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 7 Aug 2026 17:13:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=93=81=E5=87=BA=E5=BA=93=E4=B8=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandoverTaskOrderDomainService.java | 27 +++++++++++++---- .../persistence/OutMaterialDetailImpl.java | 30 ++++++++++++++++--- .../service/StockInOrderDomainService.java | 7 ++++- 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index 1d409b159..8149ebd48 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -295,7 +295,14 @@ public class HandoverTaskOrderDomainService { xgkc(handoverTaskOrderIds,loginUser); //推送oms for (Long handoverTaskOrderId : handoverTaskOrderIds) { - pushOms(handoverTaskOrderId); + HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getById(handoverTaskOrderId); + String orderNumber = handoverTaskOrder.getOrderNumber(); + StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() + .eq(StockOutOrder::getOutOrderNumber, orderNumber) + .eq(StockOutOrder::getDelFlag, 1), false); + if (stockOutOrder != null && !"yang_pin_chu_ku".equals(stockOutOrder.getBusinessType())) { + pushOms(handoverTaskOrderId); + } } HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getById(handoverTaskOrderIds.get(0)); stockOutOrderService.update(null,new UpdateWrapper().lambda().set(StockOutOrder::getBillingJson,handoverTaskOrderDO.getBillingJson()).eq(StockOutOrder::getOutOrderNumber,handoverTaskOrder.getOrderNumber())); @@ -443,14 +450,24 @@ public class HandoverTaskOrderDomainService { materialInventoryParamDO.setExpiryDate(materialInventoryPO.getExpiryDate()); materialInventoryParamDO.setType("4"); materialInventoryParamDO.setWarehouseId(materialInventoryPO.getWarehouseId()); - materialInventoryService.kctzjl(materialInventoryParamDO,"出库",loginUser); - materialInventoryService.xgkc(materialInventoryParamDO); + + //样品出库不修改库存 MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO); materialInventoryOmsParamDO.setKctzType("出库"); materialInventoryOmsParamDO.setLoginUser(loginUser); - //库存推送oms - omsServiceFeign.omsEdit(materialInventoryOmsParamDO); + HandoverTaskOrder h = handoverTaskOrderService.getById(handoverTaskOrderId); + String number = h.getOrderNumber(); + StockOutOrder out = stockOutOrderService.getOne(new LambdaQueryWrapper() + .eq(StockOutOrder::getOutOrderNumber, number) + .eq(StockOutOrder::getDelFlag, 1), false); + if (out != null && !"yang_pin_chu_ku".equals(out.getBusinessType())) { + materialInventoryService.kctzjl(materialInventoryParamDO,"出库",loginUser); + materialInventoryService.xgkc(materialInventoryParamDO); + //库存推送oms + omsServiceFeign.omsEdit(materialInventoryOmsParamDO); + } + //库存调整记录 // InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord(); // inventoryAdjustmentRecord.setAdjustAction("出库"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 1cbe42c5e..e1b93136d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -397,7 +397,12 @@ public class OutMaterialDetailImpl extends ServiceImpl stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1)); + if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) { + xgkc(outMaterialDetailList,outOrderNumber,loginUser); + } //保存物料明细信息 outMaterialDetailList.forEach(outMaterialDetail -> { outMaterialDetail.setIsAllocated("1"); @@ -527,7 +532,12 @@ public class OutMaterialDetailImpl extends ServiceImpl stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1)); + if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) { + qxfp(outMaterialDetailDOList,outOrderNumber,loginUser); + } return stockOutOrderPO; } @@ -965,7 +975,14 @@ public class OutMaterialDetailImpl extends ServiceImpl stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1)); + if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) { + qxfp(outMaterialDetailDOList,outOrderNumber,loginUser); + } + return stockOutOrderPO; } @@ -1068,7 +1085,12 @@ public class OutMaterialDetailImpl extends ServiceImpl children = outMaterialDetail.getChildren(); if (!CollectionUtils.isEmpty(children)) { - childrenqxfp(children,outOrderNumber,loginUser); + List stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1)); + if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) { + childrenqxfp(children,outOrderNumber,loginUser); + } } } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index b23d4bbcc..b88b1710a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -127,7 +127,12 @@ public class StockInOrderDomainService { public List querySignatureList(StockInOrderDO stockInOrderDO) { // 入库签名列表固定按「已入库」状态过滤 if (stockInOrderDO.getStatus() == null) { - stockInOrderDO.setStatus(5); +// stockInOrderDO.setStatus(5); + List list = new ArrayList<>(); + list.add(3); + list.add(4); + list.add(5); + stockInOrderDO.setStatusList(list); } // 委托给 queryList，复用 selectStockInOrderPo1 中现有的查询条件（包括新加的 workUserNameLike、signatureStatus） return stockInOrderService.queryList(stockInOrderDO);