修改合同序列号生成器类

trade-common/src/main/java/com/trade/common/utils/ConstantUtil.java

@@ -60,6 +60,12 @@ public class ConstantUtil {
      * 进口商编号
      */
     public static final String IMPORTER_CODE = "BuyerCN";
+
+
+    /**
+     * 采购合同编号
+     */
+    public static final String PURCHASE_CONTRACT_CODE = "PC";
     /**
      * 销售合同编号
      */

trade-service/src/main/java/com/trade/service/serialNum/service/impl/SerialNumberGeneratorImpl.java

@@ -40,6 +40,9 @@ public class SerialNumberGeneratorImpl implements SerialNumberGenerator {
                 case ConstantUtil.IMPORTER_CODE:
                     sysSerialNum = sysSerialNumService.add(createInitialNo(prefix, "进口商编号"));
                     break;
+                case ConstantUtil.PURCHASE_CONTRACT_CODE:
+                    sysSerialNum = sysSerialNumService.add(createInitialNo(prefix, "采购合同编号"));
+                    break;
                 case ConstantUtil.SALES_CONTRACT_NO_PREFIX:
                     sysSerialNum = sysSerialNumService.add(createInitialNo(prefix, "销售合同编号"));
                     break;
@@ -64,6 +67,7 @@ public class SerialNumberGeneratorImpl implements SerialNumberGenerator {
                 case ConstantUtil.IMPORTER_CODE:
                     curNum = getCurNum(sysSerialNum, 3);
                     break;
+                case ConstantUtil.PURCHASE_CONTRACT_CODE:
                 case ConstantUtil.SALES_CONTRACT_NO_PREFIX:
                 case ConstantUtil.PURCHASE_ORDER_NO_PREFIX:
                     curNum = getCurNum(sysSerialNum, 2);
@@ -107,17 +111,15 @@ public class SerialNumberGeneratorImpl implements SerialNumberGenerator {
      */
     private String getCurrentPrefix(String prefixType) {
         if (StrUtil.isNotEmpty(prefixType)) {
-            if (prefixType.equals(ConstantUtil.ACCEPTANCE_SHEET_CODE) || prefixType.equals(ConstantUtil.BILL_CODE)
-                    || prefixType.equals(ConstantUtil.UNDERLYING_CODE)) {
-                return DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + prefixType;
-            }
-            if (prefixType.equals(ConstantUtil.SALES_CONTRACT_NO_PREFIX)) {
-                return prefixType + DateUtils.dateTimeNow(DateUtils.YYYYMMDDHHMM);
-            }
-            if (prefixType.equals(ConstantUtil.PURCHASE_ORDER_NO_PREFIX)) {
-                return prefixType + DateUtils.dateTimeNow(DateUtils.YYYYMMDDHHMMSS);
+            switch (prefixType) {
+                case ConstantUtil.PURCHASE_ORDER_NO_PREFIX:
+                    return prefixType + DateUtils.dateTimeNow(DateUtils.YYYYMMDDHHMMSS);
+                case ConstantUtil.SALES_CONTRACT_NO_PREFIX:
+                case ConstantUtil.PURCHASE_CONTRACT_CODE:
+                    return prefixType + DateUtils.dateTimeNow(DateUtils.YYYYMMDDHHMM);
+                default:
+                    return prefixType;
             }
-            return prefixType;
         }
         return "";
     }