Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4430ac19 由 sunke
选项

库位搜索页面去除SOxxx的前缀

1 个父辈 9cc55175
内嵌 并排
正在显示 9 个修改的文件 包含 84 行增加 和 64 行删除
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
......@@ -131,8 +131,8 @@ public class DataInitManager {
return dbMenu;
}
private void addNewFunctionMenu(Menu parentMenu,String permission, String title, String path, String component, String icon, Map<String,Menu> functionMenuMap){
Menu menu = new Menu(new ArrayList<Menu>(), 1, permission, title, 1, path, component,"",0, icon);
private void addNewFunctionMenu(int menuSort, Menu parentMenu,String permission, String title, String path, String component, String icon, Map<String,Menu> functionMenuMap){
Menu menu = new Menu(new ArrayList<Menu>(), 1, permission, title, menuSort, path, component,"",0, icon);
menu.setParentMenu(parentMenu);
functionMenuMap.put(menu.getPath(), menu);
}
......@@ -142,95 +142,95 @@ public class DataInitManager {
Map<String,Menu> functionMenuMap = new HashMap<>();
//设备看板
addNewFunctionMenu(null,"boxkanban", "设备看板","lockMaterial", "lockMaterial/material/index","kanban",functionMenuMap);
addNewFunctionMenu(1,null,"boxkanban", "设备看板","lockMaterial", "lockMaterial/material/index","kanban",functionMenuMap);
//物料管理：工单出库，查找出库（UID出库，PN出库），物料标签，料盒操作，出库策略，工单设置
Menu poutOut = Menu.CreatePMenu("物料管理", 1, "order", 2, "workOrder", null);
Menu out = Menu.CreatePMenu("查找出库", 11, "searchOut", 2, "findOut",poutOut);
addNewFunctionMenu(out,"checkOut", "UID出库", "singleOuput", "neolight/singleOuput/index","export1",functionMenuMap);
addNewFunctionMenu(out,"tacticsOuput", "PN出库", "tacticsOuput", "neolight/tacticsOuput/index", "tacticsOuput",functionMenuMap);
addNewFunctionMenu(poutOut,"workOrder", "工单出库","workOrder", "neolight/workOrder/index","orderOut",functionMenuMap);
addNewFunctionMenu(poutOut,"posOutput", "库位出库", "posOutput", "system/posOutput/index", "swagger",functionMenuMap);
addNewFunctionMenu(poutOut, "labelOuput", "物料标签", "labelOuput", "neolight/labelOuput/index", "mgroup",functionMenuMap);
addNewFunctionMenu(poutOut, "materialBox", "料盒操作", "materialBox", "neolight/materialBox/index", "mIbox",functionMenuMap);
addNewFunctionMenu(poutOut, "outSetting", "出库策略", "outSetting", "system/outSetting/index", "outSet",functionMenuMap);
addNewFunctionMenu(1,out,"checkOut", "UID出库", "singleOuput", "neolight/singleOuput/index","export1",functionMenuMap);
addNewFunctionMenu(2, out,"tacticsOuput", "PN出库", "tacticsOuput", "neolight/tacticsOuput/index", "tacticsOuput",functionMenuMap);
addNewFunctionMenu(1,poutOut,"workOrder", "工单出库","workOrder", "neolight/workOrder/index","orderOut",functionMenuMap);
addNewFunctionMenu(2,poutOut,"posOutput", "库位出库", "posOutput", "system/posOutput/index", "swagger",functionMenuMap);
addNewFunctionMenu(3, poutOut, "labelOuput", "物料标签", "labelOuput", "neolight/labelOuput/index", "mgroup",functionMenuMap);
addNewFunctionMenu(4, poutOut, "materialBox", "料盒操作", "materialBox", "neolight/materialBox/index", "mIbox",functionMenuMap);
addNewFunctionMenu(12, poutOut, "outSetting", "出库策略", "outSetting", "system/outSetting/index", "outSet",functionMenuMap);
// Menu orderSet = new Menu(, "orderSetting", "工单设置", "orderSetting", "system/orderSetting/index", "sysSet");
addNewFunctionMenu(poutOut, "inList", "入库单", "inList", "system/inList/index", "headIcon",functionMenuMap);
addNewFunctionMenu(poutOut, "putIn", "物料入库", "putIn", "system/putIn/index", "headIcon",functionMenuMap);
addNewFunctionMenu(5, poutOut, "inList", "入库单", "inList", "system/inList/index", "headIcon",functionMenuMap);
addNewFunctionMenu(6, poutOut, "putIn", "物料入库", "putIn", "system/putIn/index", "headIcon",functionMenuMap);
addNewFunctionMenu(poutOut, "dumpWarehousing", "转储入库", "dumpWarehousing", "system/dumpWarehousing/index", "headIcon",functionMenuMap);
addNewFunctionMenu(poutOut, "singleDiskWarehousing", "单盘入库", "singleDiskWarehousing", "system/singleDiskWarehousing/index", "headIcon",functionMenuMap);
addNewFunctionMenu(poutOut, "sluggishMaterials", "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index", "sMaterial",functionMenuMap);
addNewFunctionMenu(poutOut, "safetyInventory", "安全库存", "safetyInventory", "system/safetyInventory/index", "safeInventory",functionMenuMap);
addNewFunctionMenu(7, poutOut, "dumpWarehousing", "转储入库", "dumpWarehousing", "system/dumpWarehousing/index", "headIcon",functionMenuMap);
addNewFunctionMenu(8, poutOut, "singleDiskWarehousing", "单盘入库", "singleDiskWarehousing", "system/singleDiskWarehousing/index", "headIcon",functionMenuMap);
addNewFunctionMenu(9, poutOut, "sluggishMaterials", "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index", "sMaterial",functionMenuMap);
addNewFunctionMenu(10,poutOut, "safetyInventory", "安全库存", "safetyInventory", "system/safetyInventory/index", "safeInventory",functionMenuMap);
//MSD管理：MSD库存.MSD追溯性.MSD设置
Menu msd = Menu.CreatePMenu("MSD管理", 2, "msd", 2, "MSD",null);
addNewFunctionMenu(msd, "msdManage", "MSD库存", "msdManage", "neolight/msdManage/index", "MSDManager",functionMenuMap);
addNewFunctionMenu(msd, "msdData", "MSD追溯性", "msdData", "neolight/msdData/index", "MSDData",functionMenuMap);
addNewFunctionMenu(msd, "msdSetting", "MSD设置", "msdSetting", "neolight/msdSetting/index", "MSDSet",functionMenuMap);
addNewFunctionMenu(21, msd, "msdManage", "MSD库存", "msdManage", "neolight/msdManage/index", "MSDManager",functionMenuMap);
addNewFunctionMenu(22, msd, "msdData", "MSD追溯性", "msdData", "neolight/msdData/index", "MSDData",functionMenuMap);
addNewFunctionMenu(23, msd, "msdSetting", "MSD设置", "msdSetting", "neolight/msdSetting/index", "MSDSet",functionMenuMap);
//锡膏管理:设备概览.库存.追溯性.设置
Menu solderPaste = Menu.CreatePMenu("锡膏管理", 3, "solderPaste", 2, "sMana",null);
addNewFunctionMenu(solderPaste, "solderPasteKanban", "设备概览","solderPasteKanban", "neolight/solderPasteKanban/index","sKanban",functionMenuMap);
addNewFunctionMenu(solderPaste, "solderPasteManage", "库存", "solderPasteManage", "neolight/solderPasteManage/index","solder",functionMenuMap);
addNewFunctionMenu(solderPaste, "solderPasteData", "追溯性", "solderPasteData", "neolight/solderPasteData/index","sData",functionMenuMap);
addNewFunctionMenu(solderPaste,"solderPasteSetting", "设置", "solderPasteSetting", "neolight/solderPasteSetting/index","system",functionMenuMap);
addNewFunctionMenu(31, solderPaste, "solderPasteKanban", "设备概览","solderPasteKanban", "neolight/solderPasteKanban/index","sKanban",functionMenuMap);
addNewFunctionMenu(32,solderPaste, "solderPasteManage", "库存", "solderPasteManage", "neolight/solderPasteManage/index","solder",functionMenuMap);
addNewFunctionMenu(33, solderPaste, "solderPasteData", "追溯性", "solderPasteData", "neolight/solderPasteData/index","sData",functionMenuMap);
addNewFunctionMenu(34,solderPaste,"solderPasteSetting", "设置", "solderPasteSetting", "neolight/solderPasteSetting/index","system",functionMenuMap);
//档案管理：元器件
Menu pMenuWl = Menu.CreatePMenu("档案管理", 4, "materiel ", 2, "BOM",null);
addNewFunctionMenu(pMenuWl,"component:list", "元器件","componentParts", "parts/component/index","server",functionMenuMap);
addNewFunctionMenu(41, pMenuWl,"component:list", "元器件","componentParts", "parts/component/index","server",functionMenuMap);
//条形码:条码管理,条码设置
Menu pMenuBarcode = Menu.CreatePMenu("条形码", 5, "barcodes ", 2, "barcodeMenu",null);
addNewFunctionMenu(pMenuBarcode, "barcode:list", "条码管理", "barcode", "barcode/barcode/index","chart",functionMenuMap);
addNewFunctionMenu(pMenuBarcode, "barcode", "条码设置","barcodeSetting", "system/barcodeSetting/index", "barcode",functionMenuMap);
addNewFunctionMenu(51,pMenuBarcode, "barcode:list", "条码管理", "barcode", "barcode/barcode/index","chart",functionMenuMap);
addNewFunctionMenu(52, pMenuBarcode, "barcode", "条码设置","barcodeSetting", "system/barcodeSetting/index", "barcode",functionMenuMap);
//日志管理：物料日志
Menu pMenuLog = Menu.CreatePMenu("日志管理", 6, "log", 2, "log",null);
addNewFunctionMenu(pMenuLog, "taskLog", "物料日志", "taskLog", "neolight/taskLog/index", "education",functionMenuMap);
addNewFunctionMenu(pMenuLog, "message", "消息查询", "message", "neolight/message/index", "messagefind",functionMenuMap);
addNewFunctionMenu(pMenuLog, "interfaceException", "接口异常", "interfaceException", "neolight/interfaceException/index", "messagefind",functionMenuMap);
addNewFunctionMenu(61, pMenuLog, "taskLog", "物料日志", "taskLog", "neolight/taskLog/index", "education",functionMenuMap);
addNewFunctionMenu(62, pMenuLog, "message", "消息查询", "message", "neolight/message/index", "messagefind",functionMenuMap);
addNewFunctionMenu(63, pMenuLog, "interfaceException", "接口异常", "interfaceException", "neolight/interfaceException/index", "messagefind",functionMenuMap);
//报表：出入库、库存
Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report", 2, "inOutData",null);
addNewFunctionMenu(pMenuReport, "inOutData", "出入库", "inOutData", "neolight/inOutData/index", "outPut",functionMenuMap);
addNewFunctionMenu(pMenuReport,"inventory", "库存", "inventory", "neolight/inventory/index", "inventory",functionMenuMap);
addNewFunctionMenu(71, pMenuReport, "inOutData", "出入库", "inOutData", "neolight/inOutData/index", "outPut",functionMenuMap);
addNewFunctionMenu(72, pMenuReport,"inventory", "库存", "inventory", "neolight/inventory/index", "inventory",functionMenuMap);
//可观测性：物料追踪
Menu guanceMenu = Menu.CreatePMenu("可观测性", 8, "observability", 2, "scanKey",null);
addNewFunctionMenu(guanceMenu, "materialChart", "物料追踪", "materialChart", "neolight/materialChart/index", "maChart",functionMenuMap);
addNewFunctionMenu(81,guanceMenu, "materialChart", "物料追踪", "materialChart", "neolight/materialChart/index", "maChart",functionMenuMap);
//物联网：共享文件夹
Menu pMenuWulian = Menu.CreatePMenu("物联网", 9, "internet", 2, "interMenu",null);
addNewFunctionMenu(pMenuWulian, "orderSetting", "共享文件夹", "orderSetting", "system/orderSetting/index", "sysSet",functionMenuMap);
addNewFunctionMenu(91,pMenuWulian, "orderSetting", "共享文件夹", "orderSetting", "system/orderSetting/index", "sysSet",functionMenuMap);
//设置：料仓管理，菜单管理
Menu poutSet = Menu.CreatePMenu("设置", 10, "system", 2, "system",null);
addNewFunctionMenu(poutSet, "storage:list", "设备管理", "bunker", "storage/storage/index", "database",functionMenuMap);
addNewFunctionMenu(poutSet, "storagePos:list", "库位管理", "storagePos", "storagePos/storagePos/index", "tree-table",functionMenuMap);
addNewFunctionMenu(poutSet, "menu:list", "菜单管理", "menu", "system/menu/index", "menu",functionMenuMap);
addNewFunctionMenu(101, poutSet, "storage:list", "设备管理", "bunker", "storage/storage/index", "database",functionMenuMap);
addNewFunctionMenu(102,poutSet, "storagePos:list", "库位管理", "storagePos", "storagePos/storagePos/index", "tree-table",functionMenuMap);
addNewFunctionMenu(103, poutSet, "menu:list", "菜单管理", "menu", "system/menu/index", "menu",functionMenuMap);
// Menu sysSetting = new Menu(, "barcode", "条码设置", "barcodeSetting", "system/barcodeSetting/index", "database");
// Menu outSet = new Menu(, "outSetting", "出库策略", "outSetting", "system/outSetting/index", "outSet");
addNewFunctionMenu(poutSet, "sysSetting", "系统设置", "sysSetting", "system/sysSetting/index", "sysSet",functionMenuMap);
addNewFunctionMenu(poutSet, "translation", "资源翻译", "translation", "system/translation/index", "translation",functionMenuMap);
addNewFunctionMenu(104,poutSet, "sysSetting", "系统设置", "sysSetting", "system/sysSetting/index", "sysSet",functionMenuMap);
addNewFunctionMenu(105,poutSet, "translation", "资源翻译", "translation", "system/translation/index", "translation",functionMenuMap);
// Menu orderSet = new Menu(, "orderSetting", "工单设置", "orderSetting", "system/orderSetting/index", "sysSet");
addNewFunctionMenu(poutSet, "shelfSetting", "料架设置", "shelfSetting", "system/shelfSetting/index", "translation",functionMenuMap);
addNewFunctionMenu(106,poutSet, "shelfSetting", "料架设置", "shelfSetting", "system/shelfSetting/index", "translation",functionMenuMap);
//用户管理：用户管理，角色管理
Menu pMenuUser = Menu.CreatePMenu("用户管理", 11, "userManager", 2, "Steve-Jobs", null);
addNewFunctionMenu(pMenuUser,"user:list", "用户管理", "peoples", "system/user/index", "peoples",functionMenuMap);
addNewFunctionMenu(pMenuUser,"role:list", "角色管理", "role", "system/role/index", "role",functionMenuMap);
addNewFunctionMenu(111, pMenuUser,"user:list", "用户管理", "peoples", "system/user/index", "peoples",functionMenuMap);
addNewFunctionMenu(112, pMenuUser,"role:list", "角色管理", "role", "system/role/index", "role",functionMenuMap);
Menu helpAbout = Menu.CreatePMenu("帮助", 12, "help", 2, "help",null);
addNewFunctionMenu(helpAbout, "instruction", "说明书", "instruction", "system/instruction/index","aboutBook",functionMenuMap);
addNewFunctionMenu(helpAbout, "about", "关于","about", "system/about/index","message",functionMenuMap);
addNewFunctionMenu(121, helpAbout, "instruction", "说明书", "instruction", "system/instruction/index","aboutBook",functionMenuMap);
addNewFunctionMenu(122, helpAbout, "about", "关于","about", "system/about/index","message",functionMenuMap);
return functionMenuMap;
}
......
src/main/java/com/neotel/smfcore/core/device/enums/BOX_STATUS.java
......@@ -104,4 +104,9 @@ public class BOX_STATUS {
* 22 搅拌完成放回原来的仓中
*/
public final static int MIX_END = 22;
/**
* 23出库失败(放到料仓门口后,未检测到有料盘)
*/
public final static int OUT_FAILED = 23;
}
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java
......@@ -120,6 +120,15 @@ public class NLPShelfHandler extends BaseDeviceHandler{
}
StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
if (pos != null) {
throw new ValidateException("smfcore.materialBox.inPos", "物料已在库位{0}中", new String[]{pos.getPosName()});
}
if (barcode.getAmount() <= 0) {
throw new ValidateException("smfcore.error.barcode.wrongQty", "条码[{0}]对应的数量<=0为: {1}" , new String[]{barcode.getBarcode(), barcode.getAmount() + ""});
}
Date expireDate = barcode.getExpireDate();
if (expireDate != null) {
if (System.currentTimeMillis() > expireDate.getTime()) {
......
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
......@@ -291,13 +291,12 @@ public class BoxKanbanController {
List<String> allhasReelPosErrorList=new ArrayList<>();
List<String> allnoReelPosErrorList = new ArrayList<>();
for (String cid :
cids) {
for (String cid : cids) {
List<List<String>> objects = DevicesStatusUtil.getDeviceData(cid);
// List<String> hasReelPosErrorList =new ArrayList<>();
// List<String> noReelPosErrorList =new ArrayList<>();
List<String> hasReelPosErrorList =Arrays.asList(new String[]{"4D1112AA0014","4D0603BB0012","4D0303AA0015"});
List<String> noReelPosErrorList =Arrays.asList(new String[]{"4D0601AA0002","4D0601BB0001","4D0601BB0003"});
List<String> hasReelPosErrorList =new ArrayList<>();
List<String> noReelPosErrorList =new ArrayList<>();
// List<String> hasReelPosErrorList =Arrays.asList(new String[]{"4D1112AA0014","4D0603BB0012","4D0303AA0015"});
// List<String> noReelPosErrorList =Arrays.asList(new String[]{"4D0601AA0002","4D0601BB0001","4D0601BB0003"});
if(objects!=null&&objects.size()==2){
hasReelPosErrorList = objects.get(0);
noReelPosErrorList = objects.get(1);
......
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
......@@ -91,6 +91,13 @@ public class StoragePosController {
if (criteria.getStorageIdList() != null && criteria.getStorageIdList().contains("0")) {
criteria.setStorageIdList(null);
}
String blurry = criteria.getBlurry();
if(!Strings.isNullOrEmpty(blurry)){
//去除库位中的SOxxxx
blurry = blurry.substring(blurry.indexOf("-")+1);
criteria.setBlurry(blurry);
}
Query query = QueryHelp.getQuery(criteria);
PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
......
src/main/java/com/neotel/smfcore/custom/siemens/SiemensApi.java
......@@ -177,8 +177,8 @@ public class SiemensApi extends BaseSmfApiListener {
}
throw new ValidateException("siemens.barcode.failed","SIEMENS验证条码["+codeStr+"]失败");
} catch (Exception ex) {
log.info("siemensCheckCode 验证条码 [" + codeStr + "] 出错：", ex);
throw new ValidateException("siemens.barcode.error","SIEMENS条码验证出错:" + ex.getMessage());
log.info("siemensCheckCode 验证条码 [" + codeStr + "] 出错："+ ex.getMessage());
throw new ValidateException("siemens.barcode.error", ex.getMessage());
}
}
......
src/main/resources/config/application-dev.yml
#配置数据源
spring:
data:
mongodb:
host: localhost # 主机地址
port: 27017 # 端口
database: smf # 数据库
# 登录相关配置
login:
......
src/main/resources/config/application-prod.yml
......@@ -7,6 +7,14 @@ login:
# 是否限制单用户登录
single-login: false
#配置数据源
spring:
data:
mongodb:
host: localhost # 主机地址
port: 27017 # 端口
database: smf # 数据库
#jwt
jwt:
header: Authorization
......
src/main/resources/config/application.yml
......@@ -2,11 +2,10 @@ server:
port: 8800
api:
#name: DaLu
#inCheckUrl: DaLu
#outNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/OutBox
#inNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/InBox
name: Siemens
inCheckUrl: http://cnctu04053:8014/api/JsonC
outNotifyUrl: http://cnctu04053:8014/api/JsonC
inNotifyUrl: http://cnctu04053:8014/api/JsonC
# 文件存储路径
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!