工单菜单调整

LN
Commit 1a3083dd 由 LN 编写于 2022-05-19 18:15:48 +0800
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java
--- a/src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
查看文件 @1a3083d
+++ b/src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
查看文件 @1a3083d
@@ -202,7 +202,7 @@ public class DataInitManager {
        //物料管理：工单出库，查找出库（UID出库，PN出库），物料标签，料盒操作，出库策略，工单设置
        Menu poutOut = Menu.CreatePMenu("物料管理", 20, "order", 2, "workOrder");
 //        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "workOrder", "工单出库", 1, "workOrder", "neolight/workOrder/index", "", 0, "orderOut");
-        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "billworkOrder", "工单", 1, "billworkOrder", "neolight/billworkOrder/index", "", 0, "orderOut");
+//        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "billworkOrder", "工单", 1, "billworkOrder", "neolight/billworkOrder/index", "", 0, "orderOut");
        Menu out = Menu.CreatePMenu("查找出库", 20, "searchOut", 2, "findOut");
        Menu menuOut = new Menu(new ArrayList<Menu>(), 1, "checkOut", "UID出库", 1, "singleOuput", "neolight/singleOuput/index", "", 0, "export1");
@@ -210,17 +210,14 @@ public class DataInitManager {
        Menu mslOut = new Menu(new ArrayList<Menu>(), 1, "mslOut", "湿敏管理", 1, "mslOut", "neolight/mslOut/index", "", 0, "tacticsOuput");
        out.setChildren(Arrays.asList((new Menu[]{menuOut,celueOut,mslOut})));
-        Menu reelOut = new Menu(new ArrayList<Menu>(), 1, "reelOut", "料盘出库", 1, "reelOut", "system/reelOut/index", "", 0, "swagger");
+//        Menu reelOut = new Menu(new ArrayList<Menu>(), 1, "reelOut", "料盘出库", 1, "reelOut", "system/reelOut/index", "", 0, "swagger");
        Menu posOut = new Menu(new ArrayList<Menu>(), 1, "posOutput", "库位出库", 1, "posOutput", "system/posOutput/index", "", 0, "swagger");
        Menu groupOut = new Menu(new ArrayList<Menu>(), 1, "labelOuput", "物料标签", 1, "labelOuput", "neolight/labelOuput/index", "", 0, "mgroup");
-//        Menu manualOut = new Menu(new ArrayList<Menu>(), 1, "manualOut", "手动出库", 1, "manualOut", "neolight/manualOut/index", "", 0, "export1");
        Menu materialBox = new Menu(new ArrayList<Menu>(), 1, "materialBox", "料盒操作", 1, "materialBox", "neolight/materialBox/index", "", 0, "mIbox");
        Menu outSet = new Menu(new ArrayList<Menu>(), 1, "outSetting", "出库策略", 1, "outSetting", "system/outSetting/index", "", 0, "outSet");
-//        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "工单设置", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
+       Menu  inOrderMenu= new Menu(new ArrayList<Menu>(), 1, "inList", "入库单", 1, "inList", "system/inList/index", "", 0, "headIcon");
-        Menu  inOrderMenu= new Menu(new ArrayList<Menu>(), 1, "inList", "入库单", 1, "inList", "system/inList/index", "", 0, "headIcon");
-//        Menu  putinMenu= new Menu(new ArrayList<Menu>(), 1, "putIn", "物料入库", 1, "putIn", "system/putIn/index", "", 0, "headIcon");
        Menu  zhuanruMenu= new Menu(new ArrayList<Menu>(), 1, "dumpWarehousing", "转储入库", 1, "dumpWarehousing", "system/dumpWarehousing/index", "", 0, "dumpWarehousing");
        Menu  singleMenu= new Menu(new ArrayList<Menu>(), 1, "singleDiskWarehousing", "单盘入库", 1, "singleDiskWarehousing", "system/singleDiskWarehousing/index", "", 0, "singleDiskWarehousing");
@@ -235,10 +232,22 @@ public class DataInitManager {
        materialBox.setHidden(true);
        outSet.setHidden(true);
        posOut.setHidden(true);
-//        zhuanruMenu.setHidden(true);
+//        menus.addAll(createMenus(poutOut, menuOrder, out,reelOut,posOut,groupOut,materialBox,outSet,inOrderMenu,zhuanruMenu,singleMenu,sluggishMaterials,safetyInventory,outListMenu,orderSetMenu));
-//        singleMenu.setHidden(true);
+        menus.addAll(createMenus(poutOut,  out,posOut,groupOut,materialBox,outSet,inOrderMenu,zhuanruMenu,singleMenu,sluggishMaterials,safetyInventory,outListMenu,orderSetMenu));
-//        orderSet.setHidden(true);
-        menus.addAll(createMenus(poutOut, menuOrder, out,reelOut,posOut,groupOut,materialBox,outSet,inOrderMenu,zhuanruMenu,singleMenu,sluggishMaterials,safetyInventory,outListMenu,orderSetMenu));
+        Menu orderM = Menu.CreatePMenu("工单管理", 20, "orderManager", 2, "workOrder");
+        Menu menuOrder = new Menu(new ArrayList<Menu>(), 1, "billworkOrder", "工单", 1, "billworkOrder", "neolight/billworkOrder/index", "", 0, "orderOut");
+        Menu reelOut = new Menu(new ArrayList<Menu>(), 1, "reelOut", "工单料盘出库", 1, "reelOut", "system/reelOut/index", "", 0, "swagger");
+        Menu orderSheetMenu = new Menu(new ArrayList<Menu>(), 1, "orderSheet", "工单合单", 1, "orderSheet", "system/orderSheet/index", "", 0, "orderSheet");
+        Menu orderShortageOutMenu = new Menu(new ArrayList<Menu>(), 1, "orderShortageOut", "工单欠料发料", 1, "orderShortageOut", "system/orderShortageOut/index", "", 0, "orderShortageOut");
+        Menu orderShortageSheetMenu = new Menu(new ArrayList<Menu>(), 1, "orderShortageSheet", "合单欠料", 1, "orderShortageSheet", "system/orderShortageSheet/index", "", 0, "orderShortageSheet");
+        orderSheetMenu.setHidden(true);
+        orderShortageOutMenu.setHidden(true);
+        orderShortageSheetMenu.setHidden(true);
+        menus.addAll(createMenus(orderM,menuOrder,reelOut,orderSheetMenu,orderShortageOutMenu,orderShortageSheetMenu));
        //MSD管理：MSD库存.MSD追溯性.MSD设置
        Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");

--- a/src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java
查看文件 @1a3083d
+++ b/src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java
查看文件 @1a3083d
@@ -210,6 +210,7 @@ public class DataLog extends BasePo implements Serializable {
    private int inType;
    /**
     * 出库类型:0普通出库,1并盘出库 ,2湿敏出库 3线边仓间转储出库 ,10=工单出库
+     * 4=转外协出库,发运单出库,成本中心领料:对应4，预留单出库;
     */
    private int outType;