1.uid导出,首次入库时间和当前入库时间一致问题

2.回库料号不一样,不添加到回库报表中

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -452,7 +452,7 @@ public class StoragePosController {
                     String expireDate = pos.getBarcode().getExpireDate() == null ? "" : dateFormat.format(pos.getBarcode().getExpireDate());
                     String expireDate = pos.getBarcode().getExpireDate() == null ? "" : dateFormat.format(pos.getBarcode().getExpireDate());
 
 
                     String putInTime = (pos.getBarcode().getPutInTime() == -1) ? "" : dateFormat.format(new Date(pos.getBarcode().getPutInTime()));
                     String putInTime = (pos.getBarcode().getPutInTime() == -1) ? "" : dateFormat.format(new Date(pos.getBarcode().getPutInTime()));
-                    if(ObjectUtil.isNotEmpty(putInTime)){
+                    if(ObjectUtil.isEmpty(putInTime)){
                         putInTime=dateFormat.format(pos.getBarcode().getPutInDate());
                         putInTime=dateFormat.format(pos.getBarcode().getPutInDate());
                     }
                     }
 
 

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

@@ -85,20 +85,23 @@ public class ReturnStorageManagerImpl implements IReturnStorageManager {
         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()) {
-                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);
+                    }
                 }
                 }
             }
             }
         }
         }