Skip to content

孙克 / smf-core

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

料串状态修改

1 个父辈 a364c784
内嵌 并排
正在显示 2 个修改的文件 包含 48 行增加 和 20 行删除
src/main/java/com/neotel/smfcore/core/equipment/service/po/Equipment.java
...@@ -28,6 +28,6 @@ public class Equipment extends BasePo implements Serializable { ...@@ -28,6 +28,6 @@ public class Equipment extends BasePo implements Serializable {
private boolean available = true; private boolean available = true;
public boolean isNEOSCAN() { public boolean isNEOSCAN() {
return EquipmentType.NEOSCAN.name().equals(type); return EquipmentType.NEOSCAN.name().equals(type)||EquipmentType.NS200.equals(type);
} }
} }
src/main/java/com/neotel/smfcore/custom/deif20861/DEIF20861Controller.java
...@@ -8,6 +8,7 @@ import com.neotel.smfcore.common.utils.StorageConstants; ...@@ -8,6 +8,7 @@ import com.neotel.smfcore.common.utils.StorageConstants;
import com.neotel.smfcore.core.device.bean.BoxStatusBean; import com.neotel.smfcore.core.device.bean.BoxStatusBean;
import com.neotel.smfcore.core.device.bean.StatusBean; import com.neotel.smfcore.core.device.bean.StatusBean;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.equipment.bean.EquipStatusBean;
import com.neotel.smfcore.core.equipment.service.po.Equipment; import com.neotel.smfcore.core.equipment.service.po.Equipment;
import com.neotel.smfcore.core.equipment.util.EquipmentCache; import com.neotel.smfcore.core.equipment.util.EquipmentCache;
import com.neotel.smfcore.core.storage.service.po.Storage; import com.neotel.smfcore.core.storage.service.po.Storage;
...@@ -52,7 +53,7 @@ public class DEIF20861Controller { ...@@ -52,7 +53,7 @@ public class DEIF20861Controller {
} }
Map<String, BoxStatusBean> boxStatusMap = statusBean.getBoxStatus(); Map<String, BoxStatusBean> boxStatusMap = statusBean.getBoxStatus();
int status = -1; int status = -1;
String shelfS = statusBean.getData().getOrDefault("shelfState", "OFFLINE"); String shelfS = statusBean.getData().getOrDefault("shelfStatus", "");
String hserial = statusBean.getData().getOrDefault("hSerial", ""); String hserial = statusBean.getData().getOrDefault("hSerial", "");
String shelfType = statusBean.getData().getOrDefault("shelfType", ""); String shelfType = statusBean.getData().getOrDefault("shelfType", "");
if (boxStatusMap != null) { if (boxStatusMap != null) {
...@@ -62,9 +63,20 @@ public class DEIF20861Controller { ...@@ -62,9 +63,20 @@ public class DEIF20861Controller {
} }
} }
if (status == StorageConstants.STATUS.OFFLINE || statusBean.timeOut()) { // OFFLINE=离线；
//离线 // IDLE=空闲;
// LOADING=入库中;
// UNLOADING=出库中;
// NEED_EMPTY=需要空料串出库;
// EMPTY_OUT=空料串需要取走
// FULL_OUT=满料串需要取走
if (status==-1|| status == StorageConstants.STATUS.OFFLINE || statusBean.timeOut()) {
//设备离线
shelfS = "OFFLINE"; shelfS = "OFFLINE";
}else{
if(ObjectUtil.isEmpty(shelfS)){
shelfS="IDLE";
}
} }
Map<String, Object> itemMap = new HashMap<>(); Map<String, Object> itemMap = new HashMap<>();
itemMap.put("cid", storage.getCid()); itemMap.put("cid", storage.getCid());
...@@ -137,6 +149,20 @@ public class DEIF20861Controller { ...@@ -137,6 +149,20 @@ public class DEIF20861Controller {
@RequestMapping("/nsShelfInfo") @RequestMapping("/nsShelfInfo")
@AnonymousAccess @AnonymousAccess
public ResultBean nsShelfInfo( @RequestBody Map<String, Object> paramMap) { public ResultBean nsShelfInfo( @RequestBody Map<String, Object> paramMap) {
// 定时通信，data需要增加料串状态
//
// * key=inShelfStatus ,表示入口料串状态：
// * key=inShelfType 表示入口料串类型 smallReel, bigReel, tray
// *
// * key=outShelfStatus ,表示出口料串状态：
// * key=outShelfType 表示出口料串类型 smallReel, bigReel, tray
// 料串状态定义 IDLE=空闲;
// LOADING=入库中;
// UNLOADING=出库中;
// NEED_EMPTY=需要空料串出库;
// EMPTY_OUT=空料串需要取走
// FULL_OUT=满料串需要取走
Collection<Equipment> storageList = Lists.newArrayList(); Collection<Equipment> storageList = Lists.newArrayList();
storageList.addAll(equipmentCache.getAllEquipment().values()); storageList.addAll(equipmentCache.getAllEquipment().values());
...@@ -145,24 +171,26 @@ public class DEIF20861Controller { ...@@ -145,24 +171,26 @@ public class DEIF20861Controller {
if(!equipment.isNEOSCAN()){ if(!equipment.isNEOSCAN()){
continue; continue;
} }
StatusBean statusBean = DevicesStatusUtil.getStatusBean(equipment.getCid()); EquipStatusBean equipStatus = EquipStatusUtil.getStatusBean(equipment.getCid());
if (statusBean == null) {
statusBean = new StatusBean();
}
Map<String, BoxStatusBean> boxStatusMap = statusBean.getBoxStatus();
int status = -1; int status = -1;
String outShelfStatus = statusBean.getData().getOrDefault("outShelfStatus ", "OFFLINE"); if (equipStatus == null) {
String inShelfStatus = statusBean.getData().getOrDefault("inShelfStatus ", "OFFLINE"); equipStatus = new EquipStatusBean();
if (boxStatusMap != null) { }else{
BoxStatusBean boxStatusBean = boxStatusMap.get("1"); status=equipStatus.getStatus();
if (boxStatusBean != null) { }
status = boxStatusBean.getStatus(); String outShelfStatus = equipStatus.getData().getOrDefault("outShelfStatus", "").toString();
} String inShelfStatus = equipStatus.getData().getOrDefault("inShelfStatus", "").toString();
} if(status==1&&(!equipStatus.timeOut())){
if (status == StorageConstants.STATUS.OFFLINE || statusBean.timeOut()) { if(ObjectUtil.isEmpty(outShelfStatus)){
//离线 outShelfStatus="IDLE";
}
if(ObjectUtil.isEmpty(inShelfStatus))
{
inShelfStatus="IDLE";
}
}else {
outShelfStatus = "OFFLINE"; outShelfStatus = "OFFLINE";
inShelfStatus="OFFLINE"; inShelfStatus = "OFFLINE";
} }
Map<String, Object> itemMap = new HashMap<>(); Map<String, Object> itemMap = new HashMap<>();
itemMap.put("cid", equipment.getCid()); itemMap.put("cid", equipment.getCid());
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!