From c17e2e932a418c6aa24b1a95e74ef1e91bf29371 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 22 Oct 2025 19:34:06 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=94=9F=E4=BA=A7=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA=E8=B0=83=E4=BC=98?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/storeProductDemand/StoreProdDemandExportVO.java | 2 ++ .../xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java | 2 ++ .../ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java index 06605e857..ed13af6f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java @@ -20,6 +20,8 @@ public class StoreProdDemandExportVO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空") private Long storeId; + @ApiModelProperty(value = "需求状态 1 待生产 2 生产中 3 生产完成") + private Integer detailStatus; @ApiModelProperty(value = "档口需求明细ID") private List storeProdDemandDetailIdList; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java index a43e1b01e..270a11894 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java @@ -16,6 +16,8 @@ public class StoreProdDemandExportDTO { @ApiModelProperty(value = "档口ID") private Long storeId; + @ApiModelProperty(value = "需求状态 1 待生产 2 生产中 3 生产完成") + private Integer detailStatus; @ApiModelProperty(value = "档口需求明细ID") private List storeProdDemandDetailIdList; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java index 01539c702..a6efc9e7c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java @@ -406,6 +406,9 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService if (CollectionUtils.isNotEmpty(exportDTO.getStoreProdDemandDetailIdList())) { queryWrapper.in(StoreProductDemandDetail::getId, exportDTO.getStoreProdDemandDetailIdList()); } + if (ObjectUtils.isNotEmpty(exportDTO.getDetailStatus())) { + queryWrapper.eq(StoreProductDemandDetail::getDetailStatus, exportDTO.getDetailStatus()); + } List demandDetailList = this.storeProdDemandDetailMapper.selectList(queryWrapper); if (CollectionUtils.isEmpty(demandDetailList)) { return new ArrayList<>();