Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 5b41cd83 由 zshaohui
选项

盘点菜单增加

1 个父辈 680fe21e
内嵌 并排
正在显示 4 个修改的文件 包含 12 行增加 和 1 行删除
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
...@@ -271,22 +271,29 @@ public class DataInitManager { ...@@ -271,22 +271,29 @@ public class DataInitManager {
Menu s1 = Menu.CreatePMenu("工位1", 13, "/s1", 2, "index", null); Menu s1 = Menu.CreatePMenu("工位1", 13, "/s1", 2, "index", null);
addNewFunctionMenu(123, s1, "outerWarehouse/s1", "入库扫码装箱","outerWarehouse/s1", "outers/outerWarehouse/index","index",functionMenuMap); addNewFunctionMenu(123, s1, "outerWarehouse/s1", "入库扫码装箱","outerWarehouse/s1", "outers/outerWarehouse/index","index",functionMenuMap);
addNewFunctionMenu(124, s1, "outOperation/s1", "出库作业","outOperation/s1", "outers/outOperation/index","index",functionMenuMap); addNewFunctionMenu(124, s1, "outOperation/s1", "出库作业","outOperation/s1", "outers/outOperation/index","index",functionMenuMap);
addNewFunctionMenu(125, s1, "staWorkSurface/s1", "盘点作业","staWorkSurface/s1", "outers/staWorkSurface/index","index",functionMenuMap);
Menu s2 = Menu.CreatePMenu("工位2", 14, "/s2", 2, "index", null); Menu s2 = Menu.CreatePMenu("工位2", 14, "/s2", 2, "index", null);
addNewFunctionMenu(124, s2, "outerWarehouse/s2", "入库扫码装箱","outerWarehouse/s2", "outers/outerWarehouse/index","index",functionMenuMap); addNewFunctionMenu(124, s2, "outerWarehouse/s2", "入库扫码装箱","outerWarehouse/s2", "outers/outerWarehouse/index","index",functionMenuMap);
addNewFunctionMenu(125, s2, "outOperation/s2", "出库作业","outOperation/s2", "outers/outOperation/index","index",functionMenuMap); addNewFunctionMenu(125, s2, "outOperation/s2", "出库作业","outOperation/s2", "outers/outOperation/index","index",functionMenuMap);
addNewFunctionMenu(126, s2, "staWorkSurface/s2", "盘点作业","staWorkSurface/s2", "outers/staWorkSurface/index","index",functionMenuMap);
Menu s3 = Menu.CreatePMenu("工位3", 15, "/s3", 2, "index", null); Menu s3 = Menu.CreatePMenu("工位3", 15, "/s3", 2, "index", null);
addNewFunctionMenu(126, s3, "outerWarehouse/s3", "入库扫码装箱","outerWarehouse/s3", "outers/outerWarehouse/index","index",functionMenuMap); addNewFunctionMenu(126, s3, "outerWarehouse/s3", "入库扫码装箱","outerWarehouse/s3", "outers/outerWarehouse/index","index",functionMenuMap);
addNewFunctionMenu(127, s3, "outOperation/s3", "出库作业","outOperation/s3", "outers/outOperation/index","index",functionMenuMap); addNewFunctionMenu(127, s3, "outOperation/s3", "出库作业","outOperation/s3", "outers/outOperation/index","index",functionMenuMap);
addNewFunctionMenu(128, s3, "staWorkSurface/s3", "盘点作业","staWorkSurface/s3", "outers/staWorkSurface/index","index",functionMenuMap);
Menu s4 = Menu.CreatePMenu("工位4", 16, "/s4", 2, "index", null); Menu s4 = Menu.CreatePMenu("工位4", 16, "/s4", 2, "index", null);
addNewFunctionMenu(128, s4, "outerWarehouse/s4", "入库扫码装箱","outerWarehouse/s4", "outers/outerWarehouse/index","index",functionMenuMap); addNewFunctionMenu(128, s4, "outerWarehouse/s4", "入库扫码装箱","outerWarehouse/s4", "outers/outerWarehouse/index","index",functionMenuMap);
addNewFunctionMenu(129, s4, "outOperation/s4", "出库作业","outOperation/s4", "outers/outOperation/index","index",functionMenuMap); addNewFunctionMenu(129, s4, "outOperation/s4", "出库作业","outOperation/s4", "outers/outOperation/index","index",functionMenuMap);
addNewFunctionMenu(130, s4, "staWorkSurface/s1", "盘点作业","staWorkSurface/s4", "outers/staWorkSurface/index","index",functionMenuMap);
Menu s5 = Menu.CreatePMenu("工位5", 17, "/s5", 2, "index", null); Menu s5 = Menu.CreatePMenu("工位5", 17, "/s5", 2, "index", null);
addNewFunctionMenu(130, s5, "outerWarehouse/s5", "入库扫码装箱","outerWarehouse/s5", "outers/outerWarehouse/index","index",functionMenuMap); addNewFunctionMenu(130, s5, "outerWarehouse/s5", "入库扫码装箱","outerWarehouse/s5", "outers/outerWarehouse/index","index",functionMenuMap);
addNewFunctionMenu(131, s5, "outOperation/s5", "出库作业","outOperation/s5", "outers/outOperation/index","index",functionMenuMap); addNewFunctionMenu(131, s5, "outOperation/s5", "出库作业","outOperation/s5", "outers/outOperation/index","index",functionMenuMap);
addNewFunctionMenu(132, s4, "staWorkSurface/s5", "盘点作业","staWorkSurface/s5", "outers/staWorkSurface/index","index",functionMenuMap);
//线外入库 //线外入库
//Menu outPage = Menu.CreatePMenu("线外入库", 17, "", 1, "index", null); //Menu outPage = Menu.CreatePMenu("线外入库", 17, "", 1, "index", null);
...@@ -298,6 +305,7 @@ public class DataInitManager { ...@@ -298,6 +305,7 @@ public class DataInitManager {
//内外仓电子看板 //内外仓电子看板
addNewFunctionMenu(1,null,"elecKanban", "电子看板","elecKanban", "elecKanban/index","kanban",functionMenuMap); addNewFunctionMenu(1,null,"elecKanban", "电子看板","elecKanban", "elecKanban/index","kanban",functionMenuMap);
addNewFunctionMenu(135,null,"sysInventory", "盘点出库","sysInventory", "system/sysInventory/index","mIDList",functionMenuMap);
return functionMenuMap; return functionMenuMap;
} }
......
src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java
...@@ -154,6 +154,8 @@ public class BarcodeDto implements Serializable { ...@@ -154,6 +154,8 @@ public class BarcodeDto implements Serializable {
@ApiModelProperty("最后一次出库的时间") @ApiModelProperty("最后一次出库的时间")
private Date checkOutDate; private Date checkOutDate;
@ApiModelProperty("是否出库")
private boolean isOut = false;
/** /**
* 关联条码,夹具时关联相关的物料,用于入库完成时插入相关物料 * 关联条码,夹具时关联相关的物料,用于入库完成时插入相关物料
*/ */
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/InventoryController.java
...@@ -229,7 +229,7 @@ public class InventoryController { ...@@ -229,7 +229,7 @@ public class InventoryController {
} }
} }
} }
storagePosList = storagePosList.stream().sorted(Comparator.comparing(StoragePos :: getPosName)).collect(Collectors.toList()); storagePosList = storagePosList.stream().sorted(Comparator.comparing(StoragePos :: getPosName).reversed()).collect(Collectors.toList());
return storagePosMapper.toDto(storagePosList); return storagePosMapper.toDto(storagePosList);
} }
return new ArrayList<>(); return new ArrayList<>();
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java
...@@ -316,6 +316,7 @@ public class OutLineController { ...@@ -316,6 +316,7 @@ public class OutLineController {
return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点"); return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
} }
boxBarcode.setInventory(false); boxBarcode.setInventory(false);
boxBarcode.setCreator(SecurityUtils.getCurrentUsername());
boxBarcode = barcodeManager.save(boxBarcode); boxBarcode = barcodeManager.save(boxBarcode);
//如果不是虚拟仓的 //如果不是虚拟仓的
if (!isVirtual) { if (!isVirtual) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!