bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购管理

This commit is contained in:
gaowdong 2025-07-16 16:12:47 +08:00
parent eba75aa851
commit b082bbd948
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanAdd.java
View File

@ -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审批拒绝)")

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanUpdate.java
View File

@ -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审批拒绝)")

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java
View File

@ -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) {