PN出库放料架问题修改

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -986,7 +986,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
             taskService.updateQueueTask(outTask);
             taskService.updateQueueTask(outTask);
 
 
             //如果是非工单任务，且还未绑定料架，绑定位置
             //如果是非工单任务，且还未绑定料架，绑定位置
-            if(ObjectUtil.isEmpty(outTask.getSourceName())&&ObjectUtil.isEmpty(outTask.getTempRfid())){
+            if( ObjectUtil.isEmpty(outTask.getTempRfid())){
                 TaskShelfUtil.addLoc(outTask);
                 TaskShelfUtil.addLoc(outTask);
             }
             }
             statusBean.setOp(OP.CHECKOUT);
             statusBean.setOp(OP.CHECKOUT);

src/main/java/com/neotel/smfcore/core/shelf/rest/AgvShelfController.java

@@ -125,23 +125,6 @@ public class AgvShelfController {
                 }
                 }
             }
             }
         }
         }
-//        if(result.size()<=0) {
-//            Map<String, String> shelfMap = new HashMap<>();
-//            shelfMap.put("realRfid", "rfid1");
-//            shelfMap.put("orderNo", "orderNo1");
-//            shelfMap.put("rfidIndex",  "001");
-//            shelfMap.put("line", "L1");
-//
-//            result.add(shelfMap);
-//
-//              shelfMap = new HashMap<>();
-//            shelfMap.put("realRfid", "rfid2");
-//            shelfMap.put("orderNo", "orderNo2");
-//            shelfMap.put("rfidIndex",  "002");
-//            shelfMap.put("line", "L2");
-//
-//            result.add(shelfMap);
-//        }
         ResultBean resultBean= ResultBean.newOkResult("ok" );
         ResultBean resultBean= ResultBean.newOkResult("ok" );
         resultBean.setData(result);
         resultBean.setData(result);
         return  resultBean;
         return  resultBean;

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -485,7 +485,7 @@ public class TaskService {
                     task = dataLogDao.save(task);
                     task = dataLogDao.save(task);
 
 
                     //如果是非工单任务，且还未绑定料架，绑定位置
                     //如果是非工单任务，且还未绑定料架，绑定位置
-                    if(ObjectUtil.isEmpty(task.getSourceName())&&ObjectUtil.isEmpty(task.getTempRfid())){
+                    if( ObjectUtil.isEmpty(task.getTempRfid())){
                         TaskShelfUtil.addLoc(task);
                         TaskShelfUtil.addLoc(task);
                     }
                     }
                     statusBean.setOp(OP.CHECKOUT);
                     statusBean.setOp(OP.CHECKOUT);