看板显示修改

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -6,6 +6,7 @@ import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
+import com.neotel.smfcore.common.utils.StringUtils;
 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.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
@@ -149,24 +150,6 @@ public class BoxKanbanController {
 
 
     }
     }
 
 
-//    private List<String> getCidsByGroupId(String groupId,boolean nullReturnAll){
-//        List<String> cidList = Lists.newArrayList();
-//
-//        for (Storage storage : dataCache.getAllStorage().values()) {
-//            if (groupId!=null) {
-//                String storageGroupId = storage.getGroupId();
-//                if(ObjectUtils.isEmpty(storageGroupId)){
-//                    storageGroupId="";
-//                }
-//                if ( storageGroupId.equals(groupId)) {
-//                    cidList.add(storage.getCid());
-//                }
-//            } else if(nullReturnAll){
-//                cidList.add(storage.getCid());
-//            }
-//        }
-//        return cidList;
-//    }
 
 
     private BoxKanbanDto getKanBan(List<DataLog> allTasks) {
     private BoxKanbanDto getKanBan(List<DataLog> allTasks) {
 
 
@@ -209,12 +192,13 @@ public class BoxKanbanController {
         }
         }
         int allCount = inTask + outTask;
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getCid(), storage.getName(), false, 0,
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getCid(), storage.getName(), false, 0,
-                "11.11", "22.22", "", allCount, inTask, outTask,
-                1, OP_STATUS.EXECUTING.toString(), "库位号", "条码", "PN", "工单名称");
+                "0", "0", "", allCount, inTask, outTask,
+                0, "", "", "", "", "");
 
 
         //获取设备状态，设置状态和当前任务信息
         //获取设备状态，设置状态和当前任务信息
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
         if (bean == null || bean.getBoxStatus() == null) {
         if (bean == null || bean.getBoxStatus() == null) {
+
             boxDto.setOnLine(false);
             boxDto.setOnLine(false);
         } else {
         } else {
             if (bean.timeOut()) {
             if (bean.timeOut()) {
@@ -229,6 +213,18 @@ public class BoxKanbanController {
                 boxDto.setTemperature(temperature);
                 boxDto.setTemperature(temperature);
                 boxDto.setStatus(bean.getStatus());
                 boxDto.setStatus(bean.getStatus());
                 boxDto.setMsg(bean.getMsg());
                 boxDto.setMsg(bean.getMsg());
+                boxDto.setBarcode(bean.getCode());
+                boxDto.setPosName(bean.getPosId());
+
+                if(!StringUtils.isEmpty(bean.getPosId())) {
+                    DataLog task = taskService.findExecutingTask(storage.getCid(), bean.getPosId());
+                    if (task != null) {
+                        boxDto.setPartNumber(task.getPartNumber());
+                        boxDto.setSourceName(task.getSourceName());
+                        boxDto.setCurrTaskType(task.getType());
+                        boxDto.setCurrTaskStatus(task.getStatus());
+                    }
+                }
 
 
                 break;
                 break;