From b5d0f91d9569db30493d58b54bc38b5f5adbdb15 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, 27 May 2026 20:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=94=9F=E6=88=90=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=8F=B7;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StockReceiptOrder.java | 4 +++ .../repository/po/StockReceiptOrderPO.java | 4 +++ .../repository/todo/StockReceiptOrderDO.java | 4 +++ .../StockReceiptOrderDomainService.java | 29 +++++++++++++++++++ .../StockReceiptOrderDTO.java | 4 +++ 5 files changed, 45 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/entity/StockReceiptOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/entity/StockReceiptOrder.java index 47b651da7..a6b78dcc8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/entity/StockReceiptOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/entity/StockReceiptOrder.java @@ -160,5 +160,9 @@ public class StockReceiptOrder extends BaseVOEntity { @Excel(name = "业务单号") private String businessOrderNo; + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String batchNo; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java index fd149b881..754f6d99f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java @@ -190,4 +190,8 @@ public class StockReceiptOrderPO extends StockInOrderBasePO { @ApiModelProperty("业务单号") @Excel(name = "业务单号") private String businessOrderNo; + + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String batchNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java index 017330f15..2f59e0a66 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java @@ -196,4 +196,8 @@ public class StockReceiptOrderDO extends StockInOrderBaseDO { @ApiModelProperty("业务单号") @Excel(name = "业务单号") private String businessOrderNo; + + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String batchNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java index 28bf2a392..dffa26d7e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java @@ -85,6 +85,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Pattern; @@ -179,6 +180,34 @@ public class StockReceiptOrderDomainService { stockReceiptOrder.setUpdateBy(loginUser.getUserid()); stockReceiptOrder.setUpdateByName(userRealName); stockReceiptOrder.setUpdateTime(new Date()); + + // 查询当天创建的入库单数量,用于生成batchNo + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String todayStr = dateFormat.format(new Date()); + String todayStart = todayStr + " 00:00:00"; + String todayEnd = todayStr + " 23:59:59"; + SimpleDateFormat fullDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Date todayStartDate = null; + try { + todayStartDate = fullDateFormat.parse(todayStart); + } catch (ParseException e) { + throw new RuntimeException(e); + } + Date todayEndDate = null; + try { + todayEndDate = fullDateFormat.parse(todayEnd); + } catch (ParseException e) { + throw new RuntimeException(e); + } + + // 查询当天创建的入库单总数 + long todayStockInOrderCount = stockInOrderService.count(new LambdaQueryWrapper() + .ge(StockInOrder::getCreateTime, todayStartDate) + .le(StockInOrder::getCreateTime, todayEndDate) + .eq(StockInOrder::getDelFlag, 1)); + stockReceiptOrder.setBatchNo("PC"+stockReceiptOrder.getInOrderNumber()+"-"+todayStockInOrderCount); + stockReceiptOrderList.add(stockReceiptOrder); stockReceiptOrderDO.getMaterialDetailList().forEach(materialDetailDO -> { ReceiptMaterialDetail receiptMaterialDetail = new ReceiptMaterialDetail(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java index 230432704..553c71ddd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java @@ -167,4 +167,8 @@ public class StockReceiptOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty("业务单号") @Excel(name = "业务单号") private String businessOrderNo; + + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String batchNo; } \ No newline at end of file