Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost

modules/GLJ/models/GLJList.js

@@ -2,11 +2,11 @@
  * Created by jimiz on 2017/5/10.
  */
 var mongoose = require("mongoose");
-var db = require("../db/unitPriceFile_db");
+var db = require("../db/unit_price_file_db");
 var Schema = mongoose.Schema;
 var deleteSchema = require('../../../public/models/delete_schema');
 var counter = require("../../../public/counter/counter.js");
-var consts = require('../../main/models/projectConsts');
+var consts = require('../../main/models/project_consts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;
 
@@ -67,7 +67,7 @@ GLJListDAO.prototype.save = function(fileId, datas, callback){
     async.parallel(functions, callback);
 };
 
-GLJListDAO.prototype.add = function(count, callback){
+GLJListDAO.prototype.add = function(fileID, count, callback){
 
     function newCallback(err, lowID, highID){
         if (!err) {
@@ -75,6 +75,7 @@ GLJListDAO.prototype.add = function(count, callback){
             for (var i = lowID; i <= highID; i++){
                 var GLJ = new GLJList;
                 GLJ.ID = i;
+                GLJ.fileID = fileID;
                 datas.push(GLJ);
             }
             callback(err, datas);

modules/GLJ/models/unitPriceFile.js

@@ -2,13 +2,13 @@
  * Created by jimiz on 2017/5/12.
  */
 var mongoose = require("mongoose");
-var db = require("../db/unitPriceFile_db");
+var db = require("../db/unit_price_file_db");
 var Schema = mongoose.Schema;
 var deleteSchema = require('../../../public/models/delete_schema');
-var consts = require('../../main/models/projectConsts');
+var consts = require('../../main/models/project_consts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;
-var GLJList = require('./GLJList');
+var GLJList = require('./glj_list');
 
 var unitPriceFileSchema = new Schema({
     ID: Number,
@@ -36,19 +36,37 @@ unitPriceFileDAO.prototype.save = function(fileId, datas, callback){
     function changed(err, changedDatas){
         sync(fileId, changedDatas, callback);
     }
+
+
     GLJList.save(fileID, datas, changed);
 };
 
-unitPriceFileDAO.prototype.sync = function(fileId, datas, callback){
+unitPriceFileDAO.prototype.sync = function(fileID, datas, callback){
+    unitPriceFile.find({'$or': [{ID: fileID, deleteInfo: null}, {ID: fileID, 'deleteInfo.deleted': {$in: [null, false]}}]}, '-_id', function(err, datas){
+        if (!err) {
+            datas[0].projects
+
+            callback(0, projectConsts.UNITPRICEFILE, datas);
+        } else {
+            callback(1, '', null);
+        }
+    });
+};
 
+unitPriceFileDAO.prototype.add = function(fileID, count, callback){
+    GLJList.add(fileID, count, callback);
 };
 
 unitPriceFileDAO.prototype.newFile = function(data, callback){
 
 };
 
-unitPriceFileDAO.prototype.add = function(count, callback){
-    GLJList.add(count, callback);
+unitPriceFileDAO.prototype.useFile = function(fileID, projectID, callback){
+
+};
+
+unitPriceFileDAO.prototype.unuseFile = function(fileID, projectID, callback){
+
 };
 
 module.exports = new unitPriceFileDAO();

modules/main/controllers/GLJ_controller.js

@@ -4,7 +4,7 @@
 /**
  * Created by jimiz on 2017/4/7.
  */
-var GLJData = require('../models/GLJ');
+var GLJData = require('../models/glj');
 
 //统一回调函数
 var callback = function(req, res, err, message, data){

modules/main/models/bills.js

@@ -3,12 +3,12 @@
  */
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
-var subSchema = require("./billsSubSchemas");
+var subSchema = require("./bills_sub_schemas");
 var deleteSchema = require('../../../public/models/delete_schema');
 var Schema = mongoose.Schema;
 var async = require("async");
 var counter = require("../../../public/counter/counter.js");
-var consts = require('./projectConsts');
+var consts = require('./project_consts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;
 

modules/main/models/GLJ.js

@@ -6,7 +6,7 @@ var db = require("../db/project_db");
 var Schema = mongoose.Schema;
 var counter = require("../../../public/counter/counter.js");
 var deleteSchema = require('../../../public/models/delete_schema');
-var consts = require('./projectConsts');
+var consts = require('./project_consts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;
 

modules/main/models/project.js

@@ -3,8 +3,8 @@
  */
 var billsData = require('./bills');
 var rationData = require('./ration');
-var GLJData = require('./GLJ');
-var consts = require('./projectConsts');
+var GLJData = require('./glj');
+var consts = require('./project_consts');
 var projectConsts = consts.projectConst;
 var async = require("async");
 

modules/main/models/projectGLJ.js

@@ -5,10 +5,10 @@ var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var Schema = mongoose.Schema;
 var deleteSchema = require('../../../public/models/delete_schema');
-var consts = require('../../main/models/projectConsts');
+var consts = require('project_consts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;
-var unitPriceFile = require('../../GLJ/models/unitPriceFile.js')
+var unitPriceFile = require('../../glj/models/unit_price_file')
 
 var projectGLJSchema = new Schema({
     ID: Number,
@@ -42,7 +42,7 @@ projectGLJDAO.prototype.getData = function(projectID, callback){
 };
 
 // 工料机汇总的工料机不在这里新增，只能由add方法新增，删除需要在前端projectGLJ判断：1、是新工料机；2、没有定额引用，才可以删除
-projectGLJDAO.prototype.save = function(fileId, datas, callback){
+projectGLJDAO.prototype.save = function(projectID, datas, callback){
     var functions = [];
     var data;
 
@@ -69,11 +69,11 @@ projectGLJDAO.prototype.save = function(fileId, datas, callback){
     async.parallel(functions, callback);
 };
 
-projectGLJDAO.prototype.add = function(count, callback){
+projectGLJDAO.prototype.add = function(projectID, count, callback){
     unitPriceFile.add(count, callback);
 };
 
-projectGLJDAO.prototype.syncData = function(datas, callback){
+projectGLJDAO.prototype.syncData = function(projectID, datas, callback){
 
 };
 

modules/main/models/projectProperties.js

@@ -3,10 +3,10 @@
  */
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
-var subSchema = require("./billsSubSchemas");
+var subSchema = require("./bills_sub_schemas");
 var Schema = mongoose.Schema;
 var deleteSchema = require('../../../public/models/delete_schema');
-var consts = require('./projectConsts');
+var consts = require('./project_consts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;
 

modules/main/models/ration.js

@@ -3,11 +3,11 @@
  */
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
-var subSchema = require("./billsSubSchemas");
+var subSchema = require("./bills_sub_schemas");
 var Schema = mongoose.Schema;
 var deleteSchema = require('../../../public/models/delete_schema');
 var counter = require("../../../public/counter/counter.js");
-var consts = require('./projectConsts');
+var consts = require('./project_consts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;
 

modules/unitPrice/models/GLJList.js

@@ -1,3 +0,0 @@
-/**
- * Created by jimiz on 2017/5/10.
- */