Sync-2017-02-17

package.json

@@ -5,6 +5,7 @@
   "devDependencies": {
     "body-parser": "^1.13.2",
     "express": "^4.13.1",
-    "mongoose": "^4.1.0"
+    "mongoose": "^4.1.0",
+    "async": "^2.1.5"
   }
 }

protect/controllers/billController.js

@@ -2,6 +2,7 @@
  * Created by Tony on 2017/1/13.
  */
 var BillsData = require('../models/bills');
+var calDemoMdl = require('../models/calculate_demo');
 
 //ͳһ»Øµ÷º¯Êý
 var callback = function(req, res, err, data){
@@ -26,7 +27,25 @@ module.exports = {
             }
         });
     },
-    remove: function(req, res){
+    testCalculate: function(req, res){
+        var user_id = req.body.user_id;
+        calDemoMdl.testCalculate(user_id, function(err, result){
+            if (err) {
+                callback(req, res, err, null);
+            } else {
+                callback(req, res, err, result);
+            }
+        });
+    },
+    testCalculate2: function(req, res){
+        var user_id = req.body.user_id;
+        calDemoMdl.testCalculate2(user_id, function(err, result){
+            if (err) {
+                callback(req, res, err, null);
+            } else {
+                callback(req, res, err, result);
+            }
+        });
     }
 
 }

protect/models/bills.js

@@ -23,6 +23,24 @@ var BillsSchema = new Schema({
     "Memostr": String
 });
 
+var ConstructBillsSchema = new Schema({
+    "SerialNo": Number,
+    "ChapterID": Number,
+    "ID": Number,
+    "ParentID": Number,
+    "NextSiblingID": Number,
+    "Code": String,
+    "FullCode": String,
+    "Name": String,
+    "Units": String,
+    "Quantity": Number,
+    "DesignQuantity": Number,
+    "DesignQuantity2": Number,
+    "DesignPrice": Number,
+    "TotalPrice": Number,
+    "Memostr": String
+});
+
 //var BillsData = demodb.mongoose.model("bills", BillsSchema);
 var BillsData = demodb.mongoose.model("gd_bills", BillsSchema);
 

server.js

@@ -64,6 +64,8 @@ apiRouter.post('/setProjects', projectController.saveProjects);
 apiRouter.post('/getProjects', projectController.getProjectsByUserId);
 apiRouter.post('/updateProjects', projectController.updateProject);
 
+apiRouter.post('/testCalculateBills', billController.testCalculate2);
+
 app.use('/api', apiRouter);