Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -455,6 +455,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
         }
 
         // todo ymk 锁规接口待完善
+        contractDistributorStandardService.specificationLock(vo);
 
         contractDistributorStandardService.cleanCacheByKey(vo.getId());
 

@@ -2,6 +2,8 @@ package com.lframework.xingyun.sc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
+
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -85,6 +87,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private String confirmationVoucherFileName;
 
     /**
+     * 撤销撤销数量总和（吨）（非持久化字段）
+     */
+    @TableField(exist = false)
+    private BigDecimal sumRevokeQuantity;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -6,6 +6,9 @@ import com.lframework.starter.bpm.service.BusinessDataHandlerService;
 import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.entity.CorePersonnelHistory;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
+import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
@@ -13,8 +16,13 @@ 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.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderRevokeLineVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -25,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +57,12 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private ContractDistributorStandardService contractDistributorStandardService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private PurchaseOrderRevokeService purchaseOrderRevokeService;
+    @Resource
+    private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
 
 
     /**
@@ -93,6 +108,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "PURCHASE_ORDER":
                 handlePurchaseOrderData(flowStatus, businessId);
                 break;
+            case "ORDER_CANCELLATION":
+                handlePurchaseOrderRevokeData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -158,6 +176,62 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     }
 
     /**
+     * 订货单撤销业务数据处理
+     *
+     * @param businessId 业务ID
+     */
+    private void handlePurchaseOrderRevokeData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            purchaseOrderRevokeService.updateStatus(businessId, "PASS");
+            //撤销单物料行
+            QueryPurchaseOrderRevokeLineVo vo = new QueryPurchaseOrderRevokeLineVo();
+            vo.setPurchaseOrderRevokeId(businessId);
+            List<PurchaseOrderRevokeLine> query = purchaseOrderRevokeLineService.query(vo);
+            PurchaseOrderRevoke revoke = purchaseOrderRevokeService.findById(businessId);
+            QueryPurchaseOrderLineVo vo1 = new QueryPurchaseOrderLineVo();
+            vo1.setPurchaseOrderId(revoke.getPurchaseOrderId());
+            List<PurchaseOrderLine> query1 = purchaseOrderLineService.query(vo1);
+            //更新订货单物料行数量
+            if (CollectionUtils.isNotEmpty(query)) {
+                //是否为全部撤销
+                Boolean b = true;
+                if (query.size() < query1.size()) {
+                    b = false;
+                }
+                for (PurchaseOrderRevokeLine purchaseOrderRevokeLine : query) {
+                    //原数量
+                    BigDecimal quantity = purchaseOrderRevokeLine.getQuantity();
+                    //撤销数量kg
+                    BigDecimal revokeQuantity = purchaseOrderRevokeLine.getRevokeQuantity();
+                    if (revokeQuantity == null) {
+                        revokeQuantity = BigDecimal.ZERO;
+                    }
+                    if (b && !(quantity != null && quantity.compareTo(revokeQuantity) == 0)) {
+                        b = false;
+                    }
+                    if (quantity != null) {
+                        BigDecimal result = quantity.subtract(revokeQuantity);
+                        purchaseOrderLineService.updateQuantity(purchaseOrderRevokeLine.getPurchaseOrderLineId(), result);
+                    }
+                }
+                //更新订货单撤销状态（部分撤销、全部撤销）
+                if (b) {
+                    //全部撤销
+                    purchaseOrderInfoService.updateRevokeStatus(revoke.getPurchaseOrderId(), "ALL");
+                } else {
+                    //部分撤销
+                    purchaseOrderInfoService.updateRevokeStatus(revoke.getPurchaseOrderId(), "PARTIAL");
+                }
+            }
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            purchaseOrderRevokeService.updateStatus(businessId, "REFUSE");
+        }
+    }
+
+    /**
      * 客户资信业务数据处理
      *
      * @param businessId 业务ID

@@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -558,6 +559,72 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
     }
 
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "合同锁规，ID：{}", params = {"#vo.id"})
+    @Transactional(rollbackFor = Exception.class)
+    public void specificationLock(UpdateContractDistributorStandardVo vo) {
+        ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同不存在！");
+        }
+
+        List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
+        if (CollectionUtils.isEmpty(lineVoList)) {
+            throw new DefaultClientException("合同行数据为空！");
+        }
+
+        Wrapper<ContractDistributorStandard> childWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .eq(ContractDistributorStandard::getParentId, vo.getId());
+
+        List<ContractDistributorStandard> childContractList = getBaseMapper().selectList(childWrapper);
+        BigDecimal allChildTotalQuantity = vo.getTotalQuantity().add(CollectionUtils.isEmpty(childContractList) ? new BigDecimal(0) : childContractList.get(0).getTotalQuantity());
+        if (allChildTotalQuantity.compareTo(data.getTotalQuantity()) > 0) {
+            throw new DefaultClientException("锁规总数量大于合同总数量，锁规失败！");
+        }
+
+        // 判断锁规是否完成（锁规两次或锁规数量等于合同数量）
+        boolean checkPriceSpecLocked = CollectionUtils.isNotEmpty(childContractList) || (allChildTotalQuantity.compareTo(data.getTotalQuantity()) == 0);
+
+        data.setId(IdUtil.getUUID());
+        data.setTotalQuantity(vo.getTotalQuantity());
+        data.setTotalAmountCapital(vo.getTotalAmountCapital());
+        data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
+        data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax());
+        data.setStatus("STANDARD");
+        data.setParentId(vo.getId());
+        getBaseMapper().insert(data);
+
+        Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
+                .eq(ContractDistributorLine::getContractId, vo.getId())
+                .orderByAsc(ContractDistributorLine::getShowOrder);
+        List<ContractDistributorLine> oldContractDistributorLineList = contractDistributorLineService.list(lineWrapper);
+        Map<String, ContractDistributorLine> contractDistributorLineMap = CollectionUtils.emptyIfNull(oldContractDistributorLineList)
+                .stream().collect(Collectors.toMap(ContractDistributorLine::getId, Function.identity()));
+
+        for (UpdateContractDistributorLineVo lineVo : lineVoList) {
+            ContractDistributorLine contractDistributorLine = contractDistributorLineMap.remove(lineVo.getId());
+            if (contractDistributorLine == null) {
+                throw new DefaultClientException("合同行数据不存在！");
+            }
+
+            contractDistributorLine.setId(IdUtil.getUUID());
+            contractDistributorLine.setContractId(data.getId());
+            contractDistributorLine.setQuantity(lineVo.getQuantity());
+            contractDistributorLine.setUnitPrice(lineVo.getUnitPrice());
+            contractDistributorLine.setAmountExcludingTax(lineVo.getAmountExcludingTax());
+            contractDistributorLine.setTotalAmount(lineVo.getTotalAmount());
+            contractDistributorLineService.getBaseMapper().insert(contractDistributorLine);
+        }
+
+        Wrapper<ContractDistributorStandard> changeLocked = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getPriceSpecLocked, checkPriceSpecLocked)
+                .eq(ContractDistributorStandard::getId, vo.getId());
+        getBaseMapper().update(changeLocked);
+
+        OpLogUtil.setVariable("id", vo.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -28,6 +28,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 
@@ -167,6 +168,26 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         OpLogUtil.setExtra(vo);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "修改订货单表物料行数量，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateQuantity(String id, BigDecimal quantity) {
+
+        PurchaseOrderLine data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("订货单表物料行不存在！");
+        }
+
+        LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class)
+                .set(PurchaseOrderLine::getQuantity, quantity)
+                .eq(PurchaseOrderLine::getId, id);
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除订货单表物料行，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -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.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -29,16 +30,21 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.util.List;
 
 @Service
 public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOrderRevokeMapper, PurchaseOrderRevoke> implements PurchaseOrderRevokeService {
+    private static final String BPM_FLAG = "ORDER_CANCELLATION";
 
     @Resource
     private PurchaseOrderRevokeLineService purchaseOrderRevokeLineService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
 
     @Override
@@ -108,6 +114,7 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         OpLogUtil.setExtra(vo);
 
         //新增订货单撤销表物料行
+        BigDecimal sumRevokeQuantity = BigDecimal.ZERO;
         if (CollectionUtil.isNotEmpty(vo.getPurchaseOrderRevokeLineList())) {
             List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList = vo.getPurchaseOrderRevokeLineList();
             for (PurchaseOrderRevokeLine purchaseOrderRevokeLine : purchaseOrderRevokeLineList) {
@@ -129,14 +136,25 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
                 vo1.setQuantity(purchaseOrderRevokeLine.getQuantity());
                 vo1.setSalesPrice(purchaseOrderRevokeLine.getSalesPrice());
                 vo1.setDeliveryDate(purchaseOrderRevokeLine.getDeliveryDate());
+                if (purchaseOrderRevokeLine.getRevokeQuantity() != null) {
+                    BigDecimal value = new BigDecimal(String.valueOf(purchaseOrderRevokeLine.getRevokeQuantity()));
+                    // 累加，注意要重新赋值
+                    sumRevokeQuantity = sumRevokeQuantity.add(value);
+                }
                 vo1.setRevokeQuantity(purchaseOrderRevokeLine.getRevokeQuantity());
                 vo1.setShowOrder(purchaseOrderRevokeLine.getShowOrder());
                 purchaseOrderRevokeLineService.create(vo1);
             }
         }
+        // 转换为吨：除以 1000
+        BigDecimal bigDecimal = sumRevokeQuantity.divide(new BigDecimal("1000"), 6, RoundingMode.HALF_UP);
+        data.setSumRevokeQuantity(bigDecimal);
         //更新订货单撤销状态为：撤销中
         purchaseOrderInfoService.updateRevokeStatus(vo.getPurchaseOrderId(), "UNDOING");
 
+        //开启审核
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+
         return data.getId();
     }
 
@@ -161,12 +179,23 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         getBaseMapper().update(updateWrapper);
 
         //撤销单物料行修改
+        BigDecimal sumRevokeQuantity = BigDecimal.ZERO;
         List<UpdatePurchaseOrderRevokeLineVo> voList = vo.getUpdatePurchaseOrderRevokeLineVoList();
         if (CollectionUtil.isNotEmpty(voList)) {
             for (UpdatePurchaseOrderRevokeLineVo vo1 : voList) {
+                if (vo1.getRevokeQuantity() != null) {
+                    BigDecimal value = new BigDecimal(String.valueOf(vo1.getRevokeQuantity()));
+                    // 累加，注意要重新赋值
+                    sumRevokeQuantity = sumRevokeQuantity.add(value);
+                }
                 purchaseOrderRevokeLineService.update(vo1);
             }
         }
+        // 转换为吨：除以 1000
+        BigDecimal bigDecimal = sumRevokeQuantity.divide(new BigDecimal("1000"), 6, RoundingMode.HALF_UP);
+        data.setSumRevokeQuantity(bigDecimal);
+        //开启审核
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);

@@ -88,4 +88,11 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      */
     void stockContractPriceLock(UpdateContractDistributorStandardVo vo);
 
+    /**
+     * 锁规
+     *
+     * @param vo
+     */
+    void specificationLock(UpdateContractDistributorStandardVo vo);
+
 }
\ No newline at end of file

@@ -6,6 +6,8 @@ import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -47,6 +49,14 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
     void update(UpdatePurchaseOrderLineVo vo);
 
     /**
+     * 修改数量
+     *
+     * @param id       主建
+     * @param quantity 数量
+     */
+    void updateQuantity(String id, BigDecimal quantity);
+
+    /**
      * 根据ID删除
      * @param id
      * @return