|
@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.sd.business.entity.apply.po.ApplyBuy;
|
|
|
import com.sd.business.entity.apply.po.ApplyBuyBom;
|
|
|
import com.sd.business.entity.purchase.dto.PurchaseDto;
|
|
|
-import com.sd.business.entity.purchase.enums.PurchaseEnums;
|
|
|
import com.sd.business.entity.purchase.po.Purchase;
|
|
|
import com.sd.business.entity.purchase.po.PurchaseBom;
|
|
|
import com.sd.business.service.apply.ApplyBuyBomService;
|
|
@@ -51,7 +50,7 @@ public class PurchaseFlow extends FlowDelegate {
|
|
|
public Long start(Long flowId, JSONObject submitData) {
|
|
|
|
|
|
PurchaseDto purchase = submitData.toJavaObject(PurchaseDto.class);
|
|
|
- purchase.setFlowStatus(PurchaseEnums.IN_PROGRESS.getKey());
|
|
|
+ purchase.setFlowStatus(FlowStatusEnum.IN_PROGRESS.getKey());
|
|
|
purchase.setFlowId(flowId);
|
|
|
|
|
|
if (purchase.getId() == null) {
|
|
@@ -66,7 +65,7 @@ public class PurchaseFlow extends FlowDelegate {
|
|
|
@Override
|
|
|
public void end(Long flowId, Long businessId, JSONObject submitData) {
|
|
|
Purchase purchase = purchaseService.getById(businessId);
|
|
|
- purchase.setFlowStatus(PurchaseEnums.PASSED.getKey());
|
|
|
+ purchase.setFlowStatus(FlowStatusEnum.PASS.getKey());
|
|
|
purchase.setFlowId(flowId);
|
|
|
// 修改采购暂存表的数据
|
|
|
purchaseService.updateById(purchase);
|