Skip to content

孙克 / smf-core

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

1

1 个父辈 360ec8c0
内嵌 并排
正在显示 3 个修改的文件 包含 21 行增加 和 26 行删除
src/main/java/com/neotel/smfcore/core/dashboard/box/SmdBoxController.java
...@@ -14,6 +14,7 @@ import com.neotel.smfcore.core.inout.service.po.InOutData; ...@@ -14,6 +14,7 @@ import com.neotel.smfcore.core.inout.service.po.InOutData;
import com.neotel.smfcore.core.message.rest.bean.mapstruct.MessageMapper; import com.neotel.smfcore.core.message.rest.bean.mapstruct.MessageMapper;
import com.neotel.smfcore.core.message.service.manager.IMessageManager; import com.neotel.smfcore.core.message.service.manager.IMessageManager;
import com.neotel.smfcore.core.msd.bean.MSDSettiings; import com.neotel.smfcore.core.msd.bean.MSDSettiings;
import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
import com.neotel.smfcore.core.storage.service.po.Storage; import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.DevicesStatusUtil; import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
...@@ -87,13 +88,6 @@ public class SmdBoxController { ...@@ -87,13 +88,6 @@ public class SmdBoxController {
if(ObjectUtil.isNotEmpty(storage.getAppendCid())){ if(ObjectUtil.isNotEmpty(storage.getAppendCid())){
cids.add(storage.getAppendCid()); cids.add(storage.getAppendCid());
} }
else if(storage.isSmdDuo()){
if(cid.equals("line-ac-05")) {
cids.add("line-ac-04");
}else if(cid.equals("line-ac-04")){
cids.add("line-ac-05");
}
}
} }
} }
Collections.sort(cids); Collections.sort(cids);
......
src/main/java/com/neotel/smfcore/core/equipment/rest/EquipViewController.java
...@@ -114,12 +114,12 @@ public class EquipViewController { ...@@ -114,12 +114,12 @@ public class EquipViewController {
} }
} }
if(dto.getShowLogs().size()<=0){ // if(dto.getShowLogs().size()<=0){
EquipMsg msg=new EquipMsg(); // EquipMsg msg=new EquipMsg();
msg.setModule("module1"); // msg.setModule("module1");
msg.setMsg("msg1111111111111111111"); // msg.setMsg("msg1111111111111111111");
dto.getShowLogs().add(msg); // dto.getShowLogs().add(msg);
} // }
if(dto.getMesInfo()==null){ if(dto.getMesInfo()==null){
MesInfoDto mesInfoDto=EquipStatusUtil.getLastAgvInfo(cid); MesInfoDto mesInfoDto=EquipStatusUtil.getLastAgvInfo(cid);
......
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
...@@ -91,6 +91,7 @@ public class BoxKanbanController { ...@@ -91,6 +91,7 @@ public class BoxKanbanController {
for (Group group : groupList) { for (Group group : groupList) {
List<BoxStatusDto> boxStatusDtos = new ArrayList<>(); List<BoxStatusDto> boxStatusDtos = new ArrayList<>();
List<String> cidList =dataCache. getCidsByGroupId(group.getId(), false); List<String> cidList =dataCache. getCidsByGroupId(group.getId(), false);
Collections.sort(cidList);
int groupType=0; int groupType=0;
for (String cid : cidList) { for (String cid : cidList) {
Storage storage=dataCache.getStorage(cid); Storage storage=dataCache.getStorage(cid);
...@@ -420,8 +421,8 @@ public class BoxKanbanController { ...@@ -420,8 +421,8 @@ public class BoxKanbanController {
// } // }
int allCount = inTask + outTask; int allCount = inTask + outTask;
BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0, BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
"0", "0","0", "", allCount, inTask, outTask, "0", "0", "0", "", allCount, inTask, outTask,
0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>(),storage.getInListName()); 0, "", "", "", "", "", storage.getType(), storage.getUsageMap(), new HashMap<>(), storage.getInListName());
//获取设备状态，设置状态和当前任务信息 //获取设备状态，设置状态和当前任务信息
StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid()); StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
...@@ -429,7 +430,7 @@ public class BoxKanbanController { ...@@ -429,7 +430,7 @@ public class BoxKanbanController {
boxDto.setOnLine(false); boxDto.setOnLine(false);
//如果是虚拟仓，默认在线 //如果是虚拟仓，默认在线
if(storage.isVirtual()){ if (storage.isVirtual()) {
boxDto.setOnLine(true); boxDto.setOnLine(true);
boxDto.setStatus(1); boxDto.setStatus(1);
} }
...@@ -482,16 +483,16 @@ public class BoxKanbanController { ...@@ -482,16 +483,16 @@ public class BoxKanbanController {
} }
} }
//如果是锡膏料仓，需要把回温区物料数量，冷藏区物料数量显示 //如果是锡膏料仓，需要把回温区物料数量，冷藏区物料数量显示
if(storage.isSolderPaste()){ if (storage.isSolderPaste()) {
Integer warmUseCount=dataCache.getSpUsePosCount(storage.getCid(),DataCache.warmPosUseCount); Integer warmUseCount = dataCache.getSpUsePosCount(storage.getCid(), DataCache.warmPosUseCount);
Integer coldingUseCount=dataCache.getSpUsePosCount(storage.getCid(),DataCache.coldingPosUseCount); Integer coldingUseCount = dataCache.getSpUsePosCount(storage.getCid(), DataCache.coldingPosUseCount);
boxDto.getData().put(DataCache.warmPosUseCount,warmUseCount.toString()); boxDto.getData().put(DataCache.warmPosUseCount, warmUseCount.toString());
boxDto.getData().put(DataCache.coldingPosUseCount,coldingUseCount.toString()); boxDto.getData().put(DataCache.coldingPosUseCount, coldingUseCount.toString());
Integer warmCount=dataCache.getSpUsePosCount(storage.getCid(),DataCache.warmPosCount); Integer warmCount = dataCache.getSpUsePosCount(storage.getCid(), DataCache.warmPosCount);
Integer coldingCount=dataCache.getSpUsePosCount(storage.getCid(),DataCache.coldingPosCount); Integer coldingCount = dataCache.getSpUsePosCount(storage.getCid(), DataCache.coldingPosCount);
boxDto.getData().put(DataCache.warmPosCount,warmCount.toString()); boxDto.getData().put(DataCache.warmPosCount, warmCount.toString());
boxDto.getData().put(DataCache.coldingPosCount,coldingCount.toString()); boxDto.getData().put(DataCache.coldingPosCount, coldingCount.toString());
} }
return boxDto; return boxDto;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!