1.回库问题提交

src/main/java/com/neotel/smfcore/custom/Jkem21481/manager/impl/ReturnStorageManagerImpl.java

@@ -80,34 +80,37 @@ public class ReturnStorageManagerImpl implements IReturnStorageManager {
     @Override
     @Override
     public void saveOrUpdateReturnStorage(DataLog task) {
     public void saveOrUpdateReturnStorage(DataLog task) {
 
 
+        if (!task.isNeedReturnStorage()) {
+            return;
+        }
+
         //找到最后一个任务
         //找到最后一个任务
         DataLog dataLog = dataLogManager.findOne(new Query(
         DataLog dataLog = dataLogManager.findOne(new Query(
                 Criteria.where("barcode").is(task.getBarcode())
                 Criteria.where("barcode").is(task.getBarcode())
                         .and("type").is(OP.CHECKOUT)
                         .and("type").is(OP.CHECKOUT)
                 //.and("posName").exists(true).ne("")
                 //.and("posName").exists(true).ne("")
         ).with(Sort.by(Sort.Direction.DESC, "updateDate")));
         ).with(Sort.by(Sort.Direction.DESC, "updateDate")));
+
         if (dataLog != null) {
         if (dataLog != null) {
             log.info(dataLog.getBarcode() + "找到上一个任务,对应的工单号为:" + dataLog.getStorageName() + "任务状态为:" + dataLog.getStatus() + ",上次出库的任务数量为:" + dataLog.getNum());
             log.info(dataLog.getBarcode() + "找到上一个任务,对应的工单号为:" + dataLog.getStorageName() + "任务状态为:" + dataLog.getStatus() + ",上次出库的任务数量为:" + dataLog.getNum());
             //判断是否需要回库
             //判断是否需要回库
             if (dataLog.isCheckOutTask() && dataLog.isFinished()) {
             if (dataLog.isCheckOutTask() && dataLog.isFinished()) {
-                if (dataLog.isNeedReturnStorage()) {
-                    //判断两次的partNumber是否相同,如果不同,则跳过
-                    if (task.getPartNumber().equals(dataLog.getPartNumber())) {
-                        String sourceId = dataLog.getSourceId();
-                        if (StringUtils.isNotEmpty(sourceId)) {
-                            //开始保存任务
-                            String sourceName = dataLog.getSourceName();
-                            ReturnStorage returnStorage = new ReturnStorage(sourceName
-                                    , dataLog.getPartNumber()
-                                    , task.getBarcode()
-                                    , dataLog.getMpn()
-                                    , dataLog.getAppendData("feederInfo")
-                                    , dataLog.getNum()
-                                    , dataLog.getNum() - task.getNum()
-                                    , task.getNum()
-                            );
-                            returnStorageDao.save(returnStorage);
-                        }
+                //判断两次的partNumber是否相同,如果不同,则跳过
+                if (task.getPartNumber().equals(dataLog.getPartNumber())) {
+                    String sourceId = dataLog.getSourceId();
+                    if (StringUtils.isNotEmpty(sourceId)) {
+                        //开始保存任务
+                        String sourceName = dataLog.getSourceName();
+                        ReturnStorage returnStorage = new ReturnStorage(sourceName
+                                , dataLog.getPartNumber()
+                                , task.getBarcode()
+                                , dataLog.getMpn()
+                                , dataLog.getAppendData("feederInfo")
+                                , dataLog.getNum()
+                                , dataLog.getNum() - task.getNum()
+                                , task.getNum()
+                        );
+                        returnStorageDao.save(returnStorage);
                     }
                     }
                 }
                 }
             }
             }