Merge remote-tracking branch 'origin/master'

pom.xml

@@ -16,7 +16,7 @@
 	<description>SMF project for Spring Boot</description>
 	<description>SMF project for Spring Boot</description>
 	<properties>
 	<properties>
 		<maven.build.timestamp.format>M.ddHHmm</maven.build.timestamp.format>
 		<maven.build.timestamp.format>M.ddHHmm</maven.build.timestamp.format>
-		<main.version>1.2${maven.build.timestamp}</main.version>
+		<main.version>3.${maven.build.timestamp}</main.version>
 		<app.version>${main.version}</app.version>
 		<app.version>${main.version}</app.version>
 		<java.version>1.8</java.version>
 		<java.version>1.8</java.version>
 		<jjwt.version>0.11.1</jjwt.version>
 		<jjwt.version>0.11.1</jjwt.version>

src/main/java/com/neotel/smfcore/core/system/bean/OrderSetting.java

@@ -23,6 +23,10 @@ public class OrderSetting implements Serializable {
 
 
     public String so="WO";
     public String so="WO";
 
 
+    public String num="NUM";
+
+    public String mpn="MPN";
+
     /**
     /**
      * 是否显示料架亮灯方式
      * 是否显示料架亮灯方式
      */
      */

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -211,6 +211,8 @@ public class SettingsController {
             titles.add((orderSetting.getQty()));
             titles.add((orderSetting.getQty()));
             titles.add(orderSetting.getRi());
             titles.add(orderSetting.getRi());
             titles.add(orderSetting.getSo());
             titles.add(orderSetting.getSo());
+            titles.add(orderSetting.getNum());
+            titles.add(orderSetting.getMpn());
             for(int i=1;i<=10;i++) {
             for(int i=1;i<=10;i++) {
 
 
                 Map<String, Object> map = new LinkedHashMap<>();
                 Map<String, Object> map = new LinkedHashMap<>();
@@ -220,6 +222,8 @@ public class SettingsController {
                     map.put(orderSetting.getQty(),"100"+i);
                     map.put(orderSetting.getQty(),"100"+i);
                     map.put(orderSetting.getRi(),"");
                     map.put(orderSetting.getRi(),"");
                     map.put(orderSetting.getSo(),"WO1001" );
                     map.put(orderSetting.getSo(),"WO1001" );
+                    map.put(orderSetting.getNum(),i);
+                    map.put(orderSetting.getMpn(),"MPN"+i);
                 }
                 }
                 else{
                 else{
                     map.put(orderSetting.getPn(),"PN2"+i);
                     map.put(orderSetting.getPn(),"PN2"+i);
@@ -227,6 +231,8 @@ public class SettingsController {
                     map.put(orderSetting.getQty(),"200"+i);
                     map.put(orderSetting.getQty(),"200"+i);
                     map.put(orderSetting.getRi(),"");
                     map.put(orderSetting.getRi(),"");
                     map.put(orderSetting.getSo(),"WO1002" );
                     map.put(orderSetting.getSo(),"WO1002" );
+                    map.put(orderSetting.getNum(),i);
+                    map.put(orderSetting.getMpn(),"MPN"+i);
                 }
                 }
                 maps.add(map);
                 maps.add(map);
             }
             }