|
@@ -1,7 +1,6 @@
|
|
|
package com.sd.business.flow;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.fjhx.flow.core.FlowDelegate;
|
|
|
import com.fjhx.flow.enums.FlowStatusEnum;
|
|
|
import com.ruoyi.common.core.domain.BaseIdPo;
|
|
@@ -64,10 +63,11 @@ public class PurchaseFlow extends FlowDelegate {
|
|
|
|
|
|
@Override
|
|
|
public void end(Long flowId, Long businessId, JSONObject submitData) {
|
|
|
+
|
|
|
+ // 修改采购暂存表的数据
|
|
|
Purchase purchase = purchaseService.getById(businessId);
|
|
|
purchase.setFlowStatus(FlowStatusEnum.PASS.getKey());
|
|
|
purchase.setFlowId(flowId);
|
|
|
- // 修改采购暂存表的数据
|
|
|
purchaseService.updateById(purchase);
|
|
|
|
|
|
// 修改申购表的状态为已申购
|
|
@@ -77,12 +77,11 @@ public class PurchaseFlow extends FlowDelegate {
|
|
|
applyBuyService.updateById(applyBuy);
|
|
|
|
|
|
// 查询采购合同bom表的信息
|
|
|
- List<PurchaseBom> purchaseBoms = purchaseBomService.list(Wrappers.<PurchaseBom>lambdaQuery().eq(PurchaseBom::getPurchaseId, businessId));
|
|
|
-
|
|
|
+ List<PurchaseBom> purchaseBomList = purchaseBomService.list(q -> q.eq(PurchaseBom::getPurchaseId, businessId));
|
|
|
List<ApplyBuyBom> applyBuyBomList = new ArrayList<>();
|
|
|
|
|
|
// 修改申购bom表的采购数量
|
|
|
- for (PurchaseBom purchaseBom : purchaseBoms) {
|
|
|
+ for (PurchaseBom purchaseBom : purchaseBomList) {
|
|
|
ApplyBuyBom applyBuyBom = new ApplyBuyBom();
|
|
|
applyBuyBom.setPurchaseQuantity(purchaseBom.getPurchaseQuantity());
|
|
|
applyBuyBom.setId(purchaseBom.getApplyBuyBomId());
|