fix: 隔绝产品

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) {
       if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
         qc.where.product_code = qc.where.product_code || {
         qc.where.product_code = qc.where.product_code || {
-          [this.db.Op.notIn]: ["ICP", "EDI", "ICPANNUALREPORT", "EDIANNUALREPORT"]
+          [this.db.Op.notIn]: ["ICP", "EDI", "ICPANNUALREPORT", "EDIANNUALREPORT", "bookkeeping"]
         }
         }
         if (qobj.bizpath && qobj.bizpath != "") {
         if (qobj.bizpath && qobj.bizpath != "") {
           if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的
           if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的
@@ -84,43 +84,43 @@ class DeliverybillDao extends Dao {
     return await this.updateByWhere(setobj, whereobj, t);
     return await this.updateByWhere(setobj, whereobj, t);
   }
   }
 
 
-    /*更新业务员/交付员信息*/
-    async updateSalesmanInfoByDeliverCode(qobj, t) {
-        var setobj = {};
-        if(qobj.type == "salesman") {
-            if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
-                setobj.salesman_id = qobj.salesmanId;
-            };
-            if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
-                setobj.salesman_name = qobj.salesmanName;
-            };
-            if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
-                setobj.salesman_opcode = qobj.salesmanOpcode;
-            };
-        }
-        if(qobj.type == "deliverman") {
-            if (qobj.deliverymanId && qobj.deliverymanId != 'undefined') {
-                setobj.delivery_man_id = qobj.deliverymanId;
-            };
-            if (qobj.deliverymanName && qobj.deliverymanName != 'undefined') {
-                setobj.delivery_man_name = qobj.deliverymanName;
-            };
-            if (qobj.deliverymanOpcode && qobj.deliverymanOpcode != 'undefined') {
-                setobj.delivery_man_opcode = qobj.deliverymanOpcode;
-            };
-        }
-        // if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
-        //   setobj.salesman_phone = qobj.salesmanPhone;
-        // };
-        if (qobj.facilitatorId && qobj.facilitatorId != 'undefined') {
-            setobj.facilitator_id = qobj.facilitatorId;
-        };
-        if (qobj.facilitatorName && qobj.facilitatorName != 'undefined') {
-            setobj.facilitator_name = qobj.facilitatorName;
-        };
-        var whereobj = { "delivery_code": qobj.deliverNumber };
-        return await this.updateByWhere(setobj, whereobj, t);
-    }
+  /*更新业务员/交付员信息*/
+  async updateSalesmanInfoByDeliverCode(qobj, t) {
+    var setobj = {};
+    if (qobj.type == "salesman") {
+      if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
+        setobj.salesman_id = qobj.salesmanId;
+      };
+      if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
+        setobj.salesman_name = qobj.salesmanName;
+      };
+      if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
+        setobj.salesman_opcode = qobj.salesmanOpcode;
+      };
+    }
+    if (qobj.type == "deliverman") {
+      if (qobj.deliverymanId && qobj.deliverymanId != 'undefined') {
+        setobj.delivery_man_id = qobj.deliverymanId;
+      };
+      if (qobj.deliverymanName && qobj.deliverymanName != 'undefined') {
+        setobj.delivery_man_name = qobj.deliverymanName;
+      };
+      if (qobj.deliverymanOpcode && qobj.deliverymanOpcode != 'undefined') {
+        setobj.delivery_man_opcode = qobj.deliverymanOpcode;
+      };
+    }
+    // if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
+    //   setobj.salesman_phone = qobj.salesmanPhone;
+    // };
+    if (qobj.facilitatorId && qobj.facilitatorId != 'undefined') {
+      setobj.facilitator_id = qobj.facilitatorId;
+    };
+    if (qobj.facilitatorName && qobj.facilitatorName != 'undefined') {
+      setobj.facilitator_name = qobj.facilitatorName;
+    };
+    var whereobj = { "delivery_code": qobj.deliverNumber };
+    return await this.updateByWhere(setobj, whereobj, t);
+  }
 
 
   /*根据交付单更新交付材料信息*/
   /*根据交付单更新交付材料信息*/
   async updateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料
   async updateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料
@@ -182,7 +182,7 @@ class DeliverybillDao extends Dao {
     if (qobj.clerkName && qobj.clerkName != 'undefined') {
     if (qobj.clerkName && qobj.clerkName != 'undefined') {
       obj.delivery_man_name = qobj.clerkName;
       obj.delivery_man_name = qobj.clerkName;
     }
     }
-    if (qobj.salesmanName && qobj.salesmanName != undefined){
+    if (qobj.salesmanName && qobj.salesmanName != undefined) {
       obj.salesman_name = qobj.salesmanName;
       obj.salesman_name = qobj.salesmanName;
     }
     }
     if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
     if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {