编码bUG

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

@@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.purchase.entity.arrival.po.Arrival;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.quality.po.Quality;
+import com.fjhx.purchase.entity.sales.po.SalesReturn;
 import com.fjhx.purchase.service.arrival.ArrivalService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.service.quality.QualityService;
+import com.fjhx.purchase.service.sales.SalesReturnService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
@@ -31,7 +33,7 @@ public enum CodeEnum {
     //质检
     QUALITY("ZJ", "yyMM-", "code", 3, QualityService.class),
     //退货
-    SALES_RETURN("ZJ", "yyMM-", "code", 3, QualityService.class),
+    SALES_RETURN("ZJ", "yyMM-", "code", 3, SalesReturnService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

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

@@ -6,8 +6,12 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
+import com.fjhx.sale.flow.SaleQuotationFlow;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.pack.PackService;
+import com.fjhx.sale.service.sale.SaleQuotationService;
+import com.fjhx.sale.service.serviceContract.ServiceContractService;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
 
@@ -20,10 +24,11 @@ public enum CodeEnum {
     //外销合同
     CONTRACT("SC-", "yyMM-", "code", 3, ContractService.class),
     //报价单
-    SALE_QUOTATION("GSQT-", "yyMM-", "code", 3, ContractService.class),
+    SALE_QUOTATION("GSQT-", "yyMM-", "code", 3, SaleQuotationService.class),
+    //包装
     PACK("PACK-", "yyMM-", "code", 3, PackService.class),
     //服务合同
-    SERVICE_CONTRACT("PO-", "yyMM-", "code", 3, ContractService.class),
+    SERVICE_CONTRACT("PO-", "yyMM-", "code", 3, ServiceContractService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {