编码规则清理

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

@@ -16,46 +16,46 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public enum CodingRuleEnum {
 
-    /**
-     * 外销合同
-     */
-    CONTRACT("contract", "外销合同", Arrays.asList(
-            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "SC-"),
-            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")
-    )),
+//    /**
+//     * 外销合同
+//     */
+//    CONTRACT("contract", "外销合同", Arrays.asList(
+//            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "SC-"),
+//            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")
+//    )),
     /**
      * 采购编码
      */
@@ -65,14 +65,14 @@ public enum CodingRuleEnum {
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
 
-    /**
-     * 服务合同
-     */
-    SERVICE_CONTRACT("service_contract", "服务合同", Arrays.asList(
-            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PO-"),
-            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")
+//    )),
 
     //---------------------------采购模块-----------------------------
 
@@ -92,30 +92,30 @@ public enum CodingRuleEnum {
             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")
-    )),
-    /**
-     * EHSD到货检验编码
-     */
-    EHSD_QUALITY("ehsd_quality", "到货检验编码", Arrays.asList(
-            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "EHSD-QUALITY-"),
-            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")
+//    )),
+//    /**
+//     * EHSD到货检验编码
+//     */
+//    EHSD_QUALITY("ehsd_quality", "到货检验编码", Arrays.asList(
+//            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "EHSD-QUALITY-"),
+//            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+//            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+//    )),
 
     //---------------------------嘉兴双拓-----------------------------
     JXST_SALES_CONTRACT("jsxt_sales_contract", "嘉兴双拓销售合同", Arrays.asList(

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

@@ -72,7 +72,7 @@ public class SalesReturnFlow extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
 
         SalesReturn salesReturn = submitData.toJavaObject(SalesReturn.class);
-        salesReturn.setCode(codingRuleService.createCode(CodingRuleEnum.SALES_RETURN.getKey(), null));
+//        salesReturn.setCode(codingRuleService.createCode(CodingRuleEnum.SALES_RETURN.getKey(), null));
         salesReturn = commStart(salesReturn, 0);
 
         return salesReturn.getId();

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

@@ -75,7 +75,7 @@ public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> impl
     @DSTransactional
     public void add(Quality quality) {
 //        quality.setCode(CodeEnum.QUALITY.getCode());
-        quality.setCode(codingRuleService.createCode(CodingRuleEnum.QUALITY.getKey(),null));
+//        quality.setCode(codingRuleService.createCode(CodingRuleEnum.QUALITY.getKey(),null));
         this.save(quality);
         List<QualityDetail> qualityDetailList = quality.getQualityDetailList();
         if(CollectionUtils.isNotEmpty(qualityDetailList)){

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

@@ -89,7 +89,7 @@ public class ContractFlow extends FlowDelegate {
         }
 
         //赋值合同号
-        contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
+//        contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
 
         // 保存合同产品
         List<ContractProduct> contractProductList = contract.getContractProductList();

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

@@ -87,7 +87,7 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         purchase.setSellCityId(purchase.getCityId());
         purchase.setSellCountryId(purchase.getCountryId());
         purchase.setSellProvinceId(purchase.getProvinceId());
-        purchase.setCode(codingRuleService.createCode(CodingRuleEnum.EHSD_PURCHASE.getKey(), null));
+//        purchase.setCode(codingRuleService.createCode(CodingRuleEnum.EHSD_PURCHASE.getKey(), null));
 //        purchase.setCode(CodeEnum.PURCHASE.getCode());
         purchase.setStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
         purchase.setUserName(SecurityUtils.getUsername());

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

@@ -62,7 +62,7 @@ public class SaleQuotationFlow extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
         SaleQuotationDto saleQuotation = submitData.toJavaObject(SaleQuotationDto.class);
         //添加报价编码
-        saleQuotation.setCode(codingRuleService.createCode(CodingRuleEnum.SALE_QUOTATION.getKey(), saleQuotation.getBuyCorporationId()));
+//        saleQuotation.setCode(codingRuleService.createCode(CodingRuleEnum.SALE_QUOTATION.getKey(), saleQuotation.getBuyCorporationId()));
         saleQuotation = commStart(saleQuotation, 0);
 
         return saleQuotation.getId();

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

@@ -72,7 +72,7 @@ public class SampleFlow extends FlowDelegate {
         sample.setBuyCountryId(sample.getCountryId());
         sample.setBuyProvinceId(sample.getProvinceId());
 //        sample.setCode(CodeEnum.SAMPLE_CODE.getCode());
-        sample.setCode(codingRuleService.createCode(CodingRuleEnum.SAMPLE.getKey(), sample.getBuyCorporationId()));
+//        sample.setCode(codingRuleService.createCode(CodingRuleEnum.SAMPLE.getKey(), sample.getBuyCorporationId()));
         sample.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         sample.setUserName(SecurityUtils.getUsername());
 

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

@@ -65,7 +65,7 @@ public class ServiceContractFlow extends FlowDelegate {
         ServiceContractDto contract = submitData.toJavaObject(ServiceContractDto.class);
 
         //添加服务合同编码
-        contract.setCode(codingRuleService.createCode(CodingRuleEnum.SERVICE_CONTRACT.getKey(), contract.getBuyCorporationId()));
+//        contract.setCode(codingRuleService.createCode(CodingRuleEnum.SERVICE_CONTRACT.getKey(), contract.getBuyCorporationId()));
         //调用公共代码
         contract = commStart(contract, 0);
 

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

@@ -104,7 +104,7 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
             throw new ServiceException("参数异常");
         }
 //        pack.setCode(CodeEnum.PACK.getCode());
-        pack.setCode(codingRuleService.createCode(CodingRuleEnum.PACK.getKey(), null));
+//        pack.setCode(codingRuleService.createCode(CodingRuleEnum.PACK.getKey(), null));
         this.save(pack);
         List<PackDetail> packDetailList = pack.getPackDetailList();
         if (CollectionUtils.isNotEmpty(packDetailList)) {