还原补箱,bug提交

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

@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
+import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.LiteOrderCache;
@@ -123,7 +124,7 @@ public class RestoreReplaceController {
         String ticketCode = orderItem.getTicketCode();
         String ticketCode = orderItem.getTicketCode();
 
 
         //如果不是完成的任务,则改成FINISHED
         //如果不是完成的任务,则改成FINISHED
-        if (dataLog.isFinished()){
+        if (!dataLog.isFinished()){
             dataLog.setStatus(OP_STATUS.FINISHED.name());
             dataLog.setStatus(OP_STATUS.FINISHED.name());
             dataLog.setOperator("还原补箱");
             dataLog.setOperator("还原补箱");
             taskService.updateFinishedTask(dataLog);
             taskService.updateFinishedTask(dataLog);
@@ -158,7 +159,12 @@ public class RestoreReplaceController {
 
 
         if (pos != null){
         if (pos != null){
             Storage storage = dataCache.getStorageById(pos.getStorageId());
             Storage storage = dataCache.getStorageById(pos.getStorageId());
-            taskService.addPutInTaskToExecute(storage,pos.getBarcode(),pos, TaskLocUtil.MW);
+            DataLog newDataLog = new DataLog(storage, pos.getBarcode(), pos);
+            newDataLog.setOperator("还原补箱");
+            newDataLog.setType(OP.CHECKOUT);
+            newDataLog.setLoc(TaskLocUtil.MW);
+            newDataLog.setSourceName(dataLog.getSourceName());
+            taskService.addTaskToExecute(newDataLog);
         }
         }
 
 
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");