add

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPLeiBieServiceImpl.java

@@ -118,14 +118,16 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         // 数据同步落到同步信息表
         extractedPPXLAddOrUpdate(addRec, updateRec, jsonArray, synTaskNo);
 
-        // 同步到本地系列表
-        extractedProductSeries(addRec, updateRec, brandRec);
-
         // 数据同步到本地字典表
         extractedLocalPPXLAddOrUpdate(addRec, updateRec);
 
         // 数据同步到本地字典对应关系
         extractedLoaclRefPPXLAddOrUpdate(addRec, updateRec, brandRec);
+
+        // 同步到本地系列表
+        extractedProductSeries(addRec, updateRec, brandRec);
+
+
         addRec.clear();
         updateRec.clear();
     }
@@ -208,7 +210,9 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         xlid.clear();
     }
 
-    private void upProductSeries(Brand brandRec, List<ProductSeries> upps, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldSysDictRecXMap, Map<String, List<ProductSeries>> oldpsMap, ItfTblSplbXilieDownload item) {
+    private void upProductSeries(Brand brandRec, List<ProductSeries> upps, Map<String, List<SysDict>> oldSysDictRecMap,
+                                 Map<String, List<SysDict>> oldSysDictRecXMap, Map<String, List<ProductSeries>> oldpsMap,
+                                 ItfTblSplbXilieDownload item) {
         ProductSeries add = new ProductSeries();
         add.setSeriesNumber(item.getXino());// 编号
         add.setBrandId(brandRec.getBrandId());// 品牌id
@@ -245,7 +249,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
 
     private void getProductSeries(Brand brandRec, List<ProductSeries> addps, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldSysDictRecXMap, ItfTblSplbXilieDownload item) {
         ProductSeries add = new ProductSeries();
-        add.setProductSeriesId(IdWorker.getIdStr());
+        add.setProductSeriesId(String.valueOf(item.getXiid()));
         add.setSeriesNumber(item.getXino());// 编号
         add.setBrandId(brandRec.getBrandId());// 品牌id
         add.setBrandName(brandRec.getBrand());// 品牌名称