From b082bbd94826fc19bfed03c6ca728080278efc43 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Wed, 16 Jul 2025 16:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/ims/domain/param/PurchasePlanAdd.java | 9 ++++----- .../core/ims/domain/param/PurchasePlanUpdate.java | 3 +-- .../core/ims/service/impl/PurchasePlanServiceImpl.java | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanAdd.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanAdd.java index a4d2ceb..fb198f0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanAdd.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanAdd.java @@ -25,6 +25,10 @@ import java.util.List; public class PurchasePlanAdd implements Serializable { private static final long serialVersionUID = 1L; + @Excel(name = "生产计划Id,逗号分隔存储") + @ApiModelProperty(value = "生产计划Id,逗号分隔存储") + private String productionPlanId; + /** 采购计划状态(1-待发布,2-已发布) */ @Excel(name = "采购计划状态(1-待发布,2-已发布)") @ApiModelProperty(value = "采购计划状态(1-待发布,2-已发布)") @@ -41,11 +45,6 @@ public class PurchasePlanAdd implements Serializable { @ApiModelProperty(value = "采购员id") private Long purchaseUserId; - /** 采购计划Id,逗号分隔存储 */ - @Excel(name = "生产计划编号,逗号分隔存储") - @ApiModelProperty(value = "生产计划编号,逗号分隔存储") - private String productionPlanCode; - /** 采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝) */ @Excel(name = "采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝)") @ApiModelProperty(value = "采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝)") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanUpdate.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanUpdate.java index 6d7e970..4401693 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanUpdate.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanUpdate.java @@ -1,7 +1,6 @@ package com.bonus.canteen.core.ims.domain.param; import com.bonus.common.core.annotation.Excel; -import com.bonus.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -47,7 +46,7 @@ public class PurchasePlanUpdate implements Serializable { /** 采购计划Id,逗号分隔存储 */ @Excel(name = "采购计划Id,逗号分隔存储") @ApiModelProperty(value = "采购计划Id,逗号分隔存储") - private String productionPlanCode; + private String productionPlanId; /** 采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝) */ @Excel(name = "采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝)") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java index d30cc70..0c19975 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java @@ -165,7 +165,7 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService { inspectGoodsDetailService.insertPurchasePlanDetail(purchasePlanDetail); } } - String productionPlanCodeStr = purchasePlanAdd.getProductionPlanCode(); + String productionPlanCodeStr = purchasePlanAdd.getProductionPlanId(); if(StringUtils.isNotBlank(productionPlanCodeStr)) { String[] productionPlanCodes = productionPlanCodeStr.split(","); for(String productionPlanCode : productionPlanCodes) { @@ -220,7 +220,7 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService { ProductionPurchaseOrder productionPurchaseOrderQuery = new ProductionPurchaseOrder(); productionPurchaseOrderQuery.setPurchasePlanId(purchasePlanVO.getPlanCode()); productionPurchaseOrderService.deleteProductionPurchaseOrderById(productionPurchaseOrderQuery); - String productionPlanCodeStr = purchasePlanUpdate.getProductionPlanCode(); + String productionPlanCodeStr = purchasePlanUpdate.getProductionPlanId(); if(StringUtils.isNotBlank(productionPlanCodeStr)) { String[] productionPlanCodes = productionPlanCodeStr.split(","); for(String productionPlanCode : productionPlanCodes) {