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-01 17:16:30 +08:00
parent de396f3da4
commit 061a51a1aa
7 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/OrderGoods.java
View File

@ -76,7 +76,7 @@ public class OrderGoods extends BaseEntity {
/** 采购审批状态(1待审核,2审批中,3审批通过,4审批不通过) */
@Excel(name = "采购审批状态(1待审核,2审批中,3审批通过,4审批不通过)")
@ApiModelProperty(value = "采购审批状态(1待审核,2审批中,3审批通过,4审批不通过)")
private Long approveStatus;
private Integer approveStatus;
/** 审批流程id */
@Excel(name = "审批流程id")

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchaseContract.java
View File

@ -97,7 +97,7 @@ public class PurchaseContract extends BaseEntity {
/** 合同审批状态(1待审核,2审批中,3审批通过,4审批不通过) */
@Excel(name = "合同审批状态(1待审核,2审批中,3审批通过,4审批不通过)")
@ApiModelProperty(value = "合同审批状态(1待审核,2审批中,3审批通过,4审批不通过)")
private Long approveStatus;
private Integer approveStatus;
/** 审批流程id */
@Excel(name = "审批流程id")

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchasePlan.java
View File

@ -57,7 +57,7 @@ public class PurchasePlan extends BaseEntity {
/** 采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝) */
@Excel(name = "采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝)")
@ApiModelProperty(value = "采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝)")
private Long approveStatus;
private Integer approveStatus;
/** 审批流程id */
@Excel(name = "审批流程id")

32
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/constants/ApproveStatusEnum.java Normal file
View File

@ -0,0 +1,32 @@
package com.bonus.canteen.core.ims.domain.constants;
public enum ApproveStatusEnum {
WAIT_APPROVE(1, "待审批"),
IN_PROGRESS(2, "审批中"),
APPROVED(3, "审批通过"),
REJECTED(4, "审批拒绝");
private final Integer key;
private final String desc;
private ApproveStatusEnum(Integer key, String desc) {
this.key = key;
this.desc = desc;
}
public Integer getKey() {
return this.key;
}
public String getDesc() {
return this.desc;
}
public static String getDescByKey(Integer targetKey) {
for (ApproveStatusEnum approveStatusEnum : ApproveStatusEnum.values()) {
if (approveStatusEnum.getKey().equals(targetKey)) {
return approveStatusEnum.getDesc();
}
}
return "";
}
}

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

@ -6,6 +6,7 @@ import java.util.Objects;
import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.ims.domain.OrderGoodsDetail;
import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum;
import com.bonus.canteen.core.ims.domain.vo.OrderGoodsVO;
import com.bonus.canteen.core.ims.service.IOrderGoodsDetailService;
import com.bonus.canteen.core.ims.utils.NoGenerateUtils;
@ -91,6 +92,7 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService {
try {
String orderGoodsCode = NoGenerateUtils.generateOrderGoodsCode();
orderGoods.setOrderGoodsCode(orderGoodsCode);
orderGoods.setApproveStatus(ApproveStatusEnum.APPROVED.getKey());
int result = orderGoodsMapper.insertOrderGoods(orderGoods);
List<OrderGoodsDetail> orderGoodsDetails = orderGoods.getOrderGoodsDetailList();
if(CollUtil.isNotEmpty(orderGoodsDetails)) {

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

@ -7,6 +7,7 @@ import java.util.Objects;
import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.ims.domain.PurchaseContractDetail;
import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum;
import com.bonus.canteen.core.ims.domain.constants.PurchaseContractStatusEnum;
import com.bonus.canteen.core.ims.domain.vo.PurchaseContractVO;
import com.bonus.canteen.core.ims.service.IPurchaseContractDetailService;
@ -110,6 +111,7 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
try {
String contractCode = NoGenerateUtils.generateContractCode();
purchaseContract.setContractCode(contractCode);
purchaseContract.setApproveStatus(ApproveStatusEnum.APPROVED.getKey());
int result = purchaseContractMapper.insertPurchaseContract(purchaseContract);
List<PurchaseContractDetail> purchaseContractDetails = purchaseContract.getPurchaseContractDetailList();
if(CollUtil.isNotEmpty(purchaseContractDetails)) {

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

@ -9,6 +9,7 @@ import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.ims.domain.ImsUnit;
import com.bonus.canteen.core.ims.domain.PurchasePlanDetail;
import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum;
import com.bonus.canteen.core.ims.domain.vo.PurchasePlanVO;
import com.bonus.canteen.core.ims.service.IImsUnitService;
import com.bonus.canteen.core.ims.service.IPurchasePlanDetailService;
@ -121,6 +122,7 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService {
try {
String purchasePlanCode = generatePurchasePlanCode();
purchasePlan.setPlanCode(purchasePlanCode);
purchasePlan.setApproveStatus(ApproveStatusEnum.APPROVED.getKey());
int result = purchasePlanMapper.insertPurchasePlan(purchasePlan);
List<PurchasePlanDetail> purchasePlanDetails = purchasePlan.getPurchasePlanDetailList();
if(CollUtil.isNotEmpty(purchasePlanDetails)) {