Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 7a90e3ce 由 LN
选项

1.工单出库界面调整 

2.增加：物料管理->物料入库菜 页面
3.增加：设置->料架设置 页面
1 个父辈 b91fe4c4
内嵌 并排
正在显示 11 个修改的文件 包含 106 行增加 和 23 行删除
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
......@@ -206,6 +206,7 @@ public class DataInitManager {
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 putinMenu= new Menu(new ArrayList<Menu>(), 1, "putIn", "物料入库", 1, "putIn", "system/putIn/index", "", 0, "headIcon");
......@@ -215,7 +216,7 @@ public class DataInitManager {
outSet.setHidden(true);
posOut.setHidden(true);
// orderSet.setHidden(true);
menus.addAll(createMenus(poutOut, menuOrder, out,posOut,groupOut,materialBox,outSet,inOrderMenu));
menus.addAll(createMenus(poutOut, menuOrder, out,posOut,groupOut,materialBox,outSet,inOrderMenu,putinMenu));
//MSD管理：MSD库存.MSD追溯性.MSD设置
Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
......@@ -282,12 +283,13 @@ public class DataInitManager {
Menu sysSet = new Menu(new ArrayList<Menu>(), 1, "sysSetting", "系统设置", 1, "sysSetting", "system/sysSetting/index", "", 0, "sysSet");
Menu translationSet = new Menu(new ArrayList<Menu>(), 1, "translation", "资源翻译", 1, "translation", "system/translation/index", "", 0, "translation");
// Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "工单设置", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
Menu shelfMenu = new Menu(new ArrayList<Menu>(), 1, "shelfSetting", "料架设置", 1, "shelfSetting", "system/shelfSetting/index", "", 0, "translation");
// outSet.setHidden(true);
// orderSet.setHidden(true);
menuMenu.setHidden(true);
translationSet.setHidden(true);
menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu,sysSet,translationSet));
menus.addAll(createMenus(poutSet, menuStorage, menuStoragePos, menuMenu,sysSet,translationSet,shelfMenu));
//用户管理：用户管理，角色管理
......
src/main/java/com/neotel/smfcore/core/order/enums/LITEORDER_STATUS.java
......@@ -25,13 +25,13 @@ public class LITEORDER_STATUS {
public static int CLOSED=7;
/**
* 工单状态
* 0=新建
* 1=正在出库
* 2=套料已完成
* 3=正在出库
* 0=新建的工单
* 1=正在出库(首套料正在执行)
* 2=套料已完成(首盘料已结束,等待出尾料)
* 3=正在出库(正在出尾料)
* 4=尾料已完成
* 5=正在补料
* 6=补料已完成
* 7=关闭
* 7=工单已关闭
*/
}
src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java
......@@ -89,30 +89,58 @@ public class StorageController {
Query query= QueryHelp.getQuery(criteria);
PageData<Storage> pages=storageManager.findByPage(query,pageable);
List<StorageDto> StorageDtos=storageMapper.toDto(pages.getContent());
for (int i=0;i<StorageDtos.size();i++) {
StorageDtos=updateDtos(StorageDtos);
// for (int i=0;i<StorageDtos.size();i++) {
// String groupId = "";
// if (StorageDtos.get(i).getGroupId() != null && (!StorageDtos.get(i).getGroupId().isEmpty())) {
// groupId = StorageDtos.get(i).getGroupId();
// }
// Group group = groupManager.get(groupId);
// if (group != null) {
// StorageDtos.get(i).setGroupName(group.getGroupName());
// } else {
// //此料仓未分组
// StorageDtos.get(i).setGroupName("");
// if (!StorageDtos.get(i).getGroupId().equals("")) {
// storageManager.updateStorageGroup(StorageDtos.get(i).getId(), "");
// log.info("料仓[" + StorageDtos.get(i).getId() + "][" + StorageDtos.get(i).getName() + "]的组不存在，修改组为空");
// }
//
// }
// //获取设备状态，设置状态和当前任务信息
// StatusBean bean = DevicesStatusUtil.getStatusBean(StorageDtos.get(i).getCid());
// if (bean != null && bean.getBoxStatus() != null) {
// StorageDtos.get(i).setClientIp(bean.getClientIp());
// }
// }
return new PageData(StorageDtos,pages.getTotalElements());
}
private List<StorageDto> updateDtos(List<StorageDto> dtoList){
for (int i=0;i<dtoList.size();i++) {
String groupId = "";
if (StorageDtos.get(i).getGroupId() != null && (!StorageDtos.get(i).getGroupId().isEmpty())) {
groupId = StorageDtos.get(i).getGroupId();
if (dtoList.get(i).getGroupId() != null && (!dtoList.get(i).getGroupId().isEmpty())) {
groupId = dtoList.get(i).getGroupId();
}
Group group = groupManager.get(groupId);
if (group != null) {
StorageDtos.get(i).setGroupName(group.getGroupName());
dtoList.get(i).setGroupName(group.getGroupName());
} else {
//此料仓未分组
StorageDtos.get(i).setGroupName("");
if (!StorageDtos.get(i).getGroupId().equals("")) {
storageManager.updateStorageGroup(StorageDtos.get(i).getId(), "");
log.info("料仓[" + StorageDtos.get(i).getId() + "][" + StorageDtos.get(i).getName() + "]的组不存在，修改组为空");
dtoList.get(i).setGroupName("");
if (!dtoList.get(i).getGroupId().equals("")) {
storageManager.updateStorageGroup(dtoList.get(i).getId(), "");
log.info("料仓[" + dtoList.get(i).getId() + "][" + dtoList.get(i).getName() + "]的组不存在，修改组为空");
}
}
//获取设备状态，设置状态和当前任务信息
StatusBean bean = DevicesStatusUtil.getStatusBean(StorageDtos.get(i).getCid());
StatusBean bean = DevicesStatusUtil.getStatusBean(dtoList.get(i).getCid());
if (bean != null && bean.getBoxStatus() != null) {
StorageDtos.get(i).setClientIp(bean.getClientIp());
dtoList.get(i).setClientIp(bean.getClientIp());
}
}
return new PageData(StorageDtos,pages.getTotalElements());
return dtoList;
}
@ApiOperation("根据组权限返回所有料仓")
@GetMapping(value = "/all")
......@@ -143,6 +171,37 @@ public class StorageController {
return storageSearchDtos;
}
@ApiOperation("物料入库界面，返回所有料仓")
@GetMapping(value = "/allList")
public List<StorageDto> all() {
List<Storage> storages=storageManager.findAll();
List<StorageDto> storageDtos=storageMapper.toDto(storages);
storageDtos=updateDtos(storageDtos);
return storageDtos;
}
@ApiOperation("料架设置界面，返回所有的料架列表")
@GetMapping(value = "/allShelf")
public List<StorageDto> allShelf() {
Query query=new Query(Criteria.where("type").in(new String[]{DeviceType.NLP.name(),DeviceType.NL.name() }));
List<Storage> storages=storageManager.findByQuery(query);
List<StorageDto> storageDtos= new ArrayList<>();
for (Storage storage :
storages) {
StorageDto dto=new StorageDto();
dto.setName(storage.getName());
dto.setId(storage.getId());
dto.setCid(storage.getCid());
//获取设备状态，设置状态和当前任务信息
StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
if (bean != null && bean.getBoxStatus() != null) {
dto.setClientIp(bean.getClientIp());
String url="http://"+bean.getClientIp()+":5000/";
dto.setClientUrl(url);
}
storageDtos.add(dto);
}
return storageDtos;
}
@ApiOperation("返回所有料仓类型")
@GetMapping(value = "/typeList")
public List<String> typeList() {
......
src/main/java/com/neotel/smfcore/core/storage/rest/dto/StorageDto.java
......@@ -62,4 +62,6 @@ public class StorageDto implements Serializable {
@ApiModelProperty("客户端IP")
private String clientIp;
@ApiModelProperty("客户端地址")
private String clientUrl;
}
src/main/java/com/neotel/smfcore/core/system/bean/OrderSetting.java
......@@ -21,7 +21,7 @@ public class OrderSetting implements Serializable {
public String ri="RI";
public String so="SO";
public String so="WO";
/**
* 是否显示料架亮灯方式
......
src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java
......@@ -193,14 +193,14 @@ public class SettingsController {
map.put(orderSetting.getFeeder(),"Feeder1"+i);
map.put(orderSetting.getQty(),"100"+i);
map.put(orderSetting.getRi(),"");
map.put(orderSetting.getSo(),"SO1001" );
map.put(orderSetting.getSo(),"WO1001" );
}
else{
map.put(orderSetting.getPn(),"PN2"+i);
map.put(orderSetting.getFeeder(),"Feeder2"+i);
map.put(orderSetting.getQty(),"200"+i);
map.put(orderSetting.getRi(),"");
map.put(orderSetting.getSo(),"SO1002" );
map.put(orderSetting.getSo(),"WO1002" );
}
maps.add(map);
}
......
src/main/resources/messages.properties
......@@ -227,4 +227,16 @@ smfcore.linemsg.update=\u7CFB\u7EDF\u66F4\u65B0\u4E2D,\u6682\u505C\u51FA\u5165\u
smfcore.linemsg.posLock=[{0}]\u5E93\u4F4D[{1}]\u5DF2\u88AB\u9501\u5B9A,\u6682\u505C\u5165\u5E93
smfcore.task.notExist=\u4EFB\u52A1\u4E0D\u5B58\u5728
smfcore.task.hasEnd=\u4EFB\u52A1\u5DF2\u5B8C\u6210
smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
\ No newline at end of file
smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
smfcore.putIn=\u7269\u6599\u5165\u5E93
smfcore.shelfSetting=\u6599\u67B6\u8BBE\u7F6E
#smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
#smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
#smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
#smfclient.nlp.outputOk={0}\u4ECE{1}\u51FA\u5E93\u6210\u529F
#smfclient.nlp.noOutTask=\u672A\u627E\u5230[{0}]\u7684\u51FA\u5E93\u4EFB\u52A1
#smfclient.nlp.error=\u51FA\u9519\uFF1A{0}
#smfclient.loadMaterialFinished=loading material is finished: {0}
#smfclient.loadMaterialFailed=loading material failed:{0}
#smfclient.checkingMaterialOk=checking material is ok:{0}
#smfclient.checkNg=checking material is ng:{0}
\ No newline at end of file
src/main/resources/messages_en_US.properties
......@@ -228,4 +228,6 @@ smfcore.linemsg.posLock=The [{0}] storage space [{1}] has been locked, suspend s
smfcore.task.notExist=Task does not exist
smfcore.task.hasEnd=Mission completed
smfcore.task.hasCancel={0}'s outgoing task [{1}] has been cancelled
smfcore.putIn=Material Check-In
smfcore.shelfSetting=Rack set
src/main/resources/messages_ja_JP.properties
......@@ -228,4 +228,6 @@ smfcore.linemsg.posLock=[{0}] \u30B9\u30C8\u30EC\u30FC\u30B8\u30B9\u30DA\u30FC\u
smfcore.task.notExist=\u30DF\u30C3\u30B7\u30E7\u30F3\u304C\u5B58\u5728\u3057\u306A\u3044
smfcore.task.hasEnd=\u30DF\u30C3\u30B7\u30E7\u30F3\u9054\u6210
smfcore.task.hasCancel={0}\u306E\u9001\u4FE1\u30BF\u30B9\u30AF[{1}]\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
smfcore.putIn=\u5728\u5EAB\u306E\u3042\u308B\u7D20\u6750
smfcore.shelfSetting=\u7D20\u6750\u30E9\u30C3\u30AF\u306E\u8A2D\u5B9A
src/main/resources/messages_zh_CN.properties
......@@ -227,4 +227,6 @@ smfcore.linemsg.update=\u7CFB\u7EDF\u66F4\u65B0\u4E2D,\u6682\u505C\u51FA\u5165\u
smfcore.linemsg.posLock=[{0}]\u5E93\u4F4D[{1}]\u5DF2\u88AB\u9501\u5B9A,\u6682\u505C\u5165\u5E93
smfcore.task.notExist=\u4EFB\u52A1\u4E0D\u5B58\u5728
smfcore.task.hasEnd=\u4EFB\u52A1\u5DF2\u5B8C\u6210
smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
smfcore.putIn=\u7269\u6599\u5165\u5E93
smfcore.shelfSetting=\u6599\u67B6\u8BBE\u7F6E
src/main/resources/messages_zh_TW.properties
......@@ -228,3 +228,5 @@ smfcore.linemsg.posLock=[{0}]\u5EAB\u4F4D[{1}]\u5DF2\u88AB\u9396\u5B9A\uFF0C\u66
smfcore.task.notExist=\u4EFB\u52D9\u4E0D\u5B58\u5728
smfcore.task.hasEnd=\u4EFB\u52D9\u5DF2\u5B8C\u6210
smfcore.task.hasCancel=\u66F4\u65B0\u72C0\u614B\u6642{0}\u7684\u51FA\u5EAB\u4EFB\u52D9[{1}]\u5DF2\u88AB\u53D6\u6D88
smfcore.putIn=\u7269\u6599\u5165\u5EAB
smfcore.shelfSetting=\u6599\u67B6\u8A2D\u7F6E
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!