编码更换

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRunningWater.java

@@ -43,6 +43,11 @@ public class AccountRunningWater extends BasePo {
     private BigDecimal amount;
 
     /**
+     * 已认领总金额
+     */
+    private BigDecimal claimAmount;
+
+    /**
      * 币种（字典account_currency）
      */
     @NotBlank(message = "币种不能为null")

hx-common/src/main/java/com/fjhx/common/enums/CodingRuleEnum.java

@@ -31,10 +31,93 @@ public enum CodingRuleEnum {
      */
     CONTRACT("contract", "外销合同", Arrays.asList(
             getDefaultRule(RuleTypeEnum.CUSTOMIZE, "SC-"),
-            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * 样品单
+     */
+    SAMPLE("sample", "样品单", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "YP-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * EHSD采购编码
+     */
+    EHSD_PURCHASE("ehsd_purchase", "EHSD采购单", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PO-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * 报价单
+     */
+    SALE_QUOTATION("sale_quotation", "报价单", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "GSQT-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * 包装
+     */
+    PACK("pack", "包装", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PACK-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * 采购编码
+     */
+    PURCHASE("purchase", "采购单", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "SC-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
 
+    /**
+     * 服务合同
+     */
+    SERVICE_CONTRACT("service_contract", "服务合同", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PO-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+
+    //---------------------------采购模块-----------------------------
+
+    /**
+     * 申购单
+     */
+    SUBSCRIBE("subscribe", "申购单", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PR-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * 到货
+     */
+    ARRIVAL("arrival", "到货", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PA-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * 质检
+     */
+    QUALITY("quality", "质检", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "ZJ-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    /**
+     * 退货
+     */
+    SALES_RETURN("sales_return", "退货", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "TH-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
     ;
 
     /**

hx-purchase/src/main/java/com/fjhx/purchase/flow/SalesReturnFlow.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.sales.enums.SalesReturnDetailStatusEnum;
 import com.fjhx.purchase.entity.sales.enums.SalesReturnStatusEnum;
@@ -41,6 +43,9 @@ public class SalesReturnFlow extends FlowDelegate {
     @Autowired
     StockWaitDetailsService stockWaitDetailsService;
 
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public String getFlowKey() {
         return "sales_return_flow";
@@ -59,7 +64,8 @@ public class SalesReturnFlow extends FlowDelegate {
         SalesReturnService salesReturnService = SpringUtil.getBean(SalesReturnService.class);
         SalesReturnDetailService salesReturnDetailService = SpringUtil.getBean(SalesReturnDetailService.class);
         SalesReturn salesReturn = submitData.toJavaObject(SalesReturn.class);
-        salesReturn.setCode(CodeEnum.SALES_RETURN.getCode());
+//        salesReturn.setCode(CodeEnum.SALES_RETURN.getCode());
+        salesReturn.setCode(codingRuleService.createCode(CodingRuleEnum.SALES_RETURN.getKey(),null));
         salesReturnService.save(salesReturn);
         List<SalesReturnDetail> salesReturnDetailList = salesReturn.getSalesReturnDetailList();
         if (CollectionUtils.isNotEmpty(salesReturnDetailList)) {

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeDetailStatusEnum;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
@@ -16,6 +18,7 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -29,6 +32,9 @@ import java.util.List;
 @Component
 public class SubscribeFlow extends FlowDelegate {
 
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public String getFlowKey() {
         return "subscribe_flow";
@@ -46,7 +52,8 @@ public class SubscribeFlow extends FlowDelegate {
         SubscribeService subscribeService = SpringUtil.getBean(SubscribeService.class);
         SubscribeDetailService subscribeDetailService = SpringUtil.getBean(SubscribeDetailService.class);
         Subscribe subscribe = submitData.toJavaObject(Subscribe.class);
-        subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
+//        subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
+        subscribe.setCode(codingRuleService.createCode(CodingRuleEnum.SUBSCRIBE.getKey(),null));
         subscribe.setSubcribeStatus(SubscribeStatusEnum.UNDER_REVIEW.getKey());
         subscribe.setFlowId(flowId);
         subscribeService.save(subscribe);

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlowByWdly.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeDetailStatusEnum;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
@@ -31,6 +33,9 @@ import java.util.List;
 public class SubscribeFlowByWdly extends FlowDelegate {
 
     @Autowired
+    private CodingRuleService codingRuleService;
+
+    @Autowired
     private SubscribeFlow subscribeFlow;
 
     @Override
@@ -50,7 +55,8 @@ public class SubscribeFlowByWdly extends FlowDelegate {
         SubscribeService subscribeService = SpringUtil.getBean(SubscribeService.class);
         SubscribeDetailService subscribeDetailService = SpringUtil.getBean(SubscribeDetailService.class);
         Subscribe subscribe = submitData.toJavaObject(Subscribe.class);
-        subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
+//        subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
+        subscribe.setCode(codingRuleService.createCode(CodingRuleEnum.SUBSCRIBE.getKey(),null));
         subscribe.setProcessInstanceId("wdly_apply_purchase");
         subscribe.setFlowId(flowId);
         subscribe.setSubcribeStatus(SubscribeStatusEnum.UNDER_REVIEW.getKey());

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.kd100.entity.company.po.CompanyInfo;
 import com.fjhx.kd100.service.company.CompanyInfoService;
 import com.fjhx.purchase.entity.arrival.dto.ArrivalDto;
@@ -75,15 +77,22 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
 
     @Autowired
     private WdlyService wdlyService;
+
     @Autowired
-    SubscribeDetailService subscribeDetailService;
+    private SubscribeDetailService subscribeDetailService;
+
     @Autowired
-    SubscribeService subscribeService;
+    private SubscribeService subscribeService;
+
     @Autowired
-    PurchaseDetailService purchaseDetailService;
+    private PurchaseDetailService purchaseDetailService;
+
     @Autowired
     private CompanyInfoService companyInfoService;
 
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public Page<ArrivalVo> getPage(ArrivalSelectDto dto) {
         IWrapper<Arrival> wrapper = getWrapper();
@@ -107,7 +116,8 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
     @DSTransactional
     @Override
     public void add(Arrival arrival) {
-        arrival.setCode(CodeEnum.ARRIVAL.getCode());
+        arrival.setCode(codingRuleService.createCode(CodingRuleEnum.ARRIVAL.getKey(),null));
+//        arrival.setCode(CodeEnum.ARRIVAL.getCode());
         this.save(arrival);
         //修改采购状态
         Purchase purchase = new Purchase();
@@ -155,7 +165,8 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
     @DSTransactional
     @Override
     public void addByWdly(Arrival arrival) {
-        arrival.setCode(CodeEnum.ARRIVAL.getCode());
+        arrival.setCode(codingRuleService.createCode(CodingRuleEnum.ARRIVAL.getKey(),null));
+//        arrival.setCode(CodeEnum.ARRIVAL.getCode());
         arrival.setStatus(1);//设置到货
         this.save(arrival);
 

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
@@ -89,11 +91,17 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
 
     @Autowired
     private CustomerService customerService;
+
     @Autowired
     WarehouseService warehouseService;
+
     @Autowired
     ArrivalService arrivalService;
 
+
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     /**
      * 列表
      *
@@ -265,7 +273,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
     public void add(Purchase purchase) {
         PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);
         PurchaseDetailService purchaseDetailService = SpringUtil.getBean(PurchaseDetailService.class);
-        purchase.setCode(CodeEnum.PURCHASE.getCode());
+//        purchase.setCode(CodeEnum.PURCHASE.getCode());
+        purchase.setCode(codingRuleService.createCode(CodingRuleEnum.PURCHASE.getKey(),null));
         purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
         purchaseService.save(purchase);
         if (CollectionUtils.isNotEmpty(purchase.getPurchaseDetailList())) {

hx-purchase/src/main/java/com/fjhx/purchase/service/quality/impl/QualityServiceImpl.java

@@ -3,6 +3,8 @@ package com.fjhx.purchase.service.quality.impl;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.purchase.entity.arrival.enums.ArrivalDetailStatusEnum;
 import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.quality.po.Quality;
@@ -47,6 +49,10 @@ public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> impl
     @Autowired
     private ArrivalDetailService arrivalDetailService;
 
+
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public Page<QualityVo> getPage(QualitySelectDto dto) {
         IWrapper<Quality> wrapper = getWrapper();
@@ -69,7 +75,8 @@ public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void add(Quality quality) {
-        quality.setCode(CodeEnum.QUALITY.getCode());
+//        quality.setCode(CodeEnum.QUALITY.getCode());
+        quality.setCode(codingRuleService.createCode(CodingRuleEnum.QUALITY.getKey(),null));
         this.save(quality);
         List<QualityDetail> qualityDetailList = quality.getQualityDetailList();
         if(CollectionUtils.isNotEmpty(qualityDetailList)){

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeServiceImpl.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.subscribe.dto.SubscribeDto;
@@ -55,6 +57,10 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
     @Autowired
     WarehouseService warehouseService;
 
+    @Autowired
+    private CodingRuleService codingRuleService;
+
+
     @Override
     public Page<SubscribeVo> getPage(SubscribeSelectDto dto) {
         IWrapper<Subscribe> wrapper = getWrapper();
@@ -124,7 +130,8 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
     public void add(Subscribe subscribe) {
         SubscribeService subscribeService = SpringUtil.getBean(SubscribeService.class);
         SubscribeDetailService subscribeDetailService = SpringUtil.getBean(SubscribeDetailService.class);
-        subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
+//        subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
+        subscribe.setCode(codingRuleService.createCode(CodingRuleEnum.SUBSCRIBE.getKey(),null));
         subscribeService.save(subscribe);
         List<SubscribeDetail> SubscribeDetails = subscribe.getSubscribeDetailList();
         if (CollectionUtils.isNotEmpty(SubscribeDetails)) {

hx-sale/src/main/java/com/fjhx/sale/flow/EhsdPurchaseFlow.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
 import com.fjhx.sale.entity.purchase.po.*;
 import com.fjhx.sale.service.purchase.*;
@@ -62,6 +64,8 @@ public class EhsdPurchaseFlow extends FlowDelegate {
     @Autowired
     private SampleProductService sampleProductService;
 
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     @Override
     public String getFlowKey() {
@@ -83,8 +87,8 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         purchase.setSellCityId(purchase.getCityId());
         purchase.setSellCountryId(purchase.getCountryId());
         purchase.setSellProvinceId(purchase.getProvinceId());
-
-        purchase.setCode(CodeEnum.PURCHASE.getCode());
+        purchase.setCode(codingRuleService.createCode(CodingRuleEnum.EHSD_PURCHASE.getKey(),null));
+//        purchase.setCode(CodeEnum.PURCHASE.getCode());
         purchase.setStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
         purchase.setUserName(SecurityUtils.getUsername());
         purchaseService.save(purchase);

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
@@ -51,6 +53,9 @@ public class PurchaseFlow extends FlowDelegate {
     @Autowired
     private ContractProductService contractProductService;
 
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public String getFlowKey() {
         return "purchase_flow";
@@ -66,7 +71,8 @@ public class PurchaseFlow extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
         DynamicDataSourceContextHolder.push(SourceConstant.PURCHASE);
         Purchase purchase = submitData.toJavaObject(Purchase.class);
-        purchase.setCode(CodeEnum.PURCHASE.getCode());
+//        purchase.setCode(CodeEnum.PURCHASE.getCode());
+        purchase.setCode(codingRuleService.createCode(CodingRuleEnum.PURCHASE.getKey(),null));
         purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
         purchase.setFlowId(flowId);
         purchaseService.save(purchase);

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlowByWdly.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
@@ -54,7 +56,8 @@ public class PurchaseFlowByWdly extends FlowDelegate {
     private SubscribeDetailService subscribeDetailService;
     @Autowired
     private ContractProductService contractProductService;
-
+    @Autowired
+    private CodingRuleService codingRuleService;
     @Override
     public String getFlowKey() {
         return "wdly_purchase";
@@ -72,7 +75,8 @@ public class PurchaseFlowByWdly extends FlowDelegate {
         DynamicDataSourceContextHolder.push(SourceConstant.PURCHASE);
         try {
             Purchase purchase = submitData.toJavaObject(Purchase.class);
-            purchase.setCode(CodeEnum.PURCHASE.getCode());
+//            purchase.setCode(CodeEnum.PURCHASE.getCode());
+            purchase.setCode(codingRuleService.createCode(CodingRuleEnum.PURCHASE.getKey(),null));
             purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
             purchase.setProcessInstanceId("wdly_purchase");
             purchase.setFlowId(flowId);

hx-sale/src/main/java/com/fjhx/sale/flow/SaleQuotationFlow.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
@@ -18,6 +20,7 @@ import com.fjhx.sale.service.quotation.QuotationProductService;
 import com.fjhx.sale.service.sale.SaleQuotationService;
 import com.fjhx.sale.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -28,6 +31,9 @@ import java.util.List;
 @DS(SourceConstant.SALE)
 @Component
 public class SaleQuotationFlow extends FlowDelegate {
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public String getFlowKey() {
         return "sale_quotation_flow";
@@ -51,7 +57,8 @@ public class SaleQuotationFlow extends FlowDelegate {
         saleQuotation.setBuyCountryId(saleQuotation.getCountryId());
         saleQuotation.setBuyProvinceId(saleQuotation.getProvinceId());
         //添加报价编码
-        saleQuotation.setCode(CodeEnum.SALE_QUOTATION.getCode());
+        saleQuotation.setCode(codingRuleService.createCode(CodingRuleEnum.SALE_QUOTATION.getKey(),saleQuotation.getBuyCorporationId()));
+//        saleQuotation.setCode(CodeEnum.SALE_QUOTATION.getCode());
         //添加报价状态
         saleQuotation.setStatus(SaleQuotationEnum.UNDER_REVIEW.getKey());
         //添加报价单信息

hx-sale/src/main/java/com/fjhx/sale/flow/SampleFlow.java

@@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.sample.dto.SampleDto;
 import com.fjhx.sale.entity.sample.po.Sample;
@@ -26,6 +28,7 @@ import com.fjhx.sale.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -40,6 +43,8 @@ import java.util.List;
 @DS(SourceConstant.SALE)
 public class SampleFlow extends FlowDelegate {
 
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     @Override
     public String getFlowKey() {
@@ -69,7 +74,8 @@ public class SampleFlow extends FlowDelegate {
         sample.setBuyCityId(sample.getCityId());
         sample.setBuyCountryId(sample.getCountryId());
         sample.setBuyProvinceId(sample.getProvinceId());
-        sample.setCode(CodeEnum.SAMPLE_CODE.getCode());
+//        sample.setCode(CodeEnum.SAMPLE_CODE.getCode());
+        sample.setCode(codingRuleService.createCode(CodingRuleEnum.SAMPLE.getKey(),sample.getBuyCorporationId()));
         sample.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
         sample.setUserName(SecurityUtils.getUsername());
 

hx-sale/src/main/java/com/fjhx/sale/flow/ServiceContractFlow.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
@@ -19,6 +21,7 @@ import com.fjhx.sale.service.serviceContract.ServiceContractProductService;
 import com.fjhx.sale.service.serviceContract.ServiceContractService;
 import com.fjhx.sale.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -29,6 +32,10 @@ import java.util.List;
 @DS(SourceConstant.SALE)
 @Component
 public class ServiceContractFlow extends FlowDelegate {
+
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public String getFlowKey() {
         return "service_contract_flow";
@@ -57,7 +64,8 @@ public class ServiceContractFlow extends FlowDelegate {
         contract.setBuyProvinceId(contract.getProvinceId());
 
         //添加服务合同编码
-        contract.setCode(CodeEnum.SALE_QUOTATION.getCode());
+        contract.setCode(codingRuleService.createCode(CodingRuleEnum.SERVICE_CONTRACT.getKey(),contract.getBuyCorporationId()));
+//        contract.setCode(CodeEnum.SALE_QUOTATION.getCode());
         //添加服务合同状态
         contract.setStatus(ServiceContractEnum.UNDER_REVIEW.getKey());
         //添加服务合同信息

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -65,10 +65,17 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
      */
     @Override
     @DSTransactional
-    public void add(Claim claim) {
-        Claim data = this.getOne(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,claim.getBusinessId()));
-        if(ObjectUtils.isNotEmpty(data)){
-            throw new ServiceException("当前这笔资金已被认领");
+    public synchronized void add(Claim claim) {
+//        Claim data = this.getOne(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,claim.getBusinessId()));
+        if(ObjectUtils.isNotEmpty(claim.getBusinessId())){
+            throw new ServiceException("请选择认领数据");
+        }
+        if(ObjectUtils.isEmpty(claim.getAmount())){
+            throw new ServiceException("认领金额不能为空");
+        }
+        AccountRunningWater water = accountRunningWaterService.getById(claim.getBusinessId());
+        if(water.getClaimAmount().add(claim.getAmount()).compareTo(water.getAmount())>0){//如果认领金额>流水金额---驳回
+            throw new ServiceException("认领金额不能大于流水金额");
         }
         this.save(claim);
         List<ClaimContract> claimContractList = claim.getClaimContractList();
@@ -78,10 +85,11 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
             }
             claimContractService.saveBatch(claimContractList);
         }
-        //更新流水数据为认领状态
-        AccountRunningWater water = new AccountRunningWater();
-        water.setId(claim.getBusinessId());
-        water.setIsClaim(1);//已认领状态
+        //更新流水数据已认领金额
+        if(water.getClaimAmount().add(claim.getAmount()).compareTo(water.getAmount())==0){//如果认领金额=流水金额
+            water.setIsClaim(1);//已认领状态
+        }
+        water.setClaimAmount(water.getClaimAmount().add(claim.getAmount()));
         accountRunningWaterService.updateById(water);
         ObsFileUtil.saveFile(claim.getFileList(),claim.getId());
     }

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackServiceImpl.java

@@ -2,6 +2,8 @@ package com.fjhx.sale.service.pack.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.sale.entity.pack.po.Pack;
 import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailGoods;
@@ -49,6 +51,9 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
     @Autowired
     private PackDetailGoodsService packDetailGoodsService;
 
+    @Autowired
+    private CodingRuleService codingRuleService;
+
     @Override
     public Page<PackVo> getPage(PackSelectDto dto) {
         IWrapper<Pack> wrapper = getWrapper();
@@ -74,7 +79,8 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
         if(StringUtils.isEmpty(pack.getContractIds())){
             throw new ServiceException("参数异常");
         }
-        pack.setCode(CodeEnum.PACK.getCode());
+//        pack.setCode(CodeEnum.PACK.getCode());
+        pack.setCode(codingRuleService.createCode(CodingRuleEnum.PACK.getKey(),null));
         this.save(pack);
         List<PackDetail> packDetailList = pack.getPackDetailList();
         if(CollectionUtils.isNotEmpty(packDetailList)){

hx-sale/src/main/java/com/fjhx/sale/util/code/CodeEnum.java

@@ -34,7 +34,7 @@ public enum CodeEnum {
     //样品单
     SAMPLE_CODE("YP-", "yyMM-", "code", 3, SampleService.class),
     //采购
-    PURCHASE("PO", "yyMM-", "code", 3, EhsdPurchaseService.class),
+    PURCHASE("PO-", "yyMM-", "code", 3, EhsdPurchaseService.class),
     ;
     ;