Merge branch 'dev-wuhan' into dev-wuhan-temp

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesCustomerSnTransformService.java

@@ -16,11 +16,12 @@ public class MesCustomerSnTransformService implements IMesCustomerSnTransformSer
         if (StringUtils.isEmpty(barCode)) return barCode;
         if (barCode.length() != MesPcnExtConstWords.CUSTOMER_SN_LENGTH_GM) return barCode;
         String a = barCode.substring(0, 3);
-        String b = barCode.substring(5, 20);
-        String c = barCode.substring(20, 29);
-        String d = barCode.substring(29, 41);
-        String e = barCode.substring(41, 58);
-        return a + (char)30 + "06" + (char)29 + b + (char)29 + c + (char)29 + d + (char)29 + e + (char)30 + (char)04;
+        String b = barCode.substring(3, 5);
+        String c = barCode.substring(5, 20);
+        String d = barCode.substring(20, 29);
+        String e = barCode.substring(29, 41);
+        String f = barCode.substring(41, 58);
+        return a + (char)30 + b + (char)29 + c + (char)29 + d + (char)29 + e + (char)29 + f + (char)30 + (char)04;
         /*public static void main(String[] args) {
             String barCode = "[)>06Y4110000000000XP2638975612V545238347T1A24240A2B4C0242";
             String a = barCode.substring(0, 3);