单据领料问题修改

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -380,8 +380,8 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     public StoragePos findPartNumberInStorages(List<String> storageIdList, String pn, Collection<String> excludePosIds, CHECKOUT_TYPE checkOutType, String brand,String wareHouseCode){
     public StoragePos findPartNumberInStorages(List<String> storageIdList, String pn, Collection<String> excludePosIds, CHECKOUT_TYPE checkOutType, String brand,String wareHouseCode){
         Criteria c = Criteria.where("barcode.partNumber").is(pn)
         Criteria c = Criteria.where("barcode.partNumber").is(pn)
                 .and("id").nin(excludePosIds)
                 .and("id").nin(excludePosIds)
-                .and("enabled").is(true)//可用
-                .and("barcode.lockId").is(null);//没有被锁定的仓位;
+                .and("enabled").is(true);//可用
+                //.and("barcode.lockId").is(null);//没有被锁定的仓位;
         if (storageIdList != null) {
         if (storageIdList != null) {
             c = c.and("storageId").in(storageIdList);
             c = c.and("storageId").in(storageIdList);
         }
         }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java

@@ -130,11 +130,11 @@ public class AgvDeviceController {
                 task.setStatus(statusStr);
                 task.setStatus(statusStr);
                 taskService.updateQueueTask(task);
                 taskService.updateQueueTask(task);
             } else {
             } else {
+                taskService.moveTaskToFinished(task);
                 if (!task.isOutFromPos()) {
                 if (!task.isOutFromPos()) {
                     finishedOutTask(task);
                     finishedOutTask(task);
                     //WipBoxHandleUtil.outFromPos(task);
                     //WipBoxHandleUtil.outFromPos(task);
                     task.setOutFromPos(true);
                     task.setOutFromPos(true);
-                    taskService.moveTaskToFinished(task);
                     taskService.updateFinishedTask(task);
                     taskService.updateFinishedTask(task);
                 }
                 }
                 if (OP_STATUS.FINISHED.name().equals(statusStr)) {
                 if (OP_STATUS.FINISHED.name().equals(statusStr)) {

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/LineController.java

@@ -248,12 +248,7 @@ public class LineController {
                 log.info(boxId+"任务需要改成FINISHED");
                 log.info(boxId+"任务需要改成FINISHED");
                 soureId = task.getSourceId();
                 soureId = task.getSourceId();
                 sourceName = task.getSourceName();
                 sourceName = task.getSourceName();
-                if (!task.isFinished()){
-                    task.setStatus(OP_STATUS.FINISHED.name());
-                }
                 dataLog = task;
                 dataLog = task;
-                taskService.moveTaskToFinished(task);
-                taskService.updateFinishedTask(task);
                 break;
                 break;
             }
             }
         }
         }
@@ -268,6 +263,12 @@ public class LineController {
 
 
         if (dataLog != null) {
         if (dataLog != null) {
 
 
+            if (!dataLog.isFinished()){
+                dataLog.setStatus(OP_STATUS.FINISHED.name());
+                taskService.moveTaskToFinished(dataLog);
+                taskService.updateFinishedTask(dataLog);
+            }
+
             int num = 0;
             int num = 0;
 
 
             List<DataLog> dataLogList = taskService.getAllTasks();
             List<DataLog> dataLogList = taskService.getAllTasks();