Merge branch 'develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java

@@ -243,6 +243,10 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ
             sarItemsCompareHisEO.setCreateTime(new Date());
             sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);
         }
+        SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO();
+        sarStandCompareHisEO.setId(standHisId);
+        sarStandCompareHisEO.setCompareStatus("比对完成");
+        sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO);
         return resultMap;
     }
 
@@ -377,6 +381,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ
             sarItemsCompareHisEO.setCreateTime(new Date());
             sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);
         }
+
         return resultMap;
     }
     @Async