楚江ERP:订货单-审核完善

@@ -12,6 +12,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.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private RedisHandler redisHandler;
     @Resource
     private ContractDistributorStandardService contractDistributorStandardService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
     /**
@@ -87,6 +90,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "STANDARD_CONTRACT":
                 handleStandardContractAuditData(flowStatus, businessId);
                 break;
+            case "PURCHASE_ORDER":
+                handlePurchaseOrderData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -136,6 +142,22 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     }
 
     /**
+     * 订货单业务数据处理
+     *
+     * @param businessId 业务ID
+     */
+    private void handlePurchaseOrderData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            purchaseOrderInfoService.updateStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            purchaseOrderInfoService.updateStatus(businessId, "REFUSE");
+        }
+    }
+
+    /**
      * 客户资信业务数据处理
      *
      * @param businessId 业务ID

@@ -7,7 +7,9 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.vo.customer.credit.*;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,6 +21,8 @@ public class FlowTaskServiceImpl implements FlowTaskService {
 
     @Resource
     private CustomerCreditService customerCreditService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
     @OpLog(type = OtherOpLogType.class, name = "修改客户资信，ID：{}", params = {"#id"})
@@ -39,4 +43,20 @@ public class FlowTaskServiceImpl implements FlowTaskService {
             e.printStackTrace();
         }
     }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改订货单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updatePurchaseOrderByMap(Map<String, Object> map) {
+        try {
+            // 创建 ObjectMapper 实例
+            ObjectMapper objectMapper = new ObjectMapper();
+            //先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
+            String json = objectMapper.writeValueAsString(map);
+            UpdatePurchaseOrderInfoVo updatePurchaseOrderInfoVo = JsonUtil.parseObject(json, UpdatePurchaseOrderInfoVo.class);
+            purchaseOrderInfoService.updateNoFlowInstance(updatePurchaseOrderInfoVo);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+    }
 }

@@ -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.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -25,20 +26,23 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collection;
 import java.util.List;
 
 @Service
 public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrderInfoMapper, PurchaseOrderInfo> implements PurchaseOrderInfoService {
+    private static final String BPM_FLAG = "PURCHASE_ORDER";
 
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
     @Resource
     private CustomerCreditService customerCreditService;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
     @Override
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
@@ -160,6 +164,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 purchaseOrderLineService.create(createPurchaseOrderLineVo);
             }
         }
+        //开启审核
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         return data.getId();
     }
@@ -193,7 +199,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
                 .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
                 .set(PurchaseOrderInfo::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
-                .set(PurchaseOrderInfo::getExamineStatus, StringUtil.isBlank(vo.getExamineStatus()) ? null : vo.getExamineStatus())
+                .set(PurchaseOrderInfo::getExamineStatus, "AUDIT")//审核中
                 .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(vo.getProductionProcess()) ? null : vo.getProductionProcess())
                 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
                 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
@@ -212,6 +218,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+        //开启审核
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "删除订货单表，ID：{}", params = {"#id"})
@@ -222,6 +230,66 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         getBaseMapper().deleteById(id);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "更新不走审核，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateNoFlowInstance(UpdatePurchaseOrderInfoVo vo) {
+        PurchaseOrderInfo data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("订货单表不存在！");
+        }
+
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo())
+                .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(vo.getExecutionStandard()) ? null : vo.getExecutionStandard())
+                .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus())
+                .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
+                .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader())
+                .set(PurchaseOrderInfo::getSurface, StringUtil.isBlank(vo.getSurface()) ? null : vo.getSurface())
+                .set(PurchaseOrderInfo::getTolerance, StringUtil.isBlank(vo.getTolerance()) ? null : vo.getTolerance())
+                .set(PurchaseOrderInfo::getPerformance, StringUtil.isBlank(vo.getPerformance()) ? null : vo.getPerformance())
+                .set(PurchaseOrderInfo::getElement, StringUtil.isBlank(vo.getElement()) ? null : vo.getElement())
+                .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
+                .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
+                .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(vo.getProductionProcess()) ? null : vo.getProductionProcess())
+                .eq(PurchaseOrderInfo::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        //更新订货单表物料行
+        List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList = vo.getUpdatePurchaseOrderLineVoList();
+        if (CollectionUtils.isNotEmpty(updatePurchaseOrderLineVoList)) {
+            for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : updatePurchaseOrderLineVoList) {
+                purchaseOrderLineService.update(updatePurchaseOrderLineVo);
+            }
+        }
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "更新审核状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        if ("PASS".equals(status)) {
+            LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                    .set(PurchaseOrderInfo::getExamineStatus, status)
+                    .set(PurchaseOrderInfo::getStatus, "ISSUED")//已下发
+                    .eq(PurchaseOrderInfo::getId, id);
+            getBaseMapper().update(updateWrapper);
+        } else {
+            LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                    .set(PurchaseOrderInfo::getExamineStatus, status)
+                    .eq(PurchaseOrderInfo::getId, id);
+            getBaseMapper().update(updateWrapper);
+        }
+    }
+
     @Override
     public void cleanCacheByKey(Serializable key) {
 

@@ -52,4 +52,19 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @return
      */
     void deleteById(String id);
+
+    /**
+     * 根据主键ID更新状态
+     *
+     * @param id     主键ID
+     * @param status 审核状态
+     */
+    void updateStatus(String id, String status);
+
+    /**
+     * 更新不走审核
+     *
+     * @param vo 更新数据
+     */
+    void updateNoFlowInstance(UpdatePurchaseOrderInfoVo vo);
 }