修改：锡膏料仓重复生成出库任务。

src/main/java/com/neotel/smfcore/core/solder/util/SolderBoxCache.java

@@ -178,7 +178,6 @@ public class SolderBoxCache {
                                 if(now >= needOutStartTime){
                                 if(now >= needOutStartTime){
                                     createOutTask(storagePos);
                                     createOutTask(storagePos);
 
 
-                                    saveSolderLog(storagePos);
                                 }
                                 }
                             }
                             }
 
 
@@ -196,34 +195,47 @@ public class SolderBoxCache {
      * 创建出库任务
      * 创建出库任务
      * @param storagePos
      * @param storagePos
      */
      */
-    private void createOutTask(StoragePos storagePos) throws ValidateException {
+    private boolean createOutTask(StoragePos storagePos) throws ValidateException {
         Barcode barcode = storagePos.getBarcode();
         Barcode barcode = storagePos.getBarcode();
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         for (DataLog queueTask : queueTasks) {
         for (DataLog queueTask : queueTasks) {
-            if(queueTask.getBarcode().equals(barcode.getBarcode())){
+            if (queueTask.getBarcode().equals(barcode.getBarcode())) {
                 //已经有任务,返回
                 //已经有任务,返回
-                return;
+                return false;
+            }
+        }
+
+        //如果有刚刚完成的出库任务，也不生成
+        Collection<DataLog> finishedTasks = taskService.getFinishedTasks();
+        for (DataLog queueTask : finishedTasks) {
+            if (queueTask.getBarcode().equals(barcode.getBarcode()) && queueTask.isCheckOutTask() && queueTask.isFinished()) {
+                //有刚刚完成的出库任务，暂不生成
+                return false;
             }
             }
         }
         }
         log.info(barcode.getBarcode() + "创建出库任务");
         log.info(barcode.getBarcode() + "创建出库任务");
         Storage storage = dataCache.getStorageById(storagePos.getStorageId());
         Storage storage = dataCache.getStorageById(storagePos.getStorageId());
-        DataLog outTask = new DataLog(storage,barcode, storagePos);
+        DataLog outTask = new DataLog(storage, barcode, storagePos);
         outTask.setType(OP.CHECKOUT);
         outTask.setType(OP.CHECKOUT);
         outTask.setMixTime(barcode.getMixTime());
         outTask.setMixTime(barcode.getMixTime());
         //如果已过期，标记为过期物料出库
         //如果已过期，标记为过期物料出库
         if (barcode.getExpireDate() != null && barcode.getExpireDate().before(new Date())) {
         if (barcode.getExpireDate() != null && barcode.getExpireDate().before(new Date())) {
 //            String outMsg = "过期物料出库";
 //            String outMsg = "过期物料出库";
-            String outMsg= MessageUtils.getText("smfcore.spbox.expireOut",MessageUtils.getDefaultLocal(),"过期物料出库");
-            outTask.updateAppendData("ngMsg",outMsg);
+            String outMsg = MessageUtils.getText("smfcore.spbox.expireOut", MessageUtils.getDefaultLocal(), "过期物料出库");
+            outTask.updateAppendData("ngMsg", outMsg);
         }
         }
         //outTask = dataLogDao.save(outTask);
         //outTask = dataLogDao.save(outTask);
         taskService.addTaskToExecute(outTask);
         taskService.addTaskToExecute(outTask);
-
-        //更改状态
-//        barcode.setSolderStatus(StorageConstants.SOLDER_STATUS.OUTING);
+//        //更改状态
+//        barcode.setSolderStatus(SOLDER_STATUS.OUTING.name());
 //        barcode = barcodeManager.save(barcode);
 //        barcode = barcodeManager.save(barcode);
 //        storagePos.setBarcode(barcode);
 //        storagePos.setBarcode(barcode);
 //        storagePosManager.save(storagePos);
 //        storagePosManager.save(storagePos);
+//
+//        log.info(barcode.getBarcode() + "创建出库任务完成，更改状态="+barcode.getSolderStatus());
+        saveSolderLog(storagePos);
+        return true;
+
     }
     }
 
 
     /**
     /**