d

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

 var system = require("../../../system");
 var system = require("../../../system");
-const http = require("http");
-const querystring = require('querystring');
 var settings = require("../../../../config/settings");
 var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctl.base");
 const CtlBase = require("../../ctl.base");
-const moment = require('moment');
 const appconfig = system.getSysConfig();
 const appconfig = system.getSysConfig();
 class SettleBillCtl extends CtlBase {
 class SettleBillCtl extends CtlBase {
   constructor() {
   constructor() {

ic-deliver/app/base/db/dao.base.js

@@ -74,8 +74,8 @@ class Dao {
       if (en != null) {
       if (en != null) {
         return en.destroy();
         return en.destroy();
       }
       }
+      return en
     }
     }
-    return null;
   }
   }
   extraModelFilter(pobj) {
   extraModelFilter(pobj) {
     //return {"key":"include","value":{model:this.db.models.app}};
     //return {"key":"include","value":{model:this.db.models.app}};

ic-deliver/app/base/service/impl/bizchance/settlebillSve.js

@@ -45,5 +45,15 @@ class SettleBillService extends ServiceBase {
              return st
              return st
         }); 
         }); 
     }
     }
+    async delete(p){
+        var self=this
+        return this.db.transaction(async function(t){
+             let dobj=await self.dao.delete(p,t)
+             //更新交付单上结算状态为waittosettle--待结算，清空settlebill_id
+             //waittosettle
+             await self.deliverbillDao.updateByWhere({settle_status:'waittosettle',settlebill_id:null}, { settlebill_id: dobj.id }, t);
+             return dobj
+        })
+    }
 }
 }
 module.exports = SettleBillService;
 module.exports = SettleBillService;
\ No newline at end of file

ic-deliver/app/base/system.js

@@ -217,7 +217,7 @@ class System {
 			try {
 			try {
 				ClassObj = require(objabspath);
 				ClassObj = require(objabspath);
 			} catch (e) {
 			} catch (e) {
-				// console.log(e)
+				 console.log(e)
 				let fname = objsettings[packageName + "base"];
 				let fname = objsettings[packageName + "base"];
 				ClassObj = require(fname);
 				ClassObj = require(fname);
 			}
 			}