update models

modules/bills_lib/models/bills_lib_interfaces.js

@@ -1,6 +1,7 @@
 /**
  * Created by vian on 2017/3/20.
  */
+const mongoose = require('mongoose');
 let counter = require("../../../public/counter/counter");
 let async = require("async");
 let StdBillsLib = mongoose.model('std_bills_lib_list');

modules/common/std/schemas/std_ration_lib_map.js

@@ -28,5 +28,5 @@ let modelSchema = {
     // 是否被删除
     deleted: Boolean
 };
-let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
+let model = mongoose.model(collectionName);
 export {model as default, collectionName as collectionName};

modules/ration_repository/models/glj_repository.js

@@ -4,32 +4,6 @@
  */
 var mongoose = require("mongoose");
 var async = require("async");
-var Schema = mongoose.Schema;
-
-var gljClassSchema = mongoose.Schema({
-    repositoryId: Number,
-    ID: Number,
-    ParentID: Number,
-    NextSiblingID: Number,
-    Name: String,
-    isDeleted: Boolean
-});
-
-var gljSchema = mongoose.Schema({
-    repositoryId: Number,
-    ID:Number,
-    //以下是基于已有access库
-    code: String,
-    name: String,
-    specs: String,
-    unit: String,
-    shortName: String,
-    basePrice: Number,
-    gljClass: Number, //这个是UI显示上的详细分类，对应gljTypeSchema
-    gljType: Number  //人工，材料，机械
-});
-var gljTypeModel = db.model("std_ration_lib_glj_type",gljClassSchema, "std_ration_lib_glj_type");
-var gljItemModel = db.model("std_ration_lib_glj_list",gljSchema, "std_ration_lib_glj_list");
 var repositoryMap = require('./repository_map');
 var counter = require('../../../public/counter/counter');
 let moment = require('moment');
@@ -149,7 +123,7 @@ gljItemDAO.prototype.mixUpdateGljItems = function(repId, lastOpr, updateItems, a
 
 gljItemDAO.prototype.removeGljItems = function(repId, lastOpr, rIds, callback) {
     if (rIds && rIds.length > 0) {
-        gljItemModel.collection.remove({ID: {$in: rIds}}, null, function(err, docs){
+        gljModel.collection.remove({ID: {$in: rIds}}, null, function(err, docs){
             if (err) {
                 callback(true, "Fail to remove", false);
             } else {
@@ -174,12 +148,12 @@ gljItemDAO.prototype.addGljItems = function(repId, lastOpr, items, callback) {
             var maxId = result.sequence_value;
             var arr = [];
             for (var i = 0; i < items.length; i++) {
-                var obj = new gljItemModel(items[i]);
+                var obj = new gljModel(items[i]);
                 obj.ID = (maxId - (items.length - 1) + i);
                 obj.repositoryId = repId;
                 arr.push(obj);
             }
-            gljItemModel.collection.insert(arr, null, function(err, docs){
+            gljModel.collection.insert(arr, null, function(err, docs){
                 if (err) {
                     callback(true, "Fail to add", false);
                 } else {
@@ -211,7 +185,7 @@ gljItemDAO.prototype.updateGljItems = function(repId, lastOpr, items, callback)
                     filter.repositoryId = repId;
                     filter.code = doc.code;
                 }
-                gljItemModel.update(filter, doc, cb);
+                gljModel.update(filter, doc, cb);
             };
         })(items[i]));
     }
@@ -237,7 +211,7 @@ gljItemDAO.prototype.updateNodes = function(repId, lastOpr, nodes, callback) {
     for (var i=0; i < nodes.length; i++) {
         functions.push((function(doc) {
             return function(cb) {
-                gljTypeModel.update({ID: doc.ID}, doc, cb);
+                gljClassModel.update({ID: doc.ID}, doc, cb);
             };
         })(nodes[i]));
     }
@@ -262,14 +236,14 @@ gljItemDAO.prototype.removeNodes =  function(repId, lastOpr, nodeIds, preNodeId,
     if (preNodeId != -1) {
         functions.push((function(nodeId, nextId) {
             return function(cb) {
-                gljTypeModel.update({ID: nodeId}, {"NextSiblingID": nextId}, cb);
+                gljClassModel.update({ID: nodeId}, {"NextSiblingID": nextId}, cb);
             };
         })(preNodeId, preNodeNextId));
     }
     for (var i=0; i < nodeIds.length; i++) {
         functions.push((function(nodeId) {
             return function(cb) {
-                gljTypeModel.update({ID: nodeId}, {"isDeleted": true}, cb);
+                gljClassModel.update({ID: nodeId}, {"isDeleted": true}, cb);
             };
         })(nodeIds[i]));
     }
@@ -294,7 +268,7 @@ gljItemDAO.prototype.createNewNode = function(repId, lastOpr, lastNodeId, nodeDa
     return counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, 1, function(err, result){
         nodeData.repositoryId = repId;
         nodeData.ID = result.sequence_value;
-        var node = new gljTypeModel(nodeData);
+        var node = new gljClassModel(nodeData);
         async.parallel([
             function (cb) {
                 node.save(function (err, result) {
@@ -302,7 +276,7 @@ gljItemDAO.prototype.createNewNode = function(repId, lastOpr, lastNodeId, nodeDa
                         cb("章节树ID错误！", false);
                     } else {
                         if (lastNodeId > 0) {
-                            gljTypeModel.update({ID: lastNodeId}, {"NextSiblingID": nodeData.ID}, function(err, rst){
+                            gljClassModel.update({ID: lastNodeId}, {"NextSiblingID": nodeData.ID}, function(err, rst){
                                 if (err) {
                                     cb("章节树ID错误！", false);
                                 } else {