diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapServiceImpl.java
index 6691157c..dc456481 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapServiceImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapServiceImpl.java
@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -575,19 +572,25 @@ public class SapServiceImpl implements SapService {
             // 获取 内表 - ZMES_PRO
             JCoTable maraTable = func.getTableParameterList().getTable("LT_ROUTING");
             JCoRecordMetaData metaData = maraTable.getRecordMetaData();
-            System.out.println("###" + metaData.toString());
+//            System.out.println("###" + metaData.toString());
 //        System.out.println("###" + metaData.toString());
+            Map<String,SapProRoute> mapProRoute = new IdentityHashMap<String,SapProRoute>();
+            Map<String,SapProProcess> mapProProcess = new IdentityHashMap<String,SapProProcess>();
+            Map<String,SapProRouteProcess> mapProRouteProcessNew = new IdentityHashMap<String,SapProRouteProcess>();
+            Map<String,SapProRouteProcess> mapProRouteProcessOld = new IdentityHashMap<String,SapProRouteProcess>();
             List<SapProProcess> proProcessList = new ArrayList<>();
             List<SapProRouteProcess> proRouteProcessList = new ArrayList<>();
             List<SapProProcessContent> proProcessContentList = new ArrayList<>();
             List<SapProRoute> proRouteList = new ArrayList();
+            Set<String> set = new HashSet<>();
             for (int i = 0,arr1=0,arr2=0; i <maraTable.getNumRows(); i++) {
-
-             SapProProcess proProcess = new SapProProcess();
-             SapProRouteProcess proRouteProcess = new SapProRouteProcess();
-             SapProProcessContent proProcessContent = new SapProProcessContent();
+                SapProProcess proProcess = new SapProProcess();
+                SapProRouteProcess proRouteProcessNew = new SapProRouteProcess();
+                SapProRouteProcess proRouteProcessOld = new SapProRouteProcess();
+                SapProProcessContent proProcessContent = new SapProProcessContent();
                 SapProRoute proRoute = new SapProRoute();
                 maraTable.setRow(i);
+//                System.out.println(i);
                 String WERKS = maraTable.getString("WERKS");
                 String PLNTY = maraTable.getString("PLNTY");
                 String PLNNR = maraTable.getString("PLNNR");
@@ -633,98 +636,108 @@ public class SapServiceImpl implements SapService {
                 String SPLIM = maraTable.getString("SPLIM");
                 String CKSELKZ = maraTable.getString("CKSELKZ");
                 //根据工厂切换数据源
-                String poolName = sapSysUserMapper.getPoolName(WERKS);
-                String[] split = poolName.split("=");
-                System.out.println(split[1]);
-                DynamicDataSourceContextHolder.push(split[1]);
+//                String pre = "ds_";
+//                String werks = pre+WERKS;
+//                String url = sapSysUserMapper.getPoolName(werks);
+                set.add(WERKS);
+//                if (url.isEmpty()){
+//                    System.out.println("当前无工厂");
+//                    break;
+//                }
+//                String[] split = url.split("=");
+//                System.out.println(split[1]);
 
-                        proRoute.setRouteCode(PLNNR);
-                        proRoute.setRouteName(KTEXT);
-                        proRoute.setCreateBy(ANNAM);
-                        proRoute.setRouteDesc(KTEXT);
-                        proRoute.setTecMan(VGW01);
-                        proRoute.setTecManUnit(VGE01);
-                        proRoute.setTecMachine(VGW02);
-                        proRoute.setTecMachineUnit(VGE02);
-                        proRoute.setTecDepreciation(VGW03);
-                        proRoute.setTecDepreciationUnit(VGE03);
-                        proRoute.setTecOther(VGW04);
-                        proRoute.setTecOtherUnit(VGE04);
-                        proRoute.setTecConfAcivity5(VGW05);
-                        proRoute.setTecConfAcivity5Unit(VGE05);
-                        proRoute.setTecConfAcivity6(VGW06);
-                        proRoute.setTecConfAcivity6Unit(VGE06);
-                        proRoute.setAttr1(Integer.valueOf(i).toString());
-                        proRoute.setRouteId(UUID.randomUUID().toString().replaceAll("-",""));
-                        proRoute.setEnableFlag("Y");
+//                DynamicDataSourceContextHolder.push(split[1]);
+//                DynamicDataSourceContextHolder.push(werks);
 
-                        if (proRoute.getRouteName().isEmpty()){
-                            proRoute.setRouteName("无");
-                        }
-//                        proRouteList.add(i,proRoute);
-                        if (proRoute.getRouteName()!="无"){
-                            {
-                                System.out.println(sapProRouteMapper.selectProRouteByRouteCode(proRoute.getRouteCode()));
-                                if (sapProRouteMapper.selectProRouteByRouteCode(proRoute.getRouteCode())==0){
-                                    proRoute.setRouteId(UUID.randomUUID().toString().replaceAll("-",""));
-                                    sapProRouteMapper.insertProRoute(proRoute);
-                                    arr1 = 1;
-                                }
+//                System.out.println(DynamicDataSourceContextHolder.peek());
 
-                        else{
-                                        sapProRouteMapper.updateProRoute(proRoute);
-                                        arr1=0;
-                                    System.out.println(i);
-                                    }
-                        }}
+                proRoute.setRouteCode(PLNNR);
+                proRoute.setRouteName(KTEXT);
+                proRoute.setCreateBy(ANNAM);
+                proRoute.setRouteDesc(KTEXT);
+                proRoute.setTecMan(VGW01);
+                proRoute.setTecManUnit(VGE01);
+                proRoute.setTecMachine(VGW02);
+                proRoute.setTecMachineUnit(VGE02);
+                proRoute.setTecDepreciation(VGW03);
+                proRoute.setTecDepreciationUnit(VGE03);
+                proRoute.setTecOther(VGW04);
+                proRoute.setTecOtherUnit(VGE04);
+                proRoute.setTecConfAcivity5(VGW05);
+                proRoute.setTecConfAcivity5Unit(VGE05);
+                proRoute.setTecConfAcivity6(VGW06);
+                proRoute.setTecConfAcivity6Unit(VGE06);
+                proRoute.setAttr1(Integer.valueOf(i).toString());
+                proRoute.setRouteId(UUID.randomUUID().toString().replaceAll("-",""));
+                proRoute.setEnableFlag("Y");
 
-                        proProcess.setProcessId(UUID.randomUUID().toString().replaceAll("-",""));
-                        proProcess.setProcessName(LTXA1);
-                        proProcess.setProcessCode(LTXA1);
-                        proProcess.setAttention(LTXA1);
-                        proProcess.setEnableFlag("Y");
-                        proProcess.setWorkCenter(ARBPL);
-                        proProcess.setAttr1(Integer.valueOf(i).toString());
-                        proProcess.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ANDAT));
-                        proProcess.setCreateBy(ANNAM);
-                        proProcess.setUpdateBy(AENAM);
-                        if (proProcess.getProcessCode()!=null){
-                            if (sapProProcessMapper.selectProProcessByProcessName(proProcess.getProcessName())==0){
-                                proProcess.setProcessId(UUID.randomUUID().toString().replaceAll("-",""));
-                                sapProProcessMapper.insertProProcess(proProcess);
-                                arr2 = 1;
-                                }
-                            else{
-                                sapProProcessMapper.updateProProcess(proProcess);
-                                    arr2 = 0;
-                            }
-                        }
+                if (proRoute.getRouteName().isEmpty()){
+                    proRoute.setRouteName("无");
+                }
+                mapProRoute.put(WERKS,proRoute);
+                        proRouteList.add(i,proRoute);
+//                if (proRoute.getRouteName()!="无"){
+//                    {
+////                                System.out.println(sapProRouteMapper.selectProRouteByRouteCode(value.getRouteCode()));
+//                        if (sapProRouteMapper.selectProRouteByRouteCode(proRoute.getRouteCode())==0){
+//                            proRoute.setRouteId(UUID.randomUUID().toString().replaceAll("-",""));
+//                                    arr1 = 1;
+//                        }
+//                        else{
+//                                    arr1=0;
+//                        }
+//                    }}
+
+                proProcess.setProcessId(UUID.randomUUID().toString().replaceAll("-",""));
+                proProcess.setProcessName(LTXA1);
+                proProcess.setProcessCode(LTXA1);
+                proProcess.setAttention(LTXA1);
+                proProcess.setEnableFlag("Y");
+                proProcess.setWorkCenter(ARBPL);
+                proProcess.setAttr1(Integer.valueOf(i).toString());
+                proProcess.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ANDAT));
+                proProcess.setCreateBy(ANNAM);
+                proProcess.setUpdateBy(AENAM);
+                mapProProcess.put(WERKS,proProcess);
+                proProcessList.add(i,proProcess);
+//                if (proProcess.getProcessCode()!=null){
+//                    if (sapProProcessMapper.selectProProcessByProcessName(proProcess.getProcessName())==0){
+//                        proProcess.setProcessId(UUID.randomUUID().toString().replaceAll("-",""));
+//                        arr2 = 1;
+//                    }
+//                    else{
+//                        arr2 = 0;
+//                    }
+//                }
+
+                proRouteProcessNew.setRouteId(proRoute.getRouteId());
+                proRouteProcessNew.setProcessId(proProcess.getProcessId());
+                proRouteProcessNew.setAttr1(Integer.valueOf(i).toString());
+                proRouteProcessNew.setProcessCode(proProcess.getProcessCode());
+                proRouteProcessNew.setProcessName(proProcess.getProcessName());
+                proRouteProcessNew.setOrderNum(1);
+                proRouteProcessNew.setCreateTime(DateUtils.dateTime(("yyyy-MM-dd"),ANDAT));
+                proRouteProcessNew.setCreateBy(ANNAM);
+                proRouteProcessNew.setUpdateBy(AENAM);
+
+                    proRouteProcessNew.setRecordId(UUID.randomUUID().toString().replace("-",""));
+
+                    mapProRouteProcessNew.put(WERKS,proRouteProcessNew);
+                    proRouteProcessOld.setProcessCode(proProcess.getProcessCode());
+                    proRouteProcessOld.setProcessName(proProcess.getProcessName());
+                    proRouteProcessOld.setOrderNum(1);
+                    proRouteProcessOld.setCreateTime(DateUtils.dateTime(("yyyy-MM-dd"),ANDAT));
+
+                    proRouteProcessOld.setCreateBy(ANNAM);
+                    proRouteProcessOld.setUpdateBy(AENAM);
+                mapProRouteProcessOld.put(WERKS,proRouteProcessOld);
+
+//                    sapProRouteProcessMapper.insertProRouteProcess(proRouteProcess);
 //
-                        if (arr1==1&&arr2==1){
-                            proRouteProcess.setRecordId(UUID.randomUUID().toString().replace("-",""));
-                            proRouteProcess.setRouteId(proRoute.getRouteId());
-                            proRouteProcess.setProcessId(proProcess.getProcessId());
-                            proRouteProcess.setAttr1(Integer.valueOf(i).toString());
-                            proRouteProcess.setProcessCode(proProcess.getProcessCode());
-                            proRouteProcess.setProcessName(proProcess.getProcessName());
-                            proRouteProcess.setOrderNum(1);
-                            proRouteProcess.setCreateTime(DateUtils.dateTime(("yyyy-MM-dd"),ANDAT));
-                            proRouteProcess.setCreateBy(ANNAM);
-                            proRouteProcess.setUpdateBy(AENAM);
-                            sapProRouteProcessMapper.insertProRouteProcess(proRouteProcess);
-                        }
-                        else {
-                            proRouteProcess.setRouteId(proRoute.getRouteId());
-                            proRouteProcess.setProcessId(proProcess.getProcessId());
-                            proRouteProcess.setAttr1(Integer.valueOf(i).toString());
-                            proRouteProcess.setProcessCode(proProcess.getProcessCode());
-                            proRouteProcess.setProcessName(proProcess.getProcessName());
-                            proRouteProcess.setOrderNum(1);
-                            proRouteProcess.setCreateTime(DateUtils.dateTime(("yyyy-MM-dd"),ANDAT));
-                            proRouteProcess.setCreateBy(ANNAM);
-                            proRouteProcess.setUpdateBy(AENAM);
-                            sapProRouteProcessMapper.updateProRouteProcess(proRouteProcess);
-                        }
+//
+//                    sapProRouteProcessMapper.updateProRouteProcess(proRouteProcess);
+
 
 
 
@@ -766,7 +779,69 @@ public class SapServiceImpl implements SapService {
 //                if (!proProcessList.get(k).getProcessCode().isEmpty()){ sapProProcessMapper.insertProProcess(proProcessList.get(k)); }
 //                if (!proProcessContentList.get(k).getContentText().isEmpty()){ sapProProcessContentMapper.insertProProcessContent(proProcessContentList.get(k)); }
 //            }
-        }}
+            }
+            Integer nums = sapSysUserMapper.getNums();
+            List<String> list = Arrays.asList(set.toArray(new String[0]));
+//            Integer nums = sapSysUserMapper.getNums();
+            for (int i=0;i<nums;i++){
+                String s = list.get(i);
+                mapProRoute.forEach((key,value)->{
+                    if (key.equals(s)){
+                        DynamicDataSourceContextHolder.push("ds_"+s);
+                        if (value.getRouteName()!="无"){
+                            {
+//                                System.out.println(s);
+//                                System.out.println(sapProRouteMapper.selectProRouteByRouteCode(value.getRouteCode()));
+                                if (sapProRouteMapper.selectProRouteByRouteCode(value.getRouteCode())==0){
+                                    value.setRouteId(UUID.randomUUID().toString().replaceAll("-",""));
+                                    sapProRouteMapper.insertProRoute(value);
+//                                    arr1 = 1;
+                                }
+                                else{
+//                                    System.out.println(value);
+                                    sapProRouteMapper.updateProRoute(value);
+//                                    arr1=0;
+
+                                }
+                            }}
+                    }
+                });
+                mapProProcess.forEach((key, value) ->{
+                    if (key.equals(s)){
+                        DynamicDataSourceContextHolder.push("ds_"+s);
+                        if (value.getProcessCode()!=null&&value.getProcessCode()!=""){
+                            if (sapProProcessMapper.selectProProcessByProcessName(value.getProcessName())==0){
+                                value.setProcessId(UUID.randomUUID().toString().replaceAll("-",""));
+//                                System.out.println(value.getProcessCode()+"================================================");
+                                sapProProcessMapper.insertProProcess(value);
+                            }
+                            else{
+//                                System.out.println(value);
+                                sapProProcessMapper.updateProProcess(value);
+                            }
+                        }
+                    }
+                });
+                mapProRouteProcessNew.forEach((key, value) ->{
+                    if (key.equals(s)){
+                        DynamicDataSourceContextHolder.push("ds_"+s);
+                        if ((sapProRouteProcessMapper.selectProRouteProcessByProcessCode(value.getProcessCode()))==0){
+//                            System.out.println(value);
+                            sapProRouteProcessMapper.insertProRouteProcess(value);
+                        }
+                    }
+                });
+                mapProRouteProcessOld.forEach((key, value) ->{
+                    if (key.equals(s)){
+                        DynamicDataSourceContextHolder.push("ds_"+s);
+                        if ((sapProRouteProcessMapper.selectProRouteProcessByProcessCode(value.getProcessCode()))!=0){
+//                            System.out.println(value);
+                            sapProRouteProcessMapper.updateProRouteProcess(value);
+                    }}
+                });
+            }
+
+        }
         catch (Exception e){
             return R.fail(e.getMessage());
         }