From 3866bfee0509d886f806f412d193ef4b89907056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 12 Aug 2026 14:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8D=95=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=A4=84=E7=90=86;+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationStockInOrderDomainService.java | 104 ++++++-------- ...ReservationStockOutOrderDomainService.java | 110 ++++++--------- .../ReserveStockInOrderDomainService.java | 129 +++++++++--------- .../ReserveStockOutOrderDomainService.java | 107 ++++++--------- .../ReviewOrderApplicationService.java | 5 +- .../service/PickingOrderDomainService.java | 2 +- .../service/ReviewOrderDomainService.java | 5 +- .../service/StockInOrderDomainService.java | 6 +- .../service/StockOutOrderDomainService.java | 7 +- .../service/StockShelfOrderDomainService.java | 3 +- .../service/WaveOrderDomainService.java | 4 +- 11 files changed, 204 insertions(+), 278 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index d055e54b4..2283484da 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -147,44 +147,44 @@ public class ReservationStockInOrderDomainService { */ @Transactional(rollbackFor = Exception.class) public Boolean insert(ReservationStockInOrderDO stockInOrderDO) { -// if (stockInOrderDO.getInOrderNumber() == null) { + if (stockInOrderDO.getInOrderNumber() == null) { //设置入库单号 - Long warehouseId = stockInOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getInOrderNoPrefix(); - if (prefix == null || prefix.isEmpty()) { - prefix = "RK"; - } - Long organizationId = stockInOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockInOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = reserveStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(datePrefix + seq); - stockInOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = reserveStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(prefix + seq); - stockInOrderDO.setBusinessOrderNo(prefix + seq); - } +// Long warehouseId = stockInOrderDO.getWarehouseId(); +// AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); +// if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { +// throw new ServiceException("获取仓库信息失败"); +// } +// //仓库信息 +// WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); +// String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); +// String prefix = warehouseFeignPO.getInOrderNoPrefix(); +// if (prefix == null || prefix.isEmpty()) { +// prefix = "RK"; +// } +// Long organizationId = stockInOrderDO.getOrganizationId(); +// Long warehouseIdForCount = stockInOrderDO.getWarehouseId(); +// if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { +// //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 +// String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); +// String datePrefix = prefix + dateStr; +// List orderNumbers = reserveStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockInOrderDO.setInOrderNumber(datePrefix + seq); +// stockInOrderDO.setBusinessOrderNo(datePrefix + seq); +// } else { +// //历史累加: 前缀 + 历史最大序号+1 +// List orderNumbers = reserveStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockInOrderDO.setInOrderNumber(prefix + seq); +// stockInOrderDO.setBusinessOrderNo(prefix + seq); +// } -// stockInOrderDO.setInOrderNumber(generateReserveOrderNumber()); -// stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber()); -// } + stockInOrderDO.setInOrderNumber(generateReserveOrderNumber()); + stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber()); + } // //设置默认值 // setDefaultValues(stockInOrderDO); // //设置物料信息 @@ -213,37 +213,9 @@ public class ReservationStockInOrderDomainService { public Boolean batchInsert(List stockInOrderDOList) { for (ReservationStockInOrderDO stockInOrderDO : stockInOrderDOList){ - //设置入库单号 - Long warehouseId = stockInOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getInOrderNoPrefix(); - if (prefix == null || prefix.isEmpty()) { - prefix = "RK"; - } - Long organizationId = stockInOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockInOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = reserveStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(datePrefix + seq); - stockInOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = reserveStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(prefix + seq); - stockInOrderDO.setBusinessOrderNo(prefix + seq); + if (stockInOrderDO.getInOrderNumber() == null) { + stockInOrderDO.setInOrderNumber(generateReserveOrderNumber()); + stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber()); } // //设置物料信息 diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index 7462af1e1..91887172f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -157,42 +157,45 @@ public class ReservationStockOutOrderDomainService { */ @Transactional(rollbackFor = Exception.class) public Boolean insert(ReservationStockOutOrderDO stockOutOrderDO) { - + if (stockOutOrderDO.getOutOrderNumber() == null) { + stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber()); + stockOutOrderDO.setBusinessOrderNo(stockOutOrderDO.getOutOrderNumber()); + } //设置单号 - Long warehouseId = stockOutOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getOutOrderNoPrefix(); - if ("yang_pin_chu_ku".equals(stockOutOrderDO.getBusinessType())) { - prefix = warehouseFeignPO.getSampleOutOrderNoPrefix(); - } - if (prefix == null || prefix.isEmpty()) { - prefix = "CK"; - } - Long organizationId = stockOutOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockOutOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(datePrefix + seq); - stockOutOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(prefix + seq); - stockOutOrderDO.setBusinessOrderNo(prefix + seq); - } +// Long warehouseId = stockOutOrderDO.getWarehouseId(); +// AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); +// if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { +// throw new ServiceException("获取仓库信息失败"); +// } +// //仓库信息 +// WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); +// String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); +// String prefix = warehouseFeignPO.getOutOrderNoPrefix(); +// if ("yang_pin_chu_ku".equals(stockOutOrderDO.getBusinessType())) { +// prefix = warehouseFeignPO.getSampleOutOrderNoPrefix(); +// } +// if (prefix == null || prefix.isEmpty()) { +// prefix = "CK"; +// } +// Long organizationId = stockOutOrderDO.getOrganizationId(); +// Long warehouseIdForCount = stockOutOrderDO.getWarehouseId(); +// if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { +// //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 +// String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); +// String datePrefix = prefix + dateStr; +// List orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockOutOrderDO.setOutOrderNumber(datePrefix + seq); +// stockOutOrderDO.setBusinessOrderNo(datePrefix + seq); +// } else { +// //历史累加: 前缀 + 历史最大序号+1 +// List orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockOutOrderDO.setOutOrderNumber(prefix + seq); +// stockOutOrderDO.setBusinessOrderNo(prefix + seq); +// } // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity setMaterialDetailInfo(stockOutOrderDO); @@ -235,40 +238,9 @@ public class ReservationStockOutOrderDomainService { for (ReservationStockOutOrderDO stockOutOrderDO : stockOutOrderDOList){ - //设置单号 - Long warehouseId = stockOutOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getOutOrderNoPrefix(); - if ("yang_pin_chu_ku".equals(stockOutOrderDO.getBusinessType())) { - prefix = warehouseFeignPO.getSampleOutOrderNoPrefix(); - } - if (prefix == null || prefix.isEmpty()) { - prefix = "CK"; - } - Long organizationId = stockOutOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockOutOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(datePrefix + seq); - stockOutOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(prefix + seq); - stockOutOrderDO.setBusinessOrderNo(prefix + seq); + if (stockOutOrderDO.getOutOrderNumber() == null) { + stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber()); + stockOutOrderDO.setBusinessOrderNo(stockOutOrderDO.getOutOrderNumber()); } //设置物料信息 diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java index 83bfcf5a8..09f51e85f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java @@ -103,39 +103,40 @@ public class ReserveStockInOrderDomainService { */ @Transactional(rollbackFor = Exception.class) public Boolean insert(ReserveStockInOrderDO stockInOrderDO) { -// if (stockInOrderDO.getInOrderNumber() == null) { - Long warehouseId = stockInOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getInOrderNoPrefix(); - if (prefix == null || prefix.isEmpty()) { - prefix = "RK"; - } - Long organizationId = stockInOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockInOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(datePrefix + seq); - stockInOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(prefix + seq); - stockInOrderDO.setBusinessOrderNo(prefix + seq); - } + if (stockInOrderDO.getInOrderNumber() == null) { + stockInOrderDO.setInOrderNumber(generateReserveOrderNumber()); +// Long warehouseId = stockInOrderDO.getWarehouseId(); +// AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); +// if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { +// throw new ServiceException("获取仓库信息失败"); // } +// //仓库信息 +// WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); +// String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); +// String prefix = warehouseFeignPO.getInOrderNoPrefix(); +// if (prefix == null || prefix.isEmpty()) { +// prefix = "RK"; +// } +// Long organizationId = stockInOrderDO.getOrganizationId(); +// Long warehouseIdForCount = stockInOrderDO.getWarehouseId(); +// if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { +// //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 +// String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); +// String datePrefix = prefix + dateStr; +// List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockInOrderDO.setInOrderNumber(datePrefix + seq); +// stockInOrderDO.setBusinessOrderNo(datePrefix + seq); +// } else { +// //历史累加: 前缀 + 历史最大序号+1 +// List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockInOrderDO.setInOrderNumber(prefix + seq); +// stockInOrderDO.setBusinessOrderNo(prefix + seq); +// } + } // //设置默认值 // setDefaultValues(stockInOrderDO); // //设置物料信息 @@ -166,37 +167,41 @@ public class ReserveStockInOrderDomainService { */ public Boolean batchInsert(List stockInOrderDOList) { for (ReserveStockInOrderDO stockInOrderDO : stockInOrderDOList){ - Long warehouseId = stockInOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getInOrderNoPrefix(); - if (prefix == null || prefix.isEmpty()) { - prefix = "RK"; - } - Long organizationId = stockInOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockInOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(datePrefix + seq); - stockInOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockInOrderDO.setInOrderNumber(prefix + seq); - stockInOrderDO.setBusinessOrderNo(prefix + seq); + String inOrderNumber = stockInOrderDO.getInOrderNumber(); + if (stockInOrderDO.getInOrderNumber() == null){ + stockInOrderDO.setInOrderNumber(generateReserveOrderNumber()); } +// Long warehouseId = stockInOrderDO.getWarehouseId(); +// AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); +// if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { +// throw new ServiceException("获取仓库信息失败"); +// } +// //仓库信息 +// WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); +// String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); +// String prefix = warehouseFeignPO.getInOrderNoPrefix(); +// if (prefix == null || prefix.isEmpty()) { +// prefix = "RK"; +// } +// Long organizationId = stockInOrderDO.getOrganizationId(); +// Long warehouseIdForCount = stockInOrderDO.getWarehouseId(); +// if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { +// //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 +// String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); +// String datePrefix = prefix + dateStr; +// List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockInOrderDO.setInOrderNumber(datePrefix + seq); +// stockInOrderDO.setBusinessOrderNo(datePrefix + seq); +// } else { +// //历史累加: 前缀 + 历史最大序号+1 +// List orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockInOrderDO.setInOrderNumber(prefix + seq); +// stockInOrderDO.setBusinessOrderNo(prefix + seq); +// } // //设置物料信息 // setMaterialDetailInfo(stockInOrderDO); // //统计总物料种数 diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java index 36e893987..508e64d9b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java @@ -124,41 +124,44 @@ public class ReserveStockOutOrderDomainService { */ @Transactional(rollbackFor = Exception.class) public Boolean insert(ReserveStockOutOrderDO stockOutOrderDO) { + if (stockOutOrderDO.getOutOrderNumber() == null) { + stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber()); + } //设置单号 - Long warehouseId = stockOutOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getOutOrderNoPrefix(); - if ("yang_pin_chu_ku".equals(stockOutOrderDO.getBusinessType())) { - prefix = warehouseFeignPO.getSampleOutOrderNoPrefix(); - } - if (prefix == null || prefix.isEmpty()) { - prefix = "CK"; - } - Long organizationId = stockOutOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockOutOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(datePrefix + seq); - stockOutOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(prefix + seq); - stockOutOrderDO.setBusinessOrderNo(prefix + seq); - } +// Long warehouseId = stockOutOrderDO.getWarehouseId(); +// AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); +// if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { +// throw new ServiceException("获取仓库信息失败"); +// } +// //仓库信息 +// WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); +// String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); +// String prefix = warehouseFeignPO.getOutOrderNoPrefix(); +// if ("yang_pin_chu_ku".equals(stockOutOrderDO.getBusinessType())) { +// prefix = warehouseFeignPO.getSampleOutOrderNoPrefix(); +// } +// if (prefix == null || prefix.isEmpty()) { +// prefix = "CK"; +// } +// Long organizationId = stockOutOrderDO.getOrganizationId(); +// Long warehouseIdForCount = stockOutOrderDO.getWarehouseId(); +// if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { +// //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 +// String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); +// String datePrefix = prefix + dateStr; +// List orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockOutOrderDO.setOutOrderNumber(datePrefix + seq); +// stockOutOrderDO.setBusinessOrderNo(datePrefix + seq); +// } else { +// //历史累加: 前缀 + 历史最大序号+1 +// List orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); +// int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); +// String seq = String.format("%03d", maxSeq + 1); +// stockOutOrderDO.setOutOrderNumber(prefix + seq); +// stockOutOrderDO.setBusinessOrderNo(prefix + seq); +// } // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity @@ -188,40 +191,8 @@ public class ReserveStockOutOrderDomainService { @Transactional(rollbackFor = Exception.class) public Boolean batchInsert(List stockOutOrderDOList) { for (ReserveStockOutOrderDO stockOutOrderDO : stockOutOrderDOList){ - //设置单号 - Long warehouseId = stockOutOrderDO.getWarehouseId(); - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId); - if (!"200".equals(String.valueOf(ajaxResult.get("code")))) { - throw new ServiceException("获取仓库信息失败"); - } - //仓库信息 - WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class); - String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule(); - String prefix = warehouseFeignPO.getOutOrderNoPrefix(); - if ("yang_pin_chu_ku".equals(stockOutOrderDO.getBusinessType())) { - prefix = warehouseFeignPO.getSampleOutOrderNoPrefix(); - } - if (prefix == null || prefix.isEmpty()) { - prefix = "CK"; - } - Long organizationId = stockOutOrderDO.getOrganizationId(); - Long warehouseIdForCount = stockOutOrderDO.getWarehouseId(); - if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) { - //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1 - String dateStr = new SimpleDateFormat("yyMMdd").format(new Date()); - String datePrefix = prefix + dateStr; - List orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(datePrefix + seq); - stockOutOrderDO.setBusinessOrderNo(datePrefix + seq); - } else { - //历史累加: 前缀 + 历史最大序号+1 - List orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount); - int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length()); - String seq = String.format("%03d", maxSeq + 1); - stockOutOrderDO.setOutOrderNumber(prefix + seq); - stockOutOrderDO.setBusinessOrderNo(prefix + seq); + if (stockOutOrderDO.getOutOrderNumber() == null) { + stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber()); } //设置物料信息 setMaterialDetailInfo(stockOutOrderDO); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java index 8b805a8e7..3e6d14052 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java @@ -476,7 +476,8 @@ public class ReviewOrderApplicationService { handoverTaskOrderDO.setShipperId(stockOutOrderPO.getShipperId()); handoverTaskOrderDO.setShipperName(stockOutOrderPO.getShipperName()); handoverTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JJZYLS")); - handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY")); +// handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY")); + handoverTaskOrderDO.setTaskNumber("HD-"+stockOutOrderPO.getOutOrderNumber()); handoverTaskOrderDO.setStatus(1); handoverTaskOrderDO.setOrderTypeCode(stockOutOrderPO.getOrderTypeCode()); handoverTaskOrderDO.setOrderTypeName(stockOutOrderPO.getOrderTypeName()); @@ -1302,4 +1303,4 @@ public class ReviewOrderApplicationService { setter.accept(parsed); } } -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java index c69e8d428..d79187f09 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java @@ -870,7 +870,7 @@ public class PickingOrderDomainService { handoverTaskOrderDO.setShipperId(pickingOrderPO.getShipperId()); handoverTaskOrderDO.setShipperName(pickingOrderPO.getShipperName()); handoverTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JJZYLS")); - handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY")); + handoverTaskOrderDO.setTaskNumber("HD-"+pickingOrderPO.getOutOrderNumber()); handoverTaskOrderDO.setStatus(1); handoverTaskOrderDO.setOrderTypeCode(pickingOrderPO.getOrderTypeCode()); handoverTaskOrderDO.setOrderTypeName(pickingOrderPO.getOrderTypeName()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java index f2e8dd727..56ecf7782 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java @@ -115,7 +115,8 @@ public class ReviewOrderDomainService { Date now = new Date(); ReviewOrder header = new ReviewOrder(); - header.setReviewOrderNumber(reviewOrderNumber); +// header.setReviewOrderNumber(reviewOrderNumber); + header.setReviewOrderNumber("RE-"+stockOutOrder.getOutOrderNumber()); header.setOutOrderId(stockOutOrder.getOutOrderId()); header.setOutOrderNumber(stockOutOrder.getOutOrderNumber()); header.setOrganizationId(stockOutOrder.getOrganizationId()); @@ -329,4 +330,4 @@ public class ReviewOrderDomainService { } return loginUser.getUsername(); } -} +} \ No newline at end of file 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 6ccbb1036..05a15484b 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 @@ -771,7 +771,8 @@ public class StockInOrderDomainService { stockShelfOrder = list.get(0); } else { BeanUtils.copyProperties(stockReceiptOrder, stockShelfOrder); - stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ")); +// stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ")); + stockShelfOrder.setShelfOrderNumber("SH-"+inOrderNumber); stockShelfOrder.setBatchNo(batchNo); stockShelfOrderService.save(stockShelfOrder); } @@ -1040,7 +1041,8 @@ public class StockInOrderDomainService { stockInOrderPOList.forEach(p -> { StockReceiptOrderDO stockReceiptOrderDO = new StockReceiptOrderDO(); BeanUtils.copyProperties(p, stockReceiptOrderDO); - stockReceiptOrderDO.setReceiptOrderNumber(OrderSequence.getOrderCode("SH")); + stockReceiptOrderDO.setReceiptOrderNumber("RV-"+p.getInOrderNumber()); +// stockReceiptOrderDO.setReceiptOrderNumber(OrderSequence.getOrderCode("SH")); List inMaterialDetailPOs = inMaterialDetailListMap.get(p.getInOrderNumber()); if (!CollectionUtils.isEmpty(inMaterialDetailPOs)){ List receiptMaterialDetailDOList = new ArrayList<>(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index d25fac96d..427055070 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -896,7 +896,8 @@ public class StockOutOrderDomainService { PickingOrderDO pickingOrderDO = new PickingOrderDO(); BeanUtils.copyProperties(p, pickingOrderDO); pickingOrderDO.setOrderNumber(p.getOutOrderNumber()); - pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH")); +// pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH")); + pickingOrderDO.setPickingOrderNumber("PK-"+p.getOutOrderNumber()); pickingOrderDO.setQuantity(p.getAllocationQuantity()); if (pickingOrderDO.getWarehouseId() == null && p.getWarehouseId() != null) { pickingOrderDO.setWarehouseId(p.getWarehouseId()); @@ -1235,7 +1236,7 @@ public class StockOutOrderDomainService { PickingOrderDO pickingOrderDO = new PickingOrderDO(); BeanUtils.copyProperties(p, pickingOrderDO); pickingOrderDO.setOrderNumber(p.getOutOrderNumber()); - pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH")); + pickingOrderDO.setPickingOrderNumber("PK-"+p.getOutOrderNumber()); pickingOrderDO.setQuantity(p.getAllocationQuantity()); if (pickingOrderDO.getWarehouseId() == null && p.getWarehouseId() != null) { pickingOrderDO.setWarehouseId(p.getWarehouseId()); @@ -2151,7 +2152,7 @@ public class StockOutOrderDomainService { handoverTaskOrderDO.setShipperId(stockOutOrderPO.getShipperId()); handoverTaskOrderDO.setShipperName(stockOutOrderPO.getShipperName()); handoverTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JJZYLS")); - handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY")); + handoverTaskOrderDO.setTaskNumber("HD-"+stockOutOrderPO.getOutOrderNumber()); handoverTaskOrderDO.setStatus(1); handoverTaskOrderDO.setOrderTypeCode(stockOutOrderPO.getOrderTypeCode()); handoverTaskOrderDO.setOrderTypeName(stockOutOrderPO.getOrderTypeName()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index c9f97c0c7..bf0b3c47b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -187,7 +187,8 @@ public class StockShelfOrderDomainService { BeanUtils.copyProperties(stockShelfOrderDO, stockShelfOrder, "createBy","createByName","createTime", "updateBy","updateByName","updateTime"); if (StringUtils.isBlank(stockShelfOrder.getShelfOrderNumber())){ - stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ")); +// stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ")); + stockShelfOrder.setShelfOrderNumber("SH-"+stockShelfOrder.getInOrderNumber()); } // PDA收货完成=是否下发是(1)，PC收货完成/无单收货/整单收货=是否下发否(2)，DO未设置时默认2 stockShelfOrder.setTaskDistribution(stockShelfOrderDO.getTaskDistribution() != null ? stockShelfOrderDO.getTaskDistribution() : 2); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java index ab5ebd551..de1f6c560 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java @@ -211,7 +211,7 @@ public class WaveOrderDomainService { PickingOrderDO pickingOrderDO = new PickingOrderDO(); BeanUtils.copyProperties(p, pickingOrderDO); pickingOrderDO.setOrderNumber(p.getWaveOrderNumber()); - pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH")); + pickingOrderDO.setPickingOrderNumber("PK-"+p.getWaveOrderNumber()); pickingOrderDO.setQuantity(p.getAllocationQuantity()); pickingOrderDO.setWeightLimit(p.getWeightLimit()); pickingOrderDO.setVolumeLimit(p.getVolumeLimit()); @@ -329,4 +329,4 @@ public class WaveOrderDomainService { } return result; } -} +} \ No newline at end of file