Merge remote-tracking branch 'origin/smf-core-21088' into smf-core-21088

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

@@ -262,8 +262,6 @@ public class LineController {
         for (DataLog task : allTasks) {
             if (task.isCheckOutTask()  && barcode.getBarcode().equals(task.getBarcode())) {
                 log.info(boxId+"任务需要改成FINISHED");
-                soureId = task.getSourceId();
-                sourceName = task.getSourceName();
                 dataLog = task;
                 break;
             }
@@ -278,7 +276,8 @@ public class LineController {
         }
 
         if (dataLog != null) {
-
+            soureId = dataLog.getSourceId();
+            sourceName = dataLog.getSourceName();
             if (!dataLog.isFinished()){
                 dataLog.setStatus(OP_STATUS.FINISHED.name());
                 taskService.moveTaskToFinished(dataLog);