From c2e2ef02d8ff533d5525c9da007e30b5aef2a383 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 15 Sep 2025 10:07:05 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ry_20240629.sql | 1 + .../java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java | 5 +++++ .../xkt/service/impl/StoreProductDemandServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index cab58290b..8eceee9aa 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -3583,6 +3583,7 @@ CREATE TABLE `store_product_demand_detail` ( `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '档口商品需求明细ID', `store_prod_demand_id` bigint UNSIGNED NOT NULL COMMENT '档口商品需求ID', + `store_factory_id` bigint UNSIGNED NOT NULL COMMENT '档口工厂ID', `store_prod_color_id` bigint UNSIGNED NOT NULL COMMENT '档口商品颜色ID', `store_color_id` bigint UNSIGNED NOT NULL COMMENT '档口颜色ID', `store_prod_id` bigint UNSIGNED NOT NULL COMMENT '档口商品ID', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java index 65d968f3c..f46caabae 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java @@ -39,6 +39,11 @@ public class StoreProductDemandDetail extends XktBaseEntity { @Excel(name = "档口商品需求ID") private Long storeProdDemandId; + /** + * 档口工厂ID + */ + private Long storeFactoryId; + /** * 档口商品颜色ID */ 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 aab52fdb8..ed5c8b610 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 @@ -167,7 +167,8 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService int count = this.storeProdDemandMapper.insert(demand); // 生产需求详情 List detailList = demandDTO.getDetailList().stream().map(x -> { - StoreProductDemandDetail detail = BeanUtil.toBean(x, StoreProductDemandDetail.class).setStoreId(demandDTO.getStoreId()) + StoreProductDemandDetail detail = BeanUtil.toBean(x, StoreProductDemandDetail.class) + .setStoreId(demandDTO.getStoreId()).setStoreFactoryId(demandDTO.getStoreFactoryId()) .setStoreProdDemandId(demand.getId()).setDetailStatus(DemandStatus.PENDING_PRODUCTION.getValue()); detail.setCreateBy(SecurityUtils.getUsername()); return detail;