Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

a966698c · 蒋勇 · 47a0ef70 · 0739419f · a966698c · a966698c
Commit a966698c authored Jun 28, 2020 by 蒋勇
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+0 -0

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
+1 -1

No files found.
--- a/ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+++ b/ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
--- a/ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
+++ b/ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
@@ -40,7 +40,7 @@ class DeliverybillDao extends Dao {
      //不是来自平台前端查询
      if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
        qc.where.product_code = qc.where.product_code || {
-          [this.db.Op.notIn]: ["ICP", "EDI"]
+          [this.db.Op.notIn]: ["ICP", "EDI","ICPANNUALREPORT","EDIANNUALREPORT"]
        }
        if (qobj.bizpath && qobj.bizpath != "") {
          if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的