Browse Source

同步 正式服账套号配置

liuchaohui 2 years ago
parent
commit
e149d2216d

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SySOAndOMController.java

@@ -92,8 +92,8 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
         if(sySOAndOM.getOrderNumber()==null && sySOAndOM.getOrderNumber().equals("")){
             return Result.error("请输入订单号!!!");
         }
-        if(sySOAndOM.getAccount().equals("901") || sySOAndOM.getAccount().equals("902") ||
-                sySOAndOM.getAccount().equals("903")){
+        if(sySOAndOM.getAccount().equals("101") || sySOAndOM.getAccount().equals("102") ||
+                sySOAndOM.getAccount().equals("103")){
             Page<SySOAndOM> page = new Page<SySOAndOM>(pageNo, pageSize);
             IPage<SySOAndOM> pageList = sySOAndOMService.querySOList(sySOAndOM,page);
             if(pageList.getRecords().size()==0){

+ 12 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -138,13 +138,13 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         " and s.cSOCode = '"+parameter+"' order by s.dDate desc ";
 
                 List<Map<String, Object>> list = new ArrayList<>();
-                if(account.equals("901")){
+                if(account.equals("101")){
                     list = senYuDataSourceOne.queryForList(sql);
                     senYuDataSourceOne.update(updateSql);
-                }else if(account.equals("902")){
+                }else if(account.equals("102")){
                     list = senYuDataSourceTwo.queryForList(sql);
                     senYuDataSourceTwo.update(updateSql);
-                }else if(account.equals("903")){
+                }else if(account.equals("103")){
                     list = senYuDataSourceThree.queryForList(sql);
                     senYuDataSourceThree.update(updateSql);
                 }
@@ -208,11 +208,11 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         " left join SO_SODetails_extradefine be on be.iSOsID=s.iSOsID"+
                         " where (s.cSCloser is null or s.cSCloser='asuser') and s.ID = "+ID;
                 List<Map<String, Object>> listSon = new ArrayList<>();
-                if(sy.getAccount().equals("901")){
+                if(sy.getAccount().equals("101")){
                     listSon = senYuDataSourceOne.queryForList(sql);
-                }else if(sy.getAccount().equals("902")){
+                }else if(sy.getAccount().equals("102")){
                     listSon = senYuDataSourceTwo.queryForList(sql);
-                }else if(sy.getAccount().equals("903")){
+                }else if(sy.getAccount().equals("103")){
                     listSon = senYuDataSourceThree.queryForList(sql);
                 }
                 List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(listSon);
@@ -277,11 +277,11 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                     if(syItemList.size()!=jianSon.size()){
                         //回写不拉取的数据状态 0
                         String blackWrite = "UPDATE SO_SOMain SET cdefine15 = '0' WHERE id='"+syId+"'";
-                        if(sy.getAccount().equals("901")){
+                        if(sy.getAccount().equals("101")){
                             senYuDataSourceOne.update(blackWrite);
-                        }else if(sy.getAccount().equals("902")){
+                        }else if(sy.getAccount().equals("102")){
                             senYuDataSourceTwo.update(blackWrite);
-                        }else if(sy.getAccount().equals("903")){
+                        }else if(sy.getAccount().equals("103")){
                             senYuDataSourceThree.update(blackWrite);
                         }
                         //进入下一个主表的添加,这里是单个订单同步 所以是返回同步失败且通知原因
@@ -307,11 +307,11 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
 
                 //回写拉取的数据状态 1
                 String blackWrite = "UPDATE SO_SOMain SET cdefine15 = '1' WHERE id='"+syId+"'";
-                if(sy.getAccount().equals("901")){
+                if(sy.getAccount().equals("101")){
                     senYuDataSourceOne.update(blackWrite);
-                }else if(sy.getAccount().equals("902")){
+                }else if(sy.getAccount().equals("102")){
                     senYuDataSourceTwo.update(blackWrite);
-                }else if(sy.getAccount().equals("903")){
+                }else if(sy.getAccount().equals("103")){
                     senYuDataSourceThree.update(blackWrite);
                 }
             }

+ 9 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/AddOrderJob.java

@@ -203,11 +203,11 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                         " left join SO_SODetails_extradefine be on be.iSOsID=s.iSOsID"+
                         " where (s.cSCloser is null or s.cSCloser='asuser') and s.ID = "+ID;
                 List<Map<String, Object>> listSon = new ArrayList<>();
-                if(sy.getAccount().equals("901")){
+                if(sy.getAccount().equals("101")){
                     listSon = senYuDataSourceOne.queryForList(sql);
-                }else if(sy.getAccount().equals("902")){
+                }else if(sy.getAccount().equals("102")){
                     listSon = senYuDataSourceTwo.queryForList(sql);
-                }else if(sy.getAccount().equals("903")){
+                }else if(sy.getAccount().equals("103")){
                     listSon = senYuDataSourceThree.queryForList(sql);
                 }
                 List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(listSon);
@@ -272,11 +272,11 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                     if(syItemList.size()!=jianSon.size()){
                         //回写不拉取的数据状态 0
                         String blackWrite = "UPDATE SO_SOMain SET cdefine15 = '0' WHERE id='"+syId+"'";
-                        if(sy.getAccount().equals("901")){
+                        if(sy.getAccount().equals("101")){
                             senYuDataSourceOne.update(blackWrite);
-                        }else if(sy.getAccount().equals("902")){
+                        }else if(sy.getAccount().equals("102")){
                             senYuDataSourceTwo.update(blackWrite);
-                        }else if(sy.getAccount().equals("903")){
+                        }else if(sy.getAccount().equals("103")){
                             senYuDataSourceThree.update(blackWrite);
                         }
                         continue;
@@ -294,11 +294,11 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                 }
                 //回写拉取的数据状态 1
                 String blackWrite = "UPDATE SO_SOMain SET cdefine15 = '1' WHERE id='"+syId+"'";
-                if(sy.getAccount().equals("901")){
+                if(sy.getAccount().equals("101")){
                     senYuDataSourceOne.update(blackWrite);
-                }else if(sy.getAccount().equals("902")){
+                }else if(sy.getAccount().equals("102")){
                     senYuDataSourceTwo.update(blackWrite);
-                }else if(sy.getAccount().equals("903")){
+                }else if(sy.getAccount().equals("103")){
                     senYuDataSourceThree.update(blackWrite);
                 }
             }