销售订单 同步拉取排除手工匹配

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

@@ -134,7 +134,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         " LEFT JOIN Customer cc ON s.cCusCode = cc.cCusCode" +
                         " LEFT JOIN Person  pe ON s.cPersonCode = pe.cPersonCode" +
                         " left join Vendor v on s.cDefine12=v.cVenName" +
-                        " where s.iStatus = 1   "+ //AND (s.cdefine15 is null or  s.cdefine15 !='1')
+                        " where s.iStatus = 1 AND s.cdefine15 !='2' "+ //AND (s.cdefine15 is null or  s.cdefine15 !='1')
                         " and s.cSOCode = '"+parameter+"' order by s.dDate desc ";
 
                 List<Map<String, Object>> list = new ArrayList<>();
@@ -155,7 +155,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
             }
             //没查到销售订单主表数据 返回结果并告知客户
             if(sumlist.size()<1){
-               result.setMessage("没找到对应销售订单！！！");
+               result.setMessage("对应销售订单不存在或为手工匹配单！！！");
                return result;
             }
             List<JSONObject> jian = JsonChangeUtils.toJSONObject(sumlist);

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

@@ -129,7 +129,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                         " LEFT JOIN Customer cc ON s.cCusCode = cc.cCusCode" +
                         " LEFT JOIN Person  pe ON s.cPersonCode = pe.cPersonCode" +
                         " left join Vendor v on s.cDefine12=v.cVenName" +
-                        " where s.iStatus = 1  AND (s.cdefine15 is null or  s.cdefine15 !='1')  ";
+                        " where s.iStatus = 1  AND (s.cdefine15 is null or  s.cdefine15 !='1' or s.cdefine15 !='2')  ";
 
                 if(this.parameter==null || this.parameter.equals("") || this.parameter.equals(" ")){
                     sql=sql+" order by s.dDate desc ";