编号生成器更换

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

@@ -116,6 +116,33 @@ public enum CodingRuleEnum {
             getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
+
+    //---------------------------嘉兴双拓-----------------------------
+    JXST_SALES_CONTRACT("jsxt_sales_contract", "嘉兴双拓销售合同", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "SC"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    JXST_WORK_ORDER("jsxt_work_order", "嘉兴双拓工单", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "WO"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    JXST_PRODUCTION_PLAN("jsxt_production_plan", "嘉兴双拓生产计划", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "WP"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    JXST_PRODUCTION_TASK("jsxt_production_task", "嘉兴双拓生产任务", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "WT"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+    JXST_AFTER_SALES("jsxt_after_sales", "嘉兴双拓售后", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "AS"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
     ;
 
     /**

hx-jxst/src/main/java/com/fjhx/jxst/service/after/impl/AfterSalesRecordServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 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.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -66,6 +68,8 @@ public class AfterSalesRecordServiceImpl extends ServiceImpl<AfterSalesRecordMap
     private BomDetailService bomDetailService;
     @Autowired
     private AfterSalesRecordDetailService afterSalesRecordDetailService;
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     @Override
     public Page<AfterSalesRecordVo> getPage(AfterSalesRecordSelectDto dto) {
@@ -143,7 +147,9 @@ public class AfterSalesRecordServiceImpl extends ServiceImpl<AfterSalesRecordMap
         dto.setProductId(productionTaskDetail.getProductId());
 
         //赋值单号
-        dto.setCode(CodeEnum.AFTER_SALES.getCode());
+//        dto.setCode(CodeEnum.AFTER_SALES.getCode());
+        dto.setCode(codingRuleService.createCode(CodingRuleEnum.JXST_AFTER_SALES.getKey(),null));
+
         this.save(dto);
     }
 

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -9,6 +9,8 @@ import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.service.account.AccountManagementService;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.customer.entity.customer.po.Customer;
@@ -62,6 +64,8 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
     private AccountManagementService accountManagementService;
     @Autowired
     private CorporationService corporationService;
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     @Override
     public Page<SalesContractVo> getPage(SalesContractSelectDto dto) {
@@ -150,7 +154,9 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
 //            count = count.add(salesContractDetails.getUnitPrice().multiply(salesContractDetails.getQuantity()));
 //        }
 //        salesContractDto.setContractAmount(count);
-        salesContractDto.setCode(CodeEnum.SALES_CONTRACT.getCode());
+//        salesContractDto.setCode(CodeEnum.SALES_CONTRACT.getCode());
+        salesContractDto.setCode(codingRuleService.createCode(CodingRuleEnum.JXST_SALES_CONTRACT.getKey(),null));
+
         this.save(salesContractDto);
         for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
             salesContractDetails.setSalesContractId(salesContractDto.getId());

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionPlanServiceImpl.java

@@ -4,7 +4,9 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.PushBusinessTypeEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.po.ProductionPlan;
@@ -63,6 +65,8 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
     ProductionTaskService productionTaskService;
     @Autowired
     private ISysUserService userService;
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     @Override
     public Page<ProductionPlanVo> getPage(ProductionPlanSelectDto dto) {
@@ -132,7 +136,8 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
         }
 
         productionPlanDto.setStatus(0);
-        productionPlanDto.setCode(CodeEnum.PRODUCTION_PLAN.getCode());
+//        productionPlanDto.setCode(CodeEnum.PRODUCTION_PLAN.getCode());
+        productionPlanDto.setCode(codingRuleService.createCode(CodingRuleEnum.JXST_PRODUCTION_PLAN.getKey(),null));
         this.save(productionPlanDto);
         //修改工单状态为进行中
         workOrder.setStatus(1);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskServiceImpl.java

@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.enums.CodingRuleEnum;
 import com.fjhx.common.enums.PushBusinessTypeEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -102,6 +104,8 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
     private StockService stockService;
     @Autowired
     private StockFrozenService stockFrozenService;
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     @Override
     public Page<ProductionTaskVo> getPage(ProductionTaskSelectDto dto) {
@@ -152,7 +156,8 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
             throw new ServiceException("任务数量大于计划数量，请检查!");
         }
 
-        productionTaskDto.setCode(CodeEnum.PRODUCTION_TASK.getCode());
+//        productionTaskDto.setCode(CodeEnum.PRODUCTION_TASK.getCode());
+        productionTaskDto.setCode(codingRuleService.createCode(CodingRuleEnum.JXST_PRODUCTION_TASK.getKey(),null));
         this.save(productionTaskDto);
         //更新生产计划状态为进行中
         productionPlan.setStatus(1);

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.PushBusinessTypeEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
@@ -111,6 +113,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     private WorkOrderBomService workOrderBomService;
     @Autowired
     private CustomerService customerService;
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     @Override
     public Page<WorkOrderVo> getPage(WorkOrderSelectDto dto) {
@@ -204,7 +208,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         getBomInfo(workOrderDto);
 
         //生成工单编号,以及设置默认状态
-        workOrderDto.setCode(CodeEnum.WORK_ORDER.getCode());
+//        workOrderDto.setCode(CodeEnum.WORK_ORDER.getCode());
+        workOrderDto.setCode(codingRuleService.createCode(CodingRuleEnum.JXST_WORK_ORDER.getKey(),null));
         workOrderDto.setStatus(0);
         this.save(workOrderDto);
     }