楚江ERP-订货单规格变更流程相关功能开发

@@ -15,10 +15,7 @@ import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
-import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
-import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
-import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
-import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeService;
+import com.lframework.xingyun.sc.service.order.*;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
@@ -63,6 +60,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private PurchaseOrderRevokeService purchaseOrderRevokeService;
     @Resource
     private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
+    @Resource
+    private OrderSpecificationChangeRecordService orderSpecificationChangeRecordService;
 
 
     /**
@@ -111,6 +110,12 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "ORDER_CANCELLATION":
                 handlePurchaseOrderRevokeData(flowStatus, businessId);
                 break;
+            case "SPEC_CHANGE_SUBMIT":
+                handleOrderSpecChangeData(flowStatus, businessId, true, true);
+                break;
+            case "SPEC_CHANGE_CONFIRM":
+                handleOrderSpecChangeData(flowStatus, businessId, null, false);
+                break;
             default:
                 break;
         }
@@ -291,4 +296,24 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         }
     }
 
+    /**
+     * 处理订货单规格变更相关数据
+     *
+     * @param flowStatus    审核结果
+     * @param businessId    业务ID
+     */
+    private void handleOrderSpecChangeData(String flowStatus, String businessId, Boolean output, boolean notice) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            orderSpecificationChangeRecordService.reviewPass(businessId);
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)) {
+            orderSpecificationChangeRecordService.reviewRefuse(businessId, output);
+            if (notice) {
+                // todo 消息通知
+            }
+        } else if (FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            orderSpecificationChangeRecordService.updateStatus(businessId, "REFUSE");
+        }
+    }
 }

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.order;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.entity.SysUser;
@@ -21,6 +22,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.vo.order.change.*;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.OrderSpecificationChangeRecordMapper;
@@ -35,12 +37,17 @@ import java.util.*;
 public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl<OrderSpecificationChangeRecordMapper, OrderSpecificationChangeRecord> implements OrderSpecificationChangeRecordService {
 
 
+    private static final String BPM_FLAG = "SPEC_CHANGE_SUBMIT";
+
+
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
     @Resource
     private SysUserService sysUserService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
 
     @Override
@@ -160,6 +167,8 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         purchaseOrderLineService.batchAdd(orderLineList);
         // 更新订货单规格变更状态
         purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
+        // 发起流程
+        flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", id, BPM_FLAG, data);
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
@@ -203,6 +212,14 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         }
         getBaseMapper().update(updateWrapper);
         purchaseOrderLineService.batchUpdate(orderLineList);
+        // 重新发起流程
+        JsonUtil.parseObject(JsonUtil.toJsonString(data), PurchaseOrderLine.class);
+        Boolean output = data.getOutput();
+        if (BooleanUtils.isTrue(output)) {
+            flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", vo.getId(), BPM_FLAG, data);
+        } else {
+            flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data);
+        }
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
@@ -234,9 +251,44 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         updateWrapper.set(OrderSpecificationChangeRecord::getStatus, status)
                 .eq(OrderSpecificationChangeRecord::getId, id);
         getBaseMapper().update(updateWrapper);
-        if (OrderSpecChangeStatus.CANCEL.getCode().equals(status)) {
+        if (OrderSpecChangeStatus.CANCEL.getCode().equals(status)
+                || OrderSpecChangeStatus.COMPLETED.getCode().equals(status)) {
             // 更新订货单规格变更状态
             purchaseOrderInfoService.updateSpecChangeStatus(record.getOrderId(), status);
         }
     }
+
+    @Override
+    public void reviewPass(String id) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        OrderSpecificationChangeRecord record = findById(id);
+        if (record == null) {
+            throw new DefaultClientException("规格变更记录不存在！");
+        }
+        // 更新状态
+        updateStatus(id, "PASS");
+        // 更新订货单规格数据
+        purchaseOrderLineService.updateByChangeId(id, record.getOrderId());
+    }
+
+    @Override
+    public void reviewRefuse(String id, Boolean output) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        OrderSpecificationChangeRecord record = findById(id);
+        if (record == null) {
+            throw new DefaultClientException("规格变更记录不存在！");
+        }
+        // 更新状态
+        LambdaUpdateWrapper<OrderSpecificationChangeRecord> updateWrapper = Wrappers.lambdaUpdate(OrderSpecificationChangeRecord.class);
+        updateWrapper.set(OrderSpecificationChangeRecord::getStatus, "REFUSE")
+                .eq(OrderSpecificationChangeRecord::getId, id);
+        if (output != null) {
+            updateWrapper.set(OrderSpecificationChangeRecord::getOutput, output);
+        }
+        getBaseMapper().update(updateWrapper);
+    }
 }

@@ -246,6 +246,19 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         getBaseMapper().batchUpdate(specList);
     }
 
+    /**
+     * 根据变更记录ID更新
+     *
+     * @param changeId   变更记录ID
+     */
+    @Override
+    public void updateByChangeId(String changeId, String orderId) {
+        if (StringUtil.isBlank(changeId)) {
+            return;
+        }
+        // todo 更新订货单规格数据
+    }
+
     @Override
     public void cleanCacheByKey(Serializable key) {
 

@@ -65,4 +65,18 @@ public interface OrderSpecificationChangeRecordService extends BaseMpService<Ord
      * @param status    状态
      */
     void updateStatus(String id, String status);
+
+    /**
+     * 审批通过
+     *
+     * @param id        主键ID
+     */
+    void reviewPass(String id);
+
+    /**
+     * 审批拒绝
+     *
+     * @param id        主键ID
+     */
+    void reviewRefuse(String id, Boolean output);
 }

@@ -93,4 +93,11 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
      * @param specList  数据集合
      */
     void batchUpdate(List<PurchaseOrderLine> specList);
+
+    /**
+     * 根据变更记录ID更新
+     *
+     * @param changeId   变更记录ID
+     */
+    void updateByChangeId(String changeId, String orderId);
 }