dd

xggsve-invoice/app/base/api/impl/op/action.js

@@ -128,7 +128,7 @@ class ActionAPI extends APIBase {
             //     break;
             
             case "test":    // 查询业务进度
-                opResult = await this.iinvoiceSve.allNames(action_body);
+                opResult = await this.iinvoiceSve.buildProcess(action_body);
                 break;
 
             default:

xggsve-invoice/app/base/db/impl/invoice/iinvoiceDao.js

 const system = require("../../../system");
 const Dao = require("../../dao.base");
 const moment = require("moment");
-class InvoiceDao extends Dao {
+class IInvoiceDao extends Dao {
   constructor() {
+<<<<<<< HEAD
     super(Dao.getModelName(InvoiceDao));
     // this.tableName = this.model.tableName;
+=======
+    super(Dao.getModelName(IInvoiceDao));
+>>>>>>> f460c0de7754b2fe93251b14723661f33e7fb373
   }
 
   async findByChannelAndApplyNo(channel_id,apply_no){
@@ -161,4 +165,4 @@ class InvoiceDao extends Dao {
   //   return await this.customQuery(sql.join(" "), params);
   // }
 }
-module.exports = InvoiceDao;
\ No newline at end of file
+module.exports = IInvoiceDao;
\ No newline at end of file

xggsve-invoice/app/base/db/impl/product/iproductprocessDao.js

@@ -27,7 +27,6 @@ class IproductprocessDao extends Dao {
   }
 
   async byProductPid(productPid) {
-    let result = {};
     let sql = [];
     sql.push("SELECT");
     sql.push("*");
@@ -38,9 +37,9 @@ class IproductprocessDao extends Dao {
 
     let list = await this.customQuery(sql.join(" "), {productPid: productPid});
     if (!list || list.length == 0) {
-      return result;
+      return [];
     }
-    return result;
+    return list;
   }
 }
 

xggsve-invoice/app/base/db/models/invoice/iinvoiceprocess.js

@@ -24,7 +24,7 @@ module.exports = function (db, DataTypes) {
 		underscore: true,
 		paranoid: true,
 		version: true,
-		tableName: 'i_product_process',
+		tableName: 'i_invoice_process',
 		comment: '发票产品流程表',
 	});
 }
\ No newline at end of file

xggsve-invoice/app/base/service/impl/invoice/iinvoiceSve.js

@@ -4,15 +4,21 @@ const moment = require('moment')
 /**
  * 交付商 提交的信息
  */
-class IinvoiceService extends ServiceBase {
+class IInvoiceService extends ServiceBase {
   constructor() {
-    super("invoice", ServiceBase.getDaoName(IinvoiceService));
+    super("invoice", ServiceBase.getDaoName(IInvoiceService));
+    let is = system.getObject("util.invoiceStatus");
+    this.invoiceStatus = is.status;
+
     this.iinvoicesummaryinfoDao = system.getObject("db.invoice.iinvoicesummaryinfoDao");
     this.iinvoiceprocessDao = system.getObject("db.invoice.iinvoiceprocessDao");
     this.iinvoiceinforegDao = system.getObject("db.invoice.iinvoiceinforegDao");
     this.iinvoicedeliverDao = system.getObject("db.invoice.iinvoicedeliverDao");
     this.RULE_INVOICE_TYPE =["10",'20','30'];      //发票类型
     this.RULE_BUSINESSMEN_TYPE=['10','20'];      //销售方类型
+    this.iproductDao = system.getObject("db.product.iproductDao");
+    this.iprocessDao = system.getObject("db.product.iprocessDao");
+    this.iproductprocessDao = system.getObject("db.product.iproductprocessDao");
   }
 
   /**
@@ -129,57 +135,56 @@ class IinvoiceService extends ServiceBase {
     }
   }
 
-/**********************************************以下是旧版本************************************************************ 
   /*
    * 构建产品流程对象
    * @param productPid
    * @param chooseProductIds
    * @returns {Promise<void>}
    */
-  // async buildOrderProcess(productPid) {
-  //   let productPid = productPid || 50010000;
-  //   // 查询产品流程
-  //   let productProcessList = await this.oproductprocessDao.byProductPid(productPid);
-  //   if (!productProcessList || productProcessList.length == 0) {
-  //     continue;
-  //   }
+  async buildProcess(params) {
+    let productPid = params.productPid || 50010000;
+    // 查询产品流程
+    let productProcessList = await this.iproductprocessDao.byProductPid(productPid);
+    if (!productProcessList || productProcessList.length == 0) {
+      return [];
+    }
 
-  //   let invoiceProcessList = [];
-  //   // 批量查流程
-  //   let processMap = await this.oprocessDao.mapAll();
+    let invoiceProcessList = [];
+    // 批量查流程
+    let processMap = await this.iprocessDao.mapAll();
 
-  //   for (let productProcess of productProcessList) {
-  //     // 风还钻该处理每一个子项流程 变为 订单流程对象
-  //     let process = processMap[productProcess.process_id];
-  //     let nextArr = this.trim(productProcess.next_status).split(",");
-  //     let nextStatus = [];
-  //     for (var nextId of nextArr) {
-  //       nextId = Number(nextId || 0);
-  //       let nextObj = processMap[nextId];
-  //       if (!nextObj) {
-  //         continue;
-  //       }
-  //       nextStatus.push({ next_status: nextObj.status, next_name: nextObj.name });
-  //     }
+    for (let productProcess of productProcessList) {
+      // 风还钻该处理每一个子项流程 变为 订单流程对象
+      let process = processMap[productProcess.process_id];
+      let nextArr = this.trim(productProcess.next_status).split(",");
+      let nextStatus = [];
+      for (let nextId of nextArr) {
+        nextId = Number(nextId || 0);
+        let nextObj = processMap[nextId];
+        if (!nextObj) {
+          continue;
+        }
+        nextStatus.push({ next_status: nextObj.status, next_name: nextObj.name });
+      }
 
-  //     let orderProcess = {
-  //       product_id: productPid,
-  //       name: process.name,
-  //       status: process.status,
-  //       func: productProcess.func,
-  //       next_status: JSON.stringify(nextStatus),
-  //       name1: productProcess.name1,
-  //       name2: productProcess.name2,
-  //       name3: productProcess.name3,
-  //       name4: productProcess.name4,
-  //       sort: productProcess.sort,
-  //       autoIncrement: true
-  //     };
-  //     invoiceProcessList.push(orderProcess);
-  //   }
+      let orderProcess = {
+        product_id: productPid,
+        name: process.name,
+        status: process.status,
+        func: productProcess.func,
+        next_status: JSON.stringify(nextStatus),
+        name1: productProcess.name1,
+        name2: productProcess.name2,
+        name3: productProcess.name3,
+        name4: productProcess.name4,
+        sort: productProcess.sort,
+        autoIncrement: true
+      };
+      invoiceProcessList.push(orderProcess);
+    }
 
-  //   return invoiceProcessList;
-  // }
+    return invoiceProcessList;
+  }
 
 }
-module.exports = IinvoiceService;
\ No newline at end of file
+module.exports = IInvoiceService;