d

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

@@ -30,6 +30,7 @@ class DeliverybillCtl extends CtlBase {
         robj.baseInfo = element.delivery_info;//交付单详情
         robj.baseInfo = element.delivery_info;//交付单详情
         robj.payStatus = element.delivery_info.payStatus;//交付状态
         robj.payStatus = element.delivery_info.payStatus;//交付状态
         robj.costPrice = element.cost_price;//成本
         robj.costPrice = element.cost_price;//成本
+        robj.settleStatus=element.settle_status;
         if (robj.businessName == '公司注册'){
         if (robj.businessName == '公司注册'){
           if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是"){//如果有刻章需求或者是虚拟地址
           if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是"){//如果有刻章需求或者是虚拟地址
             robj.relatedProducts = '有';
             robj.relatedProducts = '有';
@@ -198,9 +199,9 @@ class DeliverybillCtl extends CtlBase {
 
 
   }
   }
 
 
+  async settleApply(p,q,req){
 
 
-
-
+  }
   /*根据商机编号插入交付单信息*/
   /*根据商机编号插入交付单信息*/
   async insertInfo(pobj,qobj,req){//队列的时候用
   async insertInfo(pobj,qobj,req){//队列的时候用
     if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined' 
     if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined' 

ic-deliver/app/base/controller/impl/bizchance/settlebillCtl.js

+var system = require("../../../system");
+const http = require("http");
+const querystring = require('querystring');
+var settings = require("../../../../config/settings");
+const CtlBase = require("../../ctl.base");
+const moment = require('moment');
+const appconfig = system.getSysConfig();
+class SettleBillCtl extends CtlBase {
+  constructor() {
+    super("bizchance", CtlBase.getServiceName(BizOptCtl));
+    this.deliverService = system.getObject("service.bizchance.deliverybillSve");
+  }
+
+}
+module.exports = SettleBillCtl;
+

ic-deliver/app/base/db/impl/common/connection.js

@@ -67,6 +67,9 @@ class DbFactory {
     this.db.models.scheme.belongsTo(this.db.models.bizopt, { constraints: false, });
     this.db.models.scheme.belongsTo(this.db.models.bizopt, { constraints: false, });
     this.db.models.bizopt.hasOne(this.db.models.scheme, { constraints: false, });
     this.db.models.bizopt.hasOne(this.db.models.scheme, { constraints: false, });
 
 
+    //交付单关联结算单
+    this.db.models.deliverybill.belongsTo(this.db.models.settlebill, { constraints: false, });
+
   }
   }
   //async getCon(){,用于使用替换table模型内字段数据使用
   //async getCon(){,用于使用替换table模型内字段数据使用
   getCon() {
   getCon() {