发出单号

src/main/java/cn/ezhizao/project/business/controller/BizOutsourcedOrderController.java

@@ -506,7 +506,7 @@ public class BizOutsourcedOrderController extends BaseController {
                 }
             } else {
                 codeValue = previous;
-                String codeYear=codeValue.substring(4, 5);//取出当前外协单号年份
+                String codeYear=codeValue.substring(3, 5);//取出当前外协单号年份
                 //如果年份一致表示是当前年的发出单，如果不一致则表示已经进入了新的一年则重置发出单号
                 if(codeYear.equals(formattedDate)){
                     int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));
@@ -588,7 +588,7 @@ public class BizOutsourcedOrderController extends BaseController {
                 }
             } else {
                 codeValue = previous;
-                String codeYear=codeValue.substring(4, 5);//取出当前外协单号年份
+                String codeYear=codeValue.substring(3, 5);//取出当前外协单号年份
                 //如果年份一致表示是当前年的发出单，如果不一致则表示已经进入了新的一年则重置发出单号
                 if(codeYear.equals(formattedDate)){
                     int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));
@@ -1108,7 +1108,7 @@ public class BizOutsourcedOrderController extends BaseController {
                 }
             } else {
                 codeValue = previous;
-                String codeYear=codeValue.substring(4, 5);//取出当前外协单号年份
+                String codeYear=codeValue.substring(3, 5);//取出当前外协单号年份
                 //如果年份一致表示是当前年的发出单，如果不一致则表示已经进入了新的一年则重置发出单号
                 if(codeYear.equals(formattedDate)){
                     int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));
@@ -1410,7 +1410,7 @@ public class BizOutsourcedOrderController extends BaseController {
             }
         } else {
             codeValue = previous;
-            String codeYear=codeValue.substring(4, 5);//取出当前外协单号年份
+            String codeYear=codeValue.substring(3, 5);//取出当前外协单号年份
             //如果年份一致表示是当前年的发出单，如果不一致则表示已经进入了新的一年则重置发出单号
             if(codeYear.equals(formattedDate)){
                 int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));

src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -265,11 +265,11 @@ public class BizReturnReceiptController extends BaseController
                     codeValue = codeValue.substring(0, 5) + String.format("%05d", lastFourDigits);
                     previous = codeValue;
                 }else{
-                    previous = ("SHD" + formattedDate + "000001");
+                    previous = ("SHD" + formattedDate + "00001");
                 }
             } else {
                 codeValue = previous;
-                String codeYear=codeValue.substring(4, 5);//取出当前外协单号年份
+                String codeYear=codeValue.substring(3, 5);//取出当前外协单号年份
                 //如果年份一致表示是当前年的发出单，如果不一致则表示已经进入了新的一年则重置发出单号
                 if(codeYear.equals(formattedDate)){
                     int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));
@@ -277,7 +277,7 @@ public class BizReturnReceiptController extends BaseController
                     codeValue = codeValue.substring(0, 5) + String.format("%05d", lastFourDigits);
                     previous=codeValue;
                 }else{
-                    previous = ("SHD" + formattedDate + "000001");
+                    previous = ("SHD" + formattedDate + "00001");
                 }
             }
             //存到redis中
@@ -450,7 +450,7 @@ public class BizReturnReceiptController extends BaseController
                 }
             } else {
                 codeValue = previous;
-                String codeYear=codeValue.substring(4, 5);//取出当前外协单号年份
+                String codeYear=codeValue.substring(3, 5);//取出当前外协单号年份
                 //如果年份一致表示是当前年的发出单，如果不一致则表示已经进入了新的一年则重置发出单号
                 if(codeYear.equals(formattedDate)){
                     int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));