Browse Source

销售订单单证 森宇发运参照字段添加过滤内部条件

liuchaohui 2 years ago
parent
commit
d38fb2a7a9

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

@@ -115,7 +115,6 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cdefine3 as customerOrderNumber," +
                         "s.cdefine11 as endCustomer," +
                         "s.cCusCode as customerCode," +
-                        "v.cVenAbbName as supplier," +
                         "s.fbookratio AS depositRatio," +
                         "s.iMoney AS deposit," +
                         "s.cMemo AS orderRemarks," +
@@ -137,7 +136,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         " LEFT JOIN Department de ON s.cDepCode = de.cDepCode" +
                         " LEFT JOIN Customer cc ON s.cCusCode = cc.cCusCode" +
                         " LEFT JOIN Person  pe ON s.cPersonCode = pe.cPersonCode" +
-                        " left join Vendor v on s.cCusCode=v.cVenCode where s.iStatus = 1 AND s.dverifysystime > '"+lastTimeSf+"'";
+                        " where s.iStatus = 1 and (cc.cCusAbbName!='宁波森语' and  cc.cCusAbbName!='马菲羊' and  cc.cCusAbbName!='森语集团') AND s.dverifysystime > '"+lastTimeSf+"'";
                 List<Map<String, Object>> list = new ArrayList<>();
                 if(pkorgValue[0].equals("one")){
                     list = senYuDataSourceOne.queryForList(sql);