Skip to content

孙克 / smf-core

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

感应料架bug修改

1 个父辈 3ab70f07
内嵌 并排
正在显示 3 个修改的文件 包含 65 行增加 和 8 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/SensorShelfHandler.java
......@@ -18,6 +18,7 @@ import com.neotel.smfcore.core.device.api.IOpAuthApi;
import com.neotel.smfcore.core.device.bean.StatusBean;
import com.neotel.smfcore.core.device.enums.OP;
import com.neotel.smfcore.core.device.enums.OP_STATUS;
import com.neotel.smfcore.core.kanban.rest.bean.dto.ShelfPosErrorDto;
import com.neotel.smfcore.core.order.enums.ORDER_COLOR;
import com.neotel.smfcore.core.storage.enums.DeviceType;
import com.neotel.smfcore.core.storage.service.po.Storage;
......@@ -35,6 +36,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
......@@ -100,7 +103,7 @@ public class SensorShelfHandler extends BaseDeviceHandler {
Barcode barcodeSave = resolveBarcodeFromApiForShelf(loginUser,groupId,storageId,code);
if(barcodeSave == null){
barcodeSave = codeResolve.resolveOneValideBarcode(code);
barcodeSave = codeResolve.resolveOneValideBarcode("=1x1="+code);
}
Date expireDate = barcodeSave.getExpireDate();
......@@ -186,7 +189,7 @@ public class SensorShelfHandler extends BaseDeviceHandler {
handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean);
//亮灯
Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
Collection<DataLog> queueTasks = taskService.getAllTasksByCid(statusBean.getCid());
for (DataLog queueTask : queueTasks) {
if(queueTask.isWait()){
queueTask.setStatus(OP_STATUS.EXECUTING.name());
......@@ -203,6 +206,10 @@ public class SensorShelfHandler extends BaseDeviceHandler {
statusBean.addData("open",queueTask.getPosName()+"="+color.name());
log.info("库位["+queueTask.getPosName()+"]+亮灯:" + color.name());
}
else if(queueTask.isCancel()){
statusBean.addData("close",queueTask.getPosName() );
log.info("库位["+queueTask.getPosName()+"]+取消:" );
}
}
return statusBean;
}
......@@ -232,8 +239,41 @@ public class SensorShelfHandler extends BaseDeviceHandler {
String[] noReelPosList = request.getParameterValues("noReelPosList");
String[] hasReelPosErrorList = request.getParameterValues("hasReelPosErrorList");
String[] noReelPosErrorList = request.getParameterValues("noReelPosErrorList");
String[] hasReelPosErrorList = request.getParameterValues("hasReelPosErrorList");//实际信号有料,数据库无信息
String[] noReelPosErrorList = request.getParameterValues("noReelPosErrorList");//实际信号无料，数据库有信息
if(hasReelPosErrorList==null){
hasReelPosErrorList=new String[]{};
}
if(noReelPosErrorList==null) {
noReelPosErrorList = new String[]{};
}
List<String> ngToOk=new ArrayList<>();
// //数据库无信息，实际有料
// if(hasReelPosErrorList.length>0){
// Query query=new Query(Criteria.where("posName").in(hasReelPosErrorList));
// List<StoragePos> posList= storagePosManager.findByQuery(query);
// for (StoragePos pos:posList
// ) {
// if(pos.isUsed()){
// ngToOk.add(pos.getPosName());
// log.info("sensorChange 客户端上传 hasReelPosErrorList 库位["+pos.getPosName()+"]数据库有信息，放入ngToOk");
// }
// }
// }
//数据库有信息，实际无料
if(noReelPosErrorList.length>0){
Query query=new Query(Criteria.where("posName").in(noReelPosErrorList ));
List<StoragePos> posList= storagePosManager.findByQuery(query);
for (StoragePos pos:posList
) {
if(!pos.isUsed()){
ngToOk.add(pos.getPosName());
log.info("sensorChange 客户端上传 noReelPosErrorList 库位["+pos.getPosName()+"]数据库无信息，放入ngToOk");
}
}
}
List<List<String>> data=new ArrayList<>();
data.add(Arrays.asList(hasReelPosErrorList) );
data.add(Arrays.asList(noReelPosErrorList));
......@@ -337,6 +377,7 @@ public class SensorShelfHandler extends BaseDeviceHandler {
dataMap.put("inNgList",inNgList);
dataMap.put("outOkList",outOkList);
dataMap.put("outNgList",outNgList);
dataMap.put("ngToOk",ngToOk);
return ResultBean.newOkResult(dataMap);
}
......
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
......@@ -294,8 +294,9 @@ public class BoxKanbanController {
}
if(allhasReelPosErrorList.size()>0){
Query query=new Query(Criteria.where("posName").in(allhasReelPosErrorList.toArray()));
//数据库有信息，实际无料
if(allnoReelPosErrorList.size()>0){
Query query=new Query(Criteria.where("posName").in(allnoReelPosErrorList.toArray()));
List<StoragePos> posList= storagePosManager.findByQuery(query);
for (StoragePos pos:posList
) {
......@@ -313,8 +314,9 @@ public class BoxKanbanController {
}
}
if(allnoReelPosErrorList.size()>0){
Query query=new Query(Criteria.where("posName").in(allnoReelPosErrorList.toArray()));
//数据库无信息，实际有料
if(allhasReelPosErrorList.size()>0){
Query query=new Query(Criteria.where("posName").in(allhasReelPosErrorList.toArray()));
List<StoragePos> posList= storagePosManager.findByQuery(query);
for (StoragePos pos:posList
) {
......
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
......@@ -187,6 +187,20 @@ public class TaskService {
}
return allTasks;
}
/**
* 获取所有任务
*/
public List<DataLog> getAllTasksByCid(String cid) {
List<DataLog> allTasks = getFinishedTasks();
Collection<DataLog> queueTasks = getQueueTasks();
for (DataLog task :
queueTasks) {
if(task.getCid().equals(cid)){
allTasks.add(task);
}
}
return allTasks;
}
/**
* 获取某个料仓所有任务队列中的任务(等待中和执行中)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!