1.扫码清空库存信息

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

@@ -1152,7 +1152,7 @@ public class TaskService {
     /**
     /**
      * 出库完成
      * 出库完成
      */
      */
-    private void checkoutFinished(DataLog task) throws ValidateException {
+    public void checkoutFinished(DataLog task) throws ValidateException {
 
 
         boolean isCancelTask = task.isCancel();
         boolean isCancelTask = task.isCancel();
         StoragePos storagePos = storagePosManager.get(task.getPosId());
         StoragePos storagePos = storagePosManager.get(task.getPosId());

src/main/java/com/neotel/smfcore/custom/Jkem21481/controller/UmExportSettingController.java

@@ -7,6 +7,8 @@ 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_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.storage.service.manager.IStoragePosManager;
+import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
@@ -49,6 +51,9 @@ public class UmExportSettingController {
     @Autowired
     @Autowired
     private IDataLogManager dataLogManager;
     private IDataLogManager dataLogManager;
 
 
+    @Autowired
+    private IStoragePosManager storagePosManager;
+
 
 
     @ApiOperation("获取平板上出料口设置")
     @ApiOperation("获取平板上出料口设置")
     @RequestMapping("/getUmSetting")
     @RequestMapping("/getUmSetting")
@@ -121,12 +126,24 @@ public class UmExportSettingController {
                 }
                 }
             }
             }
         }
         }
-        if (dataLog != null){
-            log.info(barcodeStr+"对应的出库任务不为空,直接修改为完成");
+        if (dataLog != null) {
+            log.info(barcodeStr + "对应的出库任务不为空,直接修改为完成");
+            StoragePos storagePos = storagePosManager.get(dataLog.getPosId());
+            if (storagePos != null) {
+                Barcode posBarcode = storagePos.getBarcode();
+                if (posBarcode != null) {
+                    taskService.checkoutFinished(dataLog);
+                } else {
                     dataLog.setStatus(OP_STATUS.FINISHED.name());
                     dataLog.setStatus(OP_STATUS.FINISHED.name());
                     taskService.moveTaskToFinished(dataLog);
                     taskService.moveTaskToFinished(dataLog);
                     taskService.updateFinishedTask(dataLog);
                     taskService.updateFinishedTask(dataLog);
                 }
                 }
+            } else {
+                dataLog.setStatus(OP_STATUS.FINISHED.name());
+                taskService.moveTaskToFinished(dataLog);
+                taskService.updateFinishedTask(dataLog);
+            }
+        }
 
 
         StorageExportOutDetailDto dto = StorageExportUtil.getFeederByBarcode(barcodeStr);
         StorageExportOutDetailDto dto = StorageExportUtil.getFeederByBarcode(barcodeStr);
         if (dto != null){
         if (dto != null){