同步方法修改以修复推送锁定问题

对`SoSaleOutPluginInitializerToB`和`SoSaleReturnPluginInitializerToB`中的方法进行同步修改，以解决在推送数据到U8C系统时潜在的并发问题。现在方法在执行数据推送及验证存在性之前会进行同步锁定，以防止多线程环境下的数据冲突。

同时，在`SoSaleOutPluginInitializerToBTest`中对测试代码进行了注释调整，以反映代码变更后的测试情况。

此次更改确保了在并发环境下，数据推送和验证操作的原子性，从而提高了系统稳定性和数据一致性。

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java

@@ -395,6 +395,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
      * @author liuyang
      */
     private List<HeaderDetailsDto> filterDataStock(List<HeaderDetailsDto> headerDetailsDtoList) throws Exception {
+        synchronized (PUSH_LOCK1) {
             //        List<com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto> headerDetailsDtoList1 = new ArrayList<>();
             List<TocofsSaleoutDetailedEntity> allTocofsSaleoutDetailedEntityList = new ArrayList<>();
             if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) {
@@ -408,6 +409,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
             }
             return filterDataRowsAsPushOrFailedStock(allTocofsSaleoutDetailedEntityList, headerDetailsDtoList);
         }
+    }
 
     /**
      * 逗号拼接字符串主键，作为批处理的一部分，方便下一步的批量查询操作
@@ -509,6 +511,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
      * @author liuyang
      */
     private List<HeaderDetailsDto> filterDataTran(List<HeaderDetailsDto> headerDetailsDtoList) throws Exception {
+        synchronized (PUSH_LOCK2) {
             List<TocofsSaleoutDetailedEntity> allTocofsSaleoutDetailedEntityList = new ArrayList<>();
             if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) {
                 List<List<HeaderDetailsDto>> splitListByCount = SplitListByCountUtil.splitListByCount(headerDetailsDtoList, 100);
@@ -521,6 +524,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
             }
             return filterDataRowsAsPushOrFailedTran(allTocofsSaleoutDetailedEntityList, headerDetailsDtoList);
         }
+    }
 
     /**
      * 筛选出未推送、或者失败的数据行
@@ -2062,9 +2066,10 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
      * @author liuyang
      */
     private Boolean checkTobOrder(String ofsId, String ofsCode) throws Exception {
+        synchronized (checkTobOrderLock) {
             Assert.notNull(ofsId, "ofsId不能为空");
             Assert.notNull(ofsCode, "ofsCode不能为空");
-        synchronized (checkTobOrderLock) {
+
             SoSaleEntity soSaleEntity = new SoSaleEntity();
             soSaleEntity.setDr(0L);
             soSaleEntity.setDataSourceCode("lets_u8c");

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java

@@ -403,6 +403,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
      * @author liuyang
      */
     private List<StockinOrderSearchResponse.StockinOrder> filterDataStock(List<StockinOrderSearchResponse.StockinOrder> returnGoodHeaderDetailsDataDtoArrayList) throws Exception {
+        synchronized (PUSH_LOCK1) {
             //        List<StockinOrderSearchResponse.StockinOrder> headerDetailsDtoList1 = new ArrayList<>();
             List<TocofsReturngoodsDetailedEntity> tocofsReturngoodsDetailedEntityList = new ArrayList<>();
             if (returnGoodHeaderDetailsDataDtoArrayList != null && returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
@@ -416,6 +417,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
             }
             return filterDataRowsAsPushOrFailedStock(tocofsReturngoodsDetailedEntityList, returnGoodHeaderDetailsDataDtoArrayList);
         }
+    }
 
     /**
      * 筛选出未推送、或者失败的数据行，过滤库存同步业务
@@ -567,6 +569,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
      * @author liuyang
      */
     private List<StockinOrderSearchResponse.StockinOrder> filterDataTran(List<StockinOrderSearchResponse.StockinOrder> returnGoodHeaderDetailsDataDtoArrayList) throws Exception {
+        synchronized (PUSH_LOCK2) {
             //        List<StockinOrderSearchResponse.StockinOrder> headerDetailsDtoList1 = new ArrayList<>();
             List<TocofsReturngoodsDetailedEntity> tocofsReturngoodsDetailedEntityList = new ArrayList<>();
             if (returnGoodHeaderDetailsDataDtoArrayList != null && returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
@@ -580,6 +583,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
             }
             return filterDataRowsAsPushOrFailedTran(tocofsReturngoodsDetailedEntityList, returnGoodHeaderDetailsDataDtoArrayList);
         }
+    }
 
     /**
      * 保存抓取到的数据到mysql底表，如果底表里已经存在，则会忽略

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java

@@ -62,7 +62,9 @@ public class SoSaleOutPluginInitializerToBTest {
 
         try {
 //            soSaleOutPluginInitializerToB.startImplementByTranTime("2024-09-12 14:04:00","2024-09-12 14:12:00");
-            soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092000000003", "stock");
+//            soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092000000003", "stock");
+
+            soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092600000009","stock");
         } catch (Exception e) {
             e.printStackTrace();
         }