Skip to content

孙克 / smf-core

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

工单号SO改为WO.新增料仓接口。

1 个父辈 5fdcec33
内嵌 并排
正在显示 4 个修改的文件 包含 79 行增加 和 49 行删除
src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java
...@@ -89,31 +89,59 @@ public class StorageController { ...@@ -89,31 +89,59 @@ public class StorageController {
Query query= QueryHelp.getQuery(criteria); Query query= QueryHelp.getQuery(criteria);
PageData<Storage> pages=storageManager.findByPage(query,pageable); PageData<Storage> pages=storageManager.findByPage(query,pageable);
List<StorageDto> StorageDtos=storageMapper.toDto(pages.getContent()); 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 = ""; String groupId = "";
if (StorageDtos.get(i).getGroupId() != null && (!StorageDtos.get(i).getGroupId().isEmpty())) { if (dtoList.get(i).getGroupId() != null && (!dtoList.get(i).getGroupId().isEmpty())) {
groupId = StorageDtos.get(i).getGroupId(); groupId = dtoList.get(i).getGroupId();
} }
Group group = groupManager.get(groupId); Group group = groupManager.get(groupId);
if (group != null) { if (group != null) {
StorageDtos.get(i).setGroupName(group.getGroupName()); dtoList.get(i).setGroupName(group.getGroupName());
} else { } else {
//此料仓未分组 //此料仓未分组
StorageDtos.get(i).setGroupName(""); dtoList.get(i).setGroupName("");
if (!StorageDtos.get(i).getGroupId().equals("")) { if (!dtoList.get(i).getGroupId().equals("")) {
storageManager.updateStorageGroup(StorageDtos.get(i).getId(), ""); storageManager.updateStorageGroup(dtoList.get(i).getId(), "");
log.info("料仓[" + StorageDtos.get(i).getId() + "][" + StorageDtos.get(i).getName() + "]的组不存在，修改组为空"); 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) { 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("根据组权限返回所有料仓") @ApiOperation("根据组权限返回所有料仓")
@GetMapping(value = "/all") @GetMapping(value = "/all")
// @PreAuthorize("@el.check('storage:list')") // @PreAuthorize("@el.check('storage:list')")
...@@ -143,6 +171,38 @@ public class StorageController { ...@@ -143,6 +171,38 @@ public class StorageController {
return storageSearchDtos; 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("返回所有料仓类型") @ApiOperation("返回所有料仓类型")
@GetMapping(value = "/typeList") @GetMapping(value = "/typeList")
public List<String> typeList() { public List<String> typeList() {
...@@ -373,44 +433,11 @@ public class StorageController { ...@@ -373,44 +433,11 @@ public class StorageController {
// StoragePos posInfo = storagePosManager.getByPosName(posName); // StoragePos posInfo = storagePosManager.getByPosName(posName);
StoragePos posInfo =findFormList(storagePosList,posName); StoragePos posInfo =findFormList(storagePosList,posName);
if(posInfo == null){ if(posInfo == null){
posInfo = new StoragePos(); posInfo = new StoragePos(storageId,posName,height,width,priority);
posInfo.setPosName(posName);
posInfo.setStorageId(storageId);
posInfo.setH(height);
posInfo.setW(width);
posInfo.setPriority(priority);
Point point= PointUtil.getPosPoint(posName);
posInfo.setCoordinate(new double[]{point.getX(),point.getY()});
newRowCount++; newRowCount++;
newList.add(posInfo); newList.add(posInfo);
}else{ }else{
boolean needUpdate=false; boolean needUpdate=posInfo.updatePosInfo(storageId,posName,height,width,priority);
if(!posInfo.getPosName().equals(posName)){
needUpdate=true;
posInfo.setPosName(posName);
}
if(!posInfo.getStorageId().equals(storageId)){
needUpdate=true;
posInfo.setStorageId(storageId);
}
if(posInfo.getH()!=height){
needUpdate=true;
posInfo.setH(height);
}
if(posInfo.getW()!=width){
needUpdate=true;
posInfo.setW(width);
}
if(posInfo.getPriority()!=priority){
needUpdate=true;
posInfo.setPriority(priority);
}
Point point= PointUtil.getPosPoint(posInfo.getPosName());
if(posInfo.getCoordinate()==null||posInfo.getCoordinate().length!=2||
(posInfo.getCoordinate()[0]!=point.getX()) ||(posInfo.getCoordinate()[1]!=point.getY())){
needUpdate=true;
posInfo.setCoordinate(new double[]{point.getX(),point.getY()});
}
if(needUpdate){ if(needUpdate){
updateRowCount++; updateRowCount++;
storagePosManager.save(posInfo); storagePosManager.save(posInfo);
......
src/main/java/com/neotel/smfcore/core/storage/rest/dto/StorageDto.java
...@@ -62,4 +62,7 @@ public class StorageDto implements Serializable { ...@@ -62,4 +62,7 @@ public class StorageDto implements Serializable {
@ApiModelProperty("客户端IP") @ApiModelProperty("客户端IP")
private String clientIp; 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 { ...@@ -21,7 +21,7 @@ public class OrderSetting implements Serializable {
public String ri="RI"; 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 { ...@@ -193,14 +193,14 @@ public class SettingsController {
map.put(orderSetting.getFeeder(),"Feeder1"+i); map.put(orderSetting.getFeeder(),"Feeder1"+i);
map.put(orderSetting.getQty(),"100"+i); map.put(orderSetting.getQty(),"100"+i);
map.put(orderSetting.getRi(),""); map.put(orderSetting.getRi(),"");
map.put(orderSetting.getSo(),"SO1001" ); map.put(orderSetting.getSo(),"WO1001" );
} }
else{ else{
map.put(orderSetting.getPn(),"PN2"+i); map.put(orderSetting.getPn(),"PN2"+i);
map.put(orderSetting.getFeeder(),"Feeder2"+i); map.put(orderSetting.getFeeder(),"Feeder2"+i);
map.put(orderSetting.getQty(),"200"+i); map.put(orderSetting.getQty(),"200"+i);
map.put(orderSetting.getRi(),""); map.put(orderSetting.getRi(),"");
map.put(orderSetting.getSo(),"SO1002" ); map.put(orderSetting.getSo(),"WO1002" );
} }
maps.add(map); maps.add(map);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!