增加MSD菜单

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -198,6 +198,13 @@ public class DataInitManager {
         manualOut.setHidden(true);
         manualOut.setHidden(true);
         menus.addAll(createMenus(poutOut, menuOrder, menuOut,celueOut,groupOut,manualOut,materialBox));
         menus.addAll(createMenus(poutOut, menuOrder, menuOut,celueOut,groupOut,manualOut,materialBox));
 
 
+        Menu msd = Menu.CreatePMenu("MSD", 20, "msd", 2, "workOrder");
+        Menu msdManage = new Menu(new ArrayList<Menu>(), 1, "msdManage", "MSD管理", 1, "msdManage", "neolight/msdManage/index", "", 0, "export1");
+        Menu msdData = new Menu(new ArrayList<Menu>(), 1, "msdData", "MSD追溯性", 1, "msdData", "neolight/msdData/index", "", 0, "export1");
+        Menu msdSetting = new Menu(new ArrayList<Menu>(), 1, "msdSetting", "MSD设置", 1, "msdSetting", "neolight/msdSetting/index", "", 0, "workOrder");
+        menus.addAll(createMenus(msd,msdManage,msdData,msdSetting));
+
+
         //设置：料仓管理，菜单管理
         //设置：料仓管理，菜单管理
         Menu poutSet = Menu.CreatePMenu("设置", 30, "system", 2, "system");
         Menu poutSet = Menu.CreatePMenu("设置", 30, "system", 2, "system");
         Menu menuStorage = new Menu(new ArrayList<Menu>(), 1, "storage:list", "设备管理", 1, "bunker", "storage/storage/index", "", 0, "database");
         Menu menuStorage = new Menu(new ArrayList<Menu>(), 1, "storage:list", "设备管理", 1, "bunker", "storage/storage/index", "", 0, "database");

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -206,6 +206,15 @@ public class Barcode extends BasePo implements Serializable {
      * 原始条码
      * 原始条码
      */
      */
     private String fullCode;
     private String fullCode;
+    /**
+     * 开包时间
+     */
+    private String openTime;
+
+    /**
+     * 描述
+     */
+    private String describe;
 
 
     /**
     /**
      * 添加相关联条码
      * 添加相关联条码

src/main/java/com/neotel/smfcore/core/barcode/service/po/Component.java

@@ -135,6 +135,20 @@ public class Component extends BasePo implements Serializable {
     private String showImg = "";
     private String showImg = "";
 
 
     /**
     /**
+     * 厚度
+     * 请选择
+     *<2.1mm
+     * 2.1mm~3.1mm
+     * >=3.1mm
+     */
+    private String thickness="";
+
+    /**
+     * 是否有包装，默认无
+     */
+    private  boolean MBB=false;
+
+    /**
      * 有效时长(生产日期+此天数为过期日期),设置默认有效期为2年
      * 有效时长(生产日期+此天数为过期日期),设置默认有效期为2年
      */
      */
     private int validDay = 0;
     private int validDay = 0;