优化代码

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1413,6 +1413,8 @@ public class LiteOrderCache {
                     task.setSubSourceInfo(orderItem.getFeederInfo());
                     task.setSubSourceInfo(orderItem.getFeederInfo());
                     task.setType(OP.CHECKOUT);
                     task.setType(OP.CHECKOUT);
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setStatus(OP_STATUS.WAIT.name());
+                    task.setLoc(TaskLocUtil.OUT);
+                    task.setOdn(true);
                     taskService.addTaskToExecute(task);
                     taskService.addTaskToExecute(task);
                 }
                 }
             }
             }

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -382,6 +382,7 @@ public class DataLog extends BasePo implements Serializable {
     //任务优先级
     //任务优先级
     private int priority = 0;
     private int priority = 0;
 
 
+    private boolean odn = false;
 
 
     public String getBarcode() {
     public String getBarcode() {
         if(barcode == null){
         if(barcode == null){

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

@@ -130,7 +130,6 @@ public class AgvDeviceController {
                 task.setStatus(statusStr);
                 task.setStatus(statusStr);
                 taskService.updateQueueTask(task);
                 taskService.updateQueueTask(task);
             } else {
             } else {
-
                 if (!task.isOutFromPos()) {
                 if (!task.isOutFromPos()) {
                     finishedOutTask(task);
                     finishedOutTask(task);
                     //WipBoxHandleUtil.outFromPos(task);
                     //WipBoxHandleUtil.outFromPos(task);
@@ -138,19 +137,15 @@ public class AgvDeviceController {
                     taskService.moveTaskToFinished(task);
                     taskService.moveTaskToFinished(task);
                     taskService.updateFinishedTask(task);
                     taskService.updateFinishedTask(task);
                 }
                 }
-
-                if (!OP_STATUS.FINISHED.name().equals(statusStr)){
-                    task.setStatus(statusStr);
-                    taskService.updateFinishedTask(task);
-                }
-
-                if (OP_STATUS.FINISHED.name().equals(statusStr)){
-                    if (TaskLocUtil.MW.equals(task.getLoc())){
+                if (OP_STATUS.FINISHED.name().equals(statusStr)) {
+                    if (!task.isOdn()) {
                         task.setStatus(statusStr);
                         task.setStatus(statusStr);
                         taskService.updateFinishedTask(task);
                         taskService.updateFinishedTask(task);
                     }
                     }
+                } else {
+                    task.setStatus(statusStr);
+                    taskService.updateFinishedTask(task);
                 }
                 }
-
             }
             }
         }
         }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
@@ -180,14 +175,14 @@ public class AgvDeviceController {
 
 
         Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
         Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
         //通知WMS
         //通知WMS
-        /*PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
+        PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
         palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
         palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
         palletUpdateRequest.setPALLET_LIST(Lists.newArrayList(barcode.getPalletId()));
         palletUpdateRequest.setPALLET_LIST(Lists.newArrayList(barcode.getPalletId()));
         //上架是SWC, 下架是SWCT
         //上架是SWC, 下架是SWCT
         palletUpdateRequest.setBIN_CODE("SWCT");
         palletUpdateRequest.setBIN_CODE("SWCT");
         palletUpdateRequest.setBIZ_TYPE("M");
         palletUpdateRequest.setBIZ_TYPE("M");
         palletUpdateRequest.setPLANT_CODE(CommonUtil.plantCode);
         palletUpdateRequest.setPLANT_CODE(CommonUtil.plantCode);
-        LuxsanApi.palletUpdate(palletUpdateRequest);*/
+        LuxsanApi.palletUpdate(palletUpdateRequest);
 
 
 
 
         //已完成,从库存中清除,并且从完成队列中清除
         //已完成,从库存中清除,并且从完成队列中清除

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

@@ -40,6 +40,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -257,6 +258,14 @@ public class LineController {
             }
             }
         }
         }
 
 
+        //如果为空的话,从数据库查询
+        if (dataLog == null){
+            DataLog dbDatalog = dataLogManager.findOne(new Query(Criteria.where("barcode").is(barcode.getBarcode())).with(Sort.by(Sort.Direction.DESC,"createDate")));
+            if (dbDatalog.isCheckOutTask() && dbDatalog.isFinished() && dbDatalog.isOdn()){
+                dataLog = dbDatalog;
+            }
+        }
+
         if (dataLog != null) {
         if (dataLog != null) {
 
 
             int num = 0;
             int num = 0;