Browse Source

Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

Chenshilong 8 years ago
parent
commit
855365bf1a

+ 0 - 42
modules/rationLibEditor/controller/RItemsController.js

@@ -1,42 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/20.
- */
-var rationItemsData = require('../models/rationItems');
-var callback = function(req,res,err,data){
-    if(data){
-        res.status(200)
-        res.json({success:true,data:data});
-    }
-    else
-    if(err){
-        res.status(500)
-        res.json({success:false,error:err});
-    }
-    else{
-        res.status(204);
-        res.json({success:true,data:null});
-    }
-}
-module.exports = {
-    insertRation:
-        function(req,res){
-            var libName = req.body.rationLibName;
-            var value = JSON.parse(req.body.value)
-            rationItemsData.insertRation(libName,value,function(err,data){
-                callback(req,res,err,data);
-            })
-        },
-    updateRation:
-        function(req,res){
-            var libName = req.body.rationLibName;
-            var value = JSON.parse(req.body.value)
-           // var code = req.body.code;
-            var data = JSON.parse(req.body.data);
-            rationItemsData.updateRation(libName,value,data,function(err,data){
-                callback(req,res,err,data);
-            })
-        }
-
-}
-
-

+ 0 - 72
modules/rationLibEditor/controller/RLibMapController.js

@@ -1,72 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/20.
- */
-var rationLibData = require('../models/rationLibMap');
-var callback = function(req,res,err,data){
-    if(data){
-        res.status(200)
-        res.json({success:true,data:data});
-    }
-    else
-    if(err){
-        res.status(500)
-        res.json({success:false,error:err});
-    }
-    else{
-        res.status(204);
-        res.json({success:true});
-    }
-}
-
-module.exports ={
-    addRationLib:function(req,res){
-        var libName = req.body.rationDisPlayName;
-        rationLibData.addRationLib(libName,function(err,data){
-            if (data) {
-                callback(req, res, err, data);
-            } else {
-                callback(req, res, err, null);
-            }
-        })
-    },
-    getRealLibName:function(req,res){
-        var libName = req.body.rationName;
-        rationLibData.getRealLibName(libName,function(err,data){
-            if (data) {
-                callback(req, res, err, data);
-            } else {
-                callback(req, res, err, null);
-            }
-        })
-    },
-    getDisPlayRationLibs: function(req, res){
-        rationLibData.getDisplayRationLibs(function(err, data){
-            if (data) {
-                callback(req, res, err, data);
-            } else {
-                callback(req, res, err, null);
-            }
-        });
-    },
-    deleteRationLib:function(req,res){
-        var rationName = req.body.rationName;
-        rationLibData.deleteRationLib(rationName,function(err,data){
-            if (data) {
-                callback(req, res, err, data);
-            } else {
-                callback(req, res, err,  null);
-            }
-        })
-    },
-    editRationLibs:function(req,res){
-        var rationName = req.body.rationName;
-        var newName = req.body.newName;
-        rationLibData.editRationLib(rationName,newName,function(err,data){
-            if (data) {
-                callback(req, res, err, data);
-            } else {
-                callback(req, res, err,  null);
-            }
-        })
-    }
-}

+ 0 - 53
modules/rationLibEditor/controller/RtreeController.js

@@ -1,53 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/21.
- */
-var rationTreeData = require('../models/rationTree');
-var callback = function(req,res,err,data){
-    if(data){
-        res.status(200)
-        res.json({success:true,data:data});
-    }
-    else
-    if(err){
-        res.status(500)
-        res.json({success:false,error:err});
-    }
-    else{
-        res.status(204);
-        res.json({success:true,data:null});
-    }
-}
-module.exports ={
-    getRationTree:
-        function(req,res){
-             var libName = req.body.rationLibName;
-             rationTreeData.getRationTrees(libName,function(err,data){
-                callback(req,res,err,data)
-             })
-        },
-    tempRationTreeInsert:
-        function(req,res){
-            var DBName = req.body.rationName;
-            var rationTempTree = JSON.parse(req.body.rationTempTree);
-            rationTreeData.tempRationTreeInsert(DBName,rationTempTree,function(err,data){
-                callback(req,res,err,data)
-            })
-        },
-    sectionUpsert:
-        function(req,res){
-            var LibName = req.body.rationLibName;
-            var section = JSON.parse(req.body.rationSection);
-            rationTreeData.sectionUpsert(LibName,section,function(err,data){
-                callback(req,res,err,data)
-            })
-        },
-    deleteSection:
-        function(req,res){
-            var LibName = req.body.rationLibName;
-            var sectionID = req.body.sectionID;
-            rationTreeData.deleteSection(LibName,sectionID,function(err,data){
-                callback(req,res,err,data)
-            })
-        }
-
-}

+ 0 - 47
modules/rationLibEditor/controller/gljListController.js

@@ -1,47 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/23.
- */
-var gljListData = require('../models/gljList');
-var callback = function(req,res,err,data){
-    if(data){
-        res.status(200)
-        res.json({success:true,data:data});
-    }
-    else
-    if(err){
-        res.status(500)
-        res.json({success:false,error:err});
-    }
-    else{
-        res.status(204);
-        res.json({success:true,data:null});
-    }
-}
-
-module.exports = {
-    insertGLJList:
-        function(req,res){
-            var libName = req.body.rationLibName;
-            var value = JSON.parse(req.body.value);
-            gljListData.insertGLJList(libName,value,function(err,data){
-                callback(req,res,err,data);
-            })
-        },
-    updateGLJList:
-        function(req,res){
-            var libName = req.body.rationLibName;
-            var value = JSON.parse(req.body.value)
-            var data = JSON.parse(req.body.data);
-            gljListData.updateGLJList(libName,value,data,function(err,data){
-                callback(req,res,err,data);
-            })
-        },
-    removeGLJList:
-        function(req,res){
-            var libName = req.body.rationLibName;
-            var value = JSON.parse(req.body.value)
-            gljListData.removeGLJList(libName,value,function(err,data){
-                callback(req,res,err,data);
-            })
-        }
-}

+ 0 - 135
modules/rationLibEditor/db/Schemas.js

@@ -1,135 +0,0 @@
-var mongoose = require("mongoose");
-
-var RationLibMapSchema = mongoose.Schema({
-    DisplayName:String,
-    DBName:String
-
-})
-
-var connectMap = function(callBack){
-    var db = mongoose.createConnection("192.168.1.184","rationLibMap",60666);
-    callBack(db);
-}
-
-
-var MainContentSchema = mongoose.Schema({
-    ContentItems:String,//总说明
-    CalcRule:String//计算规则
-})
-
-
-var RationTreeSchema = mongoose.Schema({//章节树  //生成唯一id改为sectionid  改成string
-    SectionID:Number,
-    ParentID:Number,
-    NextSiblingID:Number,
-    Name:String
-});
-
-
-var SectionTextSchema = mongoose.Schema({//说明及计算规则
-    SectionID:Number,
-    ContentID:Number,
-    Type:Number,
-    Content:[],
-    Interpretation:String,
-    CalcRule:String
-})
-
-
-var RationItemsSchema = mongoose.Schema({//只记载定额基本元素,并未和工料机挂钩
-    RationCode:String,
-    RationName:String,
-    Unit:String,
-    BasePrice:Number,
-    SectionID:Number,
-    ContentID:Number,
-    Caption:String,//显示内容
-    FeeType:Number //取费类别,这条定额对应怎样的费率参与计算,在键定额库的时候手动输入
-});
-
-
-
-var GLJListSchema = mongoose.Schema({
-    GLJCode:String,
-    GLJName:String,
-    Specs:String,//规格,钢筋粗细,光圆
-    Unit:String,//单位
-    BasePrice:Number,
-    Type:Number //工料机类型,便于分类
-});
-
-
-var RationGLJSchema = mongoose.Schema({//定额下的工料机
-    RationCode:String,
-    GLJCode:String,
-    Amount:Number,//消耗量
-    Type:Number//工料机的类型
-});
-
-
-var GLJTypeTreeSchema = mongoose.Schema({//工料机类型树,用于分类工料机
-    ID:Number,
-    ParentID:Number,
-    NextSiblingID:Number,
-    Name:String
-});
-
-
-var MinorRationSchema = mongoose.Schema({
-    MainCode:String,
-    MinorIndex:Number,//辅助定额之间的排序
-    MinorParam:Number,//参数  和自动选择相应辅助定额有关
-    MinorName:String,//调整名称
-    ParamName:String,//参数名称
-    MinorCode:String,//辅助定额编码
-    StdValue:Number,//主定额的临界值
-    Step:Number,//辅助定额调整步距
-    RoundDigit:Number,//不足时百分比小数保留位数
-    RoundMode:Number//进位模式
-});
-
-
-var CoeListSchema = mongoose.Schema({//附注列表,定额的变体,比如没有挖芦苇根这个定额,则利用挖树根定额的工料机做相应调整变为挖芦苇根
-    CoeID:Number,
-    CoeName:String,
-    Param:Number,//工料机总的乘以系数
-    Type:String,//系数类型+ *
-    G:Number,//单行人工系数
-    L:Number,
-    J:Number,
-    Content:String,//调整内容
-    MutexCoeID:Number,//互斥乘系数项ID
-    GLJArray:[{   //除了可以整体调整工料机,还可以调整特定工料机的分项  GLJArray是分项的数组
-        GLJ:Number,//工料机号
-        Count:Number,//调整数量
-        type:String//系数类型
-    }]
-});
-
-
-var RationCoeSchema = mongoose.Schema({//定额与其附注关系
-    ID:Number,
-    SectionCode:Number,//附注可用于相关节点下所有的定额
-    RationCode:String,
-    CoeID:Number,
-    Order:Number//排序
-});
-
-
-var Schemas = {
-    "connectMap":connectMap,
-    //"connectDB": connectDB,
-    "MainContentSchema":MainContentSchema,
-    "RationTreeSchema":RationTreeSchema,
-    "SectionTextSchema":SectionTextSchema,
-    "RationItemsSchema":RationItemsSchema,
-    "GLJListSchema":GLJListSchema,
-    "RationGLJSchema":RationGLJSchema,
-    "GLJTypeTreeSchema":GLJTypeTreeSchema,
-    "MinorRationSchema":MinorRationSchema,
-    "CoeListSchema":CoeListSchema,
-    "RationCoeSchema":RationCoeSchema,
-     "RationLibMapSchema": RationLibMapSchema
-}
-
-module.exports = Schemas;

+ 0 - 569
modules/rationLibEditor/db/interfaces.js

@@ -1,569 +0,0 @@
-var mongoose = require("mongoose");
-var Schemas = require("./Schemas");
-
-
-var callback = function(req,res,err,data){
-    if(data){
-        res.status(200)
-        res.json({success:true,data:data});
-    }
-    else
-    if(err){
-        res.status(500)
-        res.json({success:false,error:err});
-    }
-    else{
-        res.status(204);
-        res.json({success:true});
-    }
-}
-
-var inserts = {};
-var searchs = {};
-var updates = {}
-var removes = {}
-/*inserts.RationLibInsert = function(req,res){
-    var str = req.body.rationDisPlayName;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-       var lib = new LibMapModel({"DisplayName":str, "DBName":str}).save(function(err){
-           if(err) callback(req,res,err,false)
-           else
-           callback(req,res,false," ");
-       })
-    })
-}*/
-inserts.MainContentInsert = function(){};
-/*inserts.RationSectionInsert = function(req,res){//find and updata;
-    var DBName = req.body.rationName;
-    var rationSection = JSON.parse(req.body.rationSection);
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length) {
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
-                var RationTreeModel = db.model("rationtrees", Schemas.RationTreeSchema);
-                RationTreeModel.find({"SectionID":rationSection.SectionID},function(err,data){
-                    if(data.length){
-                        RationTreeModel.update({'SectionID':rationSection.SectionID},rationSection,function(err,data){
-                            if(err){
-                                callback(req,res,"some error occured when save RationTempTree!",false);
-                            }else
-                                callback(req,res,false,"save RationTempTree success!");
-                        });
-
-                    }else{
-                        var N = new RationTreeModel(rationSection).save(function(err){
-                            if(err){
-                                callback(req,res,"some error occured when save RationTempTree!",false);
-                            }else
-                                callback(req,res,false,"save RationTempTree success!");
-                        })
-                    }
-                })
-            }
-        })
-    })
-};*/
-inserts.SectionTextInsert = function(req,res){};
-inserts.RationItemsInsert = function(req,res){
-    var DBName = req.body.rationName;
-    var rationItem = JSON.parse(req.body.rationItem);
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var GLJListModel =db.model("rationitems",Schemas.RationItemsSchema);
-                //加控制语句
-                GLJListModel.find({"RationCode":rationItem.RationCode},function(err,data){
-                    if(data.length)
-                        callback(req,res,"定额号重复!",false)
-                    else
-                    new GLJListModel(rationItem).save(function(err){
-                        if(err){
-                            callback(req,res,"",false);
-                        }else{
-                            callback(req,res,false,"");
-                        }
-                    })
-                })
-
-
-            }
-        })
-    })
-};
-inserts.RationContentInsert = function(){};
-inserts.GLJListInsert = function(req,res){
-    var DBName = req.body.rationName;
-    var glj = JSON.parse(req.body.gljItem);
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
-                GLJListModel.find({"GLJCode":glj.GLJCode},function(err,data){
-                    if(data.length) callback(req,res,"工料机号重复!",false)
-                    else
-                        new GLJListModel(glj).save(function(err){
-                            if(err){
-                                callback(req,res,"新增工料机错误!",false);
-                            }else{
-                                callback(req,res,false,"");
-                            }
-                        })
-                })
-
-            }
-        })
-    })
-};
-inserts.RationGLJInsert = function(req,res){
-    var DBName = req.body.rationName;
-    var rationGLJ = JSON.parse(req.body.rationGLJ);
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var GLJListModel =db.model("rationgljs",Schemas.RationGLJSchema);
-                GLJListModel.find({"RationCode":rationGLJ.RationCode,"GLJCode":rationGLJ.GLJCode},function(err,data){
-                    if(data.length) callback(req,res,"不可在一条定额下套用相同定额多次",false)
-                    else
-                        new GLJListModel(rationGLJ).save(function(err){
-                            if(err){
-                                callback(req,res,"",false);
-                            }else{
-                                callback(req,res,false,data);
-                            }
-                        })
-                })
-
-            }
-        })
-    })
-};
-inserts.GLJTypeTreeInsert = function(){};
-inserts.MinorRationInsert = function(){};
-inserts.CoeListInsert = function(){};
-inserts.RationCoeInsert = function(){};
-/*inserts.TempRationTreeInsert = function(req,res){
-    var DBName = req.body.rationName;
-    var rationTempTree = JSON.parse(req.body.rationTempTree);
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var RationTreeModel =db.model("rationtrees",Schemas.RationTreeSchema);
-                for(i=0;i<rationTempTree.length;i++){
-                    var node ={}
-                    node.SectionID = rationTempTree[i].id;
-                    node.ParentID = rationTempTree[i].pId;
-
-                    node.NextSiblingID = rationTempTree[i].nId;
-                    node.Name =rationTempTree[i].name;
-                    var N = new RationTreeModel(node).save(function(err){
-                        if(err) console.log("wocao")
-                    });
-                }
-                if (i>=rationTempTree.length)
-                    callback(req,res,false,"save RationTempTree success!");
-                else
-                    callback(req,res,"some error occured when save RationTempTree!",false);
-            }
-        })
-    })
-}*/
-/*searchs.getRationTree = function(req,res){
-    //打开连接相映定额库
-    //返回树结构到前段ztree处理
-    var DBName = req.body.rationName;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var RationTreeModel =db.model("rationtrees",Schemas.RationTreeSchema);
-                RationTreeModel.find({},function(err,data){
-                    if(data.length)
-                    {
-                        callback(req,res,false,data);
-                    }
-                    else
-                    {
-                        callback(req,res,"查询定额错误!",false)
-                    }
-                })
-            }
-        })
-    });
-}*/
-/*searchs.getRationLibs = function(req,res){
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({},{"DisplayName":1},function(err,data){
-            if(data){
-                callback(req,res,false,data);
-            }
-            else{
-                callback(req,res,"没有定额库",false);
-            }
-        })
-    })
-}*/
-searchs.getGLJList = function(req,res){
-    var DBName = req.body.rationName;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
-                GLJListModel.find({},function(err,data){
-                    if(data.length)
-                    {
-                        callback(req,res,false,data);
-                    }
-                    else
-                    if(err)
-                    {
-                        callback(req,res,"err",false)
-                    }
-                    else{
-                        callback(req,res,false,false)
-                    }
-                })
-            }
-        })
-    });
-}
-searchs.getGLJByCode = function(req,res){
-    var DBName = req.body.rationName;
-    var gljCode =req.body.gljCode ;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
-                GLJListModel.find({"GLJCode":gljCode},function(err,data){
-                    if(data.length)
-                        callback(req,res,false,data);
-                    else
-                        callback(req,res,"无此工料机",false)
-                })
-            }
-        })
-    });
-}
-searchs.getRationGLJItems = function(req,res){
-    var DBName = req.body.rationName;
-    var rationCode = req.body.rationCode;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                var db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var RationGLJModel =db.model("rationgljs",Schemas.RationGLJSchema);
-                RationGLJModel.find({"RationCode":rationCode},function(err,rationglj){
-                    if(rationglj.length) callback(req,res,false,rationglj);
-                    else if(err)callback(req,res,"err",false);
-                    else callback(req,res,false,false);
-                })
-            }
-        })
-    });
-}
-searchs.getGLJ = function(req,res){
-    var DBName = req.body.rationName;
-    var GLJCode = req.body.GLJCode ;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
-                GLJListModel.find({"GLJCode":GLJCode},function(err,data){
-                    if(data.length)
-                    {
-                        callback(req,res,false,data);
-                    }
-                    else
-                    {
-                        callback(req,res,"",false)
-                    }
-                })
-            }
-        })
-    });
-}
-searchs.getRationsBySectionID = function(req,res){
-    var DBName = req.body.rationName;
-    var sectionID = Number(req.body.sectionID) ;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var GLJListModel =db.model("rationitems",Schemas.RationItemsSchema);
-                GLJListModel.find({"SectionID":sectionID},function(err,data){
-                    if(data.length)
-                    {
-                        callback(req,res,false,data);
-                    }
-                    else
-                    {
-                        callback(req,res,"",false)
-                    }
-                })
-            }
-        })
-    });
-}
-searchs.getRationByCode = function(req,res){
-    var DBName = req.body.rationName;
-    var rationCode =req.body.RationCode ;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var RationModel =db.model("rationitems",Schemas.RationItemsSchema);
-                RationModel.find({"RationCode":rationCode},function(err,data){
-                    if(data.length)
-                    {
-                        callback(req,res,false,data);
-                    }
-                    else
-                    {
-                        callback(req,res,"",false)
-                    }
-                })
-            }
-        })
-    });
-}
-/*removes.deleteRationLibs = function(req,res){//只删除了映射表内容  级联操作待完成
-    var rationName = req.body.rationName;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":rationName},function(err,data){
-            if(data.length) {
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
-                db.dropDatabase(function(err){
-                    if(err) callback(req,res,"drop err",false);
-                    else{
-                        callback(req,res,false,"ok")
-                    }
-                });
-            }
-        })
-    })
-
-}*/
-removes.deleteRationMapItem=function(req,res){
-    var rationName = req.body.rationName;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.remove({"DisplayName":rationName},function(err){
-            if(err) callback(req,res,"删除错误",false);
-            else callback(req,res,false,"已删除");
-        })
-    })
-}
-removes.deleteRationSection =function(req,res){
-    var DBName = req.body.rationName;
-    var sectionID = req.body.rationSection;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length) {
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
-                var RationTreeModel = db.model("rationtrees", Schemas.RationTreeSchema);
-                RationTreeModel.remove({"SectionID":sectionID},function(err){
-                    if(err){callback(req,res,"删除错误",false);}
-                    else{callback(req,res,false,"已删除");}
-                })
-            }
-        })
-    })
-}
-removes.deleteGLJItem = function(req,res){
-    var DBName = req.body.rationName;
-    var gljItem = req.body.GLJCode;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length) {
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
-                var gljListModel = db.model("gljlists", Schemas.GLJListSchema);
-                gljListModel.remove({"GLJCode":gljItem},function(err){
-                    if(err){callback(req,res,"删除错误",false);}
-                    else{callback(req,res,false,"已删除");}
-                })
-            }
-        })
-    })
-}
-removes.deleteRation = function(req,res){
-    var DBName = req.body.rationName;
-    var delvalue = req.body.value;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length) {
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
-                var rationModel = db.model("rationitems",Schemas.RationItemsSchema);
-                rationModel.remove({"RationCode":delvalue},function(err){
-                    if(err) callback(req,res,"err",false)
-                    else {
-                        var rationGLJModel = db.model("rationgljs",Schemas.RationGLJSchema);
-                        rationGLJModel.remove({"RationCode":delvalue},function(err){
-                            if(err) callback(req,res,"err",false)
-                            else callback(req,res,false,"ok")
-                        })
-                    };
-                });
-            }
-        })
-    })
-}
-removes.deleteRationGLJ = function(req,res){
-   var DBName = req.body.rationName;
-    var delvalue = req.body.value;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length) {
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
-                var rationModel = db.model("rationgljs",Schemas.RationGLJSchema);
-                rationModel.remove({"GLJCode":delvalue},function(err){
-                    if(err)
-                        callback(req,res,"err",false)
-                    else
-                        callback(req,res,false,"ok")
-                });
-            }
-        })
-    })
-
-}
-/*updates.updateRationLib = function(req,res){
-    var str = req.body.rationName;
-    var newName = req.body.newName;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.update({"DisplayName":str},{$set:{"DisplayName":newName}},function(err){
-            if(err) callback(req,res,"err",false)
-            else callback(req,res,false,"ok");
-            })
-    })
-
-}*/
-updates.updateGLJItem = function(req,res){
-    var DBName = req.body.rationName;
-    var GLJCode = req.body.GLJCode;
-    var glj =JSON.parse(req.body.newGLJ);
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-
-                var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
-                GLJListModel.update({"GLJCode":GLJCode},glj,function(err){
-                    if(err) callback(req,res,"err",false)
-                    else callback(req,res,false,"ok");
-                })
-            }
-        })
-    })
-}
-updates.updateRationItem = function(req,res){
-    var DBName = req.body.rationName;
-    var rationCode = req.body.RationCode;
-    var rationItem =JSON.parse(req.body.newRation);
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var RationModel =db.model("rationitems",Schemas.RationItemsSchema);
-                RationModel.update({"RationCode":rationCode},rationItem,function(err){
-                    if(err) callback(req,res,"err",false)
-                    else callback(req,res,false,"ok");
-                })
-            }
-        })
-    })
-}
-updates.updateRGLJAmount = function(req,res){
-    var DBName = req.body.rationName;
-    var rationCode = req.body.RationCode;
-    var gljCdoe = req.body.GLJCode
-    var Amount = req.body.Amount;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var RationModel =db.model("rationgljs",Schemas.RationGLJSchema);
-                RationModel.update({"RationCode":rationCode,"GLJCode":gljCdoe},{$set:{'Amount':Amount}},function(err){
-                    if(err) callback(req,res,"err",false)
-                    else callback(req,res,false,"ok");
-                })
-            }
-        })
-    })
-}
-updates.setRationBasePrice = function(req,res){
-    var DBName = req.body.rationName;
-    var rationCode = req.body.rationCode;
-    var basePrice = req.body.BasePrice;
-    Schemas.connectMap(function(db){
-        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
-        LibMapModel.find({"DisplayName":DBName},function(err,data){
-            if(data.length){
-                var realRationName = data[0].DBName;
-                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
-                var RationModel =db.model("rationitems",Schemas.RationItemsSchema);
-                RationModel.update({"RationCode":rationCode},{$set:{'BasePrice':basePrice}},function(err){
-                    if(err) callback(req,res,"err",false)
-                    else callback(req,res,false,"ok");
-
-                })
-            }
-        })
-    })
-}
-var interfaces = {
-    "insert":inserts,
-    "remove":removes,
-    "search":searchs,
-    "update":updates
-};
-
-module.exports =interfaces;

+ 0 - 80
modules/rationLibEditor/models/gljList.js

@@ -1,80 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/23.
- */
-var mongoose = require("mongoose");
-var dbm = require("../../../config/db/db_manager");
-var async = require("async");
-var Schema = mongoose.Schema;
-
-
-var gljListSchema = mongoose.Schema({
-    GLJCode:String,
-    GLJName:String,
-    specs:String,//规格,钢筋粗细,光圆
-    unit:String,//单位
-    basePrice:Number,
-    type:Number //工料机类型,便于分类
-});
-
-var gljListDAO = function(){};
-
-gljListDAO.prototype.insertGLJList = function(LibName,value,callback){
-    var db = dbm.getCfgConnection(LibName);
-    var gljListModel = db.model("gljlists",gljListSchema);
-    if(value.cellCurrValue == value.cellPrimValue) callback(false,false);
-    gljListModel.find({GLJCode:value.cellCurrValue},function(err,data){
-        if(data.length)
-            callback(false,false);
-        else{
-            if(value.cellPrimValue == null){
-                var glj = {};
-                glj.GLJCode = value.cellCurrValue;
-                glj.GLJName = null;
-                glj.specs = null;
-                glj.unit = null;
-                glj.basePrice = null;
-                glj.type = null;
-                new gljListModel(glj).save(function(err){
-                    if(err)
-                        callback(err,false);
-                    else
-                        callback(err,"ok")
-                })
-            }else
-                gljListModel.update({gljCode:value.cellPrimValue},{$set:{gljCode:value.cellCurrValue}},function(err){
-                    if(err) callback("更新工料机发生错误",false);
-                    else  callback(err,"ok");
-                });
-        }
-    })
-}
-
-gljListDAO.prototype.updateGLJList = function(libName,value,data,callback){
-    var db = dbm.getCfgConnection(libName);
-    var gljListModel = db.model("gljlists",gljListSchema);
-    var glj = {}
-    glj.GLJCode = data[0];
-    glj.GLJName = data[1];
-    glj.specs = data[2];
-    glj.unit = data[3];
-    glj.basePrice = data[4];
-    glj.type = data[5];
-    gljListModel.find({GLJCode:glj.GLJCode},function(err,data){
-        if(err) callback("请确是否有该工料机!",false)
-        else
-            gljListModel.update({GLJCode:glj.GLJCode},glj,function(err){
-                if(err) callback("更新工料机错误",false);
-                else callback(err,"更新成功");
-            })
-    })
-}
-
-gljListDAO.prototype.removeGLJList = function(libName,value,callback){
-    var db = dbm.getCfgConnection(libName);
-    var gljListModel = db.model("gljlists",gljListSchema);
-    gljListModel.remove({GLJCode:value.cellPrimValue},function(err){
-        if(err) callback("删除失败",false)
-        else callback(err,"ok");
-    })
-}
-module.exports = new gljListDAO()

+ 0 - 78
modules/rationLibEditor/models/rationItems.js

@@ -1,78 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/23.
- */
-var mongoose = require("mongoose");
-var dbm = require("../../../config/db/db_manager");
-var async = require("async");
-var Schema = mongoose.Schema;
-
-
-var rationItemsSchema = mongoose.Schema({//只记载定额基本元素,并未和工料机挂钩
-    rationCode:String,
-    rationName:String,
-    unit:String,
-    basePrice:Number,
-    sectionId:Number,
-    contentId:Number,
-    caption:String,//显示内容
-    feeType:Number //取费类别,这条定额对应怎样的费率参与计算,在键定额库的时候手动输入
-});
-
-var rationItemsDAO = function(){};
-
-rationItemsDAO.prototype.insertRation = function(LibName,value,callback){
-    var db = dbm.getCfgConnection(LibName);
-    var rationItemsModel = db.model("rationItems",rationItemsSchema);
-    if(value.cellCurrValue == value.cellPrimValue) callback(false,false);
-    rationItemsModel.find({rationCode:value.cellCurrValue},function(err,data){
-        if(data.length)
-            callback(false,false);
-        else{
-            if(value.cellPrimValue == null){
-                var ration = {};
-                ration.rationCode = value.cellCurrValue;
-                ration.rationName = null;
-                ration.unit = null;
-                ration.basePrice = null;
-                ration.sectionId = null;
-                ration.contentId = null;
-                ration.caption = null;
-                ration.feeType = null;
-                new rationItemsModel(ration).save(function(err){
-                    if(err)
-                        callback(err,false);
-                    else
-                        callback(err,"ok")
-
-                })
-            }else
-                rationItemsModel.update({rationCode:value.cellPrimValue},{$set:{rationCode:value.cellCurrValue}},function(err){
-                    if(err) callback("更新定额发生错误",false);
-                    else  callback(err,"ok");
-                });
-        }
-    })
-}
-rationItemsDAO.prototype.updateRation = function(libName,value,data,callback){
-    var db = dbm.getCfgConnection(libName);
-    var rationItemsModel = db.model("rationItems",rationItemsSchema);
-    var ration = {}
-    ration.rationCode = data[0];
-    ration.rationName = data[1];
-    ration.unit = data[2];
-    ration.basePrice = data[3];
-    ration.sectionId = value.sectionSelected;
-    ration.contentId = null;
-    ration.caption = data[4];
-    ration.feeType = data[5];
-    rationItemsModel.find({rationCode:ration.rationCode},function(err,data){
-        if(err) callback("请确是否有该定额!",false)
-        else
-        rationItemsModel.update({rationCode:ration.rationCode},ration,function(err){
-            if(err) callback("更新定额错误",false)
-            else callback(err,"更新成功");
-        })
-    })
-}
-
-module.exports = new rationItemsDAO()

+ 0 - 92
modules/rationLibEditor/models/rationLibMap.js

@@ -1,92 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/20.
- */
-var mongoose = require("mongoose");
-var dbm = require("../../../config/db/db_manager");
-var async = require("async");
-var db = dbm.getCfgConnection("rationLibMap");
-//var schema = mongoose.Schema;
-
-var rationLibMapSchema = mongoose.Schema({
-    displayName:String,
-    dbName:String
-})
-
-var rationLibMap = db.model("rationlibmaps", rationLibMapSchema);
-
-var rationLibMapDAO = function(){};
-
-rationLibMapDAO.prototype.getRealLibName = function(rationName,callback){
-    rationLibMap.find({"displayName":rationName}, function(err,data){
-        if (err) {
-            callback('Error', null);
-        } else {
-            callback(0, data);
-        }
-    });
-};
-
-rationLibMapDAO.prototype.addRationLib = function(rationName,callback){
-    rationLibMap.find({"risplayName":rationName},function(err,data){
-        if(data.length == 0)
-            new rationLibMap({"displayName":rationName,"dbName":rationName}).save(function(err) {
-                if (err) callback("Error", null)
-                else
-                    callback(false, "ok");
-            })
-        else
-        callback("定额库重名!",null)
-    })
-}
-
-rationLibMapDAO.prototype.getDisplayRationLibs = function(callback) {
-    rationLibMap.find({}, function(err, data){
-        if (err) {
-            callback( 'Error', null);
-        } else {
-            callback( false, data);
-        }
-    });
-};
-
-rationLibMapDAO.prototype.deleteRationLib = function(rationName,callback){
-    async.waterfall([
-        function(cb){
-            rationLibMap.find({"displayName":rationName},function(err,data){
-                cb(err,data)
-            })
-        },
-        function(data,cb){
-            var db1 = dbm.getCfgConnection(data[0].dbName);
-            db1.dropDatabase(function(err){
-              cb(err,data)
-            })
-        },
-        function(data,cb){
-             RationLibMap.remove({"displayName":rationName},function(err,data){
-                 cb(err,data);
-             })
-        }
-    ],
-        function(err,result){
-        if (err) {
-            callback( 'Error', null);
-        } else {
-            callback( '', "ok");
-        }
-    })
-}
-
-rationLibMapDAO.prototype.editRationLib = function(rationName,newName,callback){
-    rationLibMap.find({"displayName":newName}, function(err, data){
-        if (data.length == 0) {
-            rationLibMap.update({displayName:rationName},{$set:{displayName:newName}},function(err){
-                if(err) callback("err",false);
-                else callback(false,"ok")
-            })
-        } else
-        callback("不可重名!",false);
-    });
-}
-
-module.exports = new rationLibMapDAO();

+ 0 - 67
modules/rationLibEditor/models/rationTree.js

@@ -1,67 +0,0 @@
-/**
- * Created by Syusuke on 2017/3/20.
- */
-var mongoose = require("mongoose");
-var dbm = require("../../../config/db/db_manager");
-var async = require("async");
-var Schema = mongoose.Schema;
-
-var rationTreeSchema = mongoose.Schema({//章节树  //生成唯一id改为sectionID  改成string
-    sectionId:Number,
-    parentId:Number,
-    nextSiblingId:Number,
-    name:String
-});
-
-
-var rationTreeDAO = function(){};
-
-rationTreeDAO.prototype.getRationTrees = function(Libname,callback){
-    var db = dbm.getCfgConnection(Libname)
-    var rationTreeModel = db.model("rationtrees",rationTreeSchema)
-    rationTreeModel.find({},function(err,data){
-        if(data.length) callback(false,data);
-        else  if(err) callback("获取定额树错误!",false)
-        else callback(false,false);
-    })
-}
-rationTreeDAO.prototype.tempRationTreeInsert = function(Libname,rationTempTree,callback){
-    var db = dbm.getCfgConnection(Libname)
-    var rationTreeModel = db.model("rationtrees",rationTreeSchema)
-    rationTreeModel.collection.insert(rationTempTree,function(err,data){
-     if(err) callback("插入定额模板错误",false)
-     else callback(false,"ok")
-     })
-}
-
-rationTreeDAO.prototype.sectionUpsert = function(Libname,section,callback){
-    var db = dbm.getCfgConnection(Libname);
-    var rationTreeModel = db.model("rationtrees",rationTreeSchema);
-    rationTreeModel.find({"sectionId": section.sectionId},function(err,data){
-        if(data.length){
-            rationTreeModel.update({'sectionId':section.sectionId},section,function(err,data){
-                if(err){
-                    callback(" ",false);
-                }else
-                    callback(false,"ok");
-            });
-        }else{
-            var N = new rationTreeModel(section).save(function(err){
-                if(err){
-                    callback(" ",false);
-                }else
-                    callback(false,"success!");
-            })
-        }
-    })
-}
-//待  ration模块完成
-rationTreeDAO.prototype.deleteSection= function(Libname,sectionId,callback){
-    var db = dbm.getCfgConnection(Libname);
-    var rationTreeModel = db.model("rationItems",rationTreeSchema);
-    rationTreeModel.find({"sectionId": sectionId},[],function(err,data){
-
-    })
-}
-
-module.exports = new rationTreeDAO()

+ 0 - 71
modules/rationLibEditor/routes/rationLibEditor_route.js

@@ -1,71 +0,0 @@
-var express = require("express");
-var apiRouter =express.Router();
-var _rootDir = __dirname;
-
-var RationLibMapController = require("../controller/RLibMapController")
-var RationTreeController = require("../controller/RTreeController");
-var RationItemController = require("../controller/RItemsController")
-var GLJListController = require("../controller/gljListController")
-var path = require('path');
-var htmlPath = path.join(__dirname,'../../../','web/rationLibEditor/');
-apiRouter.get('/', function(req, res) {
-        res.redirect('/main');
-});
-
-var RationInterface = require("../db/interfaces");
-apiRouter.get("/main",function(req,res){
-    res.render("rationLibEditor/main.html");
-})
-
-apiRouter.get('/rationLib', function (req, res) {
-    res.render("rationLibEditor/dinge.html");
-});
-
-apiRouter.get('/gongliao', function (req, res) {
-    res.render("rationLibEditor/gongliao.html");
-});
-
-apiRouter.get('/fuzhu', function (req, res) {
-    res.render("rationLibEditor/fuzhu.html");
-});
-
-//apiRouter.post("/addSection",RationInterface.insert.RationSectionInsert);
-apiRouter.post("/removeSection",RationInterface.remove.deleteRationSection);
-apiRouter.post("/saveGLJ",RationInterface.insert.GLJListInsert);
-apiRouter.post("/getGLJ",RationInterface.search.getGLJList);
-apiRouter.post("/deleteGLJItem",RationInterface.remove.deleteGLJItem);
-apiRouter.post("/saveRationItem",RationInterface.insert.RationItemsInsert);
-apiRouter.post("/getRationsBySectionID",RationInterface.search.getRationsBySectionID);
-apiRouter.post("/getGLJByCode",RationInterface.search.getGLJByCode);
-apiRouter.post("/getRationGLJItems",RationInterface.search.getRationGLJItems);
-apiRouter.post("/saveRationGLJ",RationInterface.insert.RationGLJInsert);
-apiRouter.post("/getGLJItem",RationInterface.search.getGLJ);
-apiRouter.post("/editGLJItem",RationInterface.update.updateGLJItem);
-apiRouter.post("/deleteRation",RationInterface.remove.deleteRation);
-apiRouter.post("/deleteRationMapItem",RationInterface.remove.deleteRationMapItem);
-apiRouter.post("/deleteRationGLJ",RationInterface.remove.deleteRationGLJ);
-apiRouter.post("/editRation",RationInterface.remove.deleteRationGLJ);
-apiRouter.post("/editRGLJAmount",RationInterface.update.updateRGLJAmount);
-apiRouter.post("/editRationItem",RationInterface.update.updateRationItem);
-apiRouter.post("/getRationByCode",RationInterface.search.getRationByCode);
-apiRouter.post("/setRationBasePrice",RationInterface.update.setRationBasePrice);
-
-//--------------------------------------------------rationLibMap
-apiRouter.post("/addRationLib",RationLibMapController.addRationLib);
-apiRouter.post("/getRationDisplayNames",RationLibMapController.getDisPlayRationLibs);
-apiRouter.post("/deleteRationLibs",RationLibMapController.deleteRationLib);
-apiRouter.post("/editRationLibs",RationLibMapController.editRationLibs);
-apiRouter.post("/getRealLibName",RationLibMapController.getRealLibName);
-//----------------------------------------------------rationTree
-apiRouter.post("/getRationTree",RationTreeController.getRationTree);
-apiRouter.post("/saveTempRationTree",RationTreeController.tempRationTreeInsert);
-apiRouter.post("/addSection",RationTreeController.sectionUpsert);
-apiRouter.post("/deleteSection",RationTreeController.deleteSection);
-//----------------------------------------------------ration
-apiRouter.post("/insertRation",RationItemController.insertRation);
-apiRouter.post("/updateRation",RationItemController.updateRation);
-//----------------------------------------------------gljList
-apiRouter.post("/insertGLJList",GLJListController.insertGLJList);
-apiRouter.post("/updateGLJList",GLJListController.updateGLJList);
-apiRouter.post("/removeGLJList",GLJListController.removeGLJList);
-module.exports = apiRouter;