改变counter引用

modules/bills_lib/models/bills_lib_interfaces.js

@@ -64,7 +64,7 @@ billsLibDao.prototype.getStdBillsLib = function(callback){
 
 billsLibDao.prototype.createStdBillsLib = function(clibData, callback){
     counter.counterDAO.getIDAfterCount(counter.moduleName.billsLib, 1, function(err, result){
-        let billsLibId = result.value.sequence_value;
+        let billsLibId = result.sequence_value;
         let userAccount = clibData.userAccount;
         let billsLibName = clibData.name;
         let compilationId = clibData.compilationId;
@@ -1480,7 +1480,7 @@ billsLibDao.prototype.pasteRel = function (data, callback) {
                             cb(err);
                         }
                         else {
-                            let newJobId = result.value.sequence_value;
+                            let newJobId = result.sequence_value;
                             let newJobContent = {
                                 id: newJobId,
                                 billsLibId: billsLibId,
@@ -1537,7 +1537,7 @@ billsLibDao.prototype.pasteRel = function (data, callback) {
                             cb(err);
                         }
                         else {
-                            let newJobId = result.value.sequence_value;
+                            let newJobId = result.sequence_value;
                             let newJobContent = {
                                 id: newJobId,
                                 billsLibId: billsLibId,
@@ -1592,7 +1592,7 @@ billsLibDao.prototype.pasteRel = function (data, callback) {
                             cb(err);
                         }
                         else {
-                            let newItemId = result.value.sequence_value;
+                            let newItemId = result.sequence_value;
                             let newItemContent = {
                                 id: newItemId,
                                 billsLibId: billsLibId,
@@ -1647,7 +1647,7 @@ billsLibDao.prototype.pasteRel = function (data, callback) {
                             cb(err);
                         }
                         else {
-                            let newItemId = result.value.sequence_value;
+                            let newItemId = result.sequence_value;
                             let newItemContent = {
                                 id: newItemId,
                                 billsLibId: billsLibId,
@@ -1828,7 +1828,7 @@ billsLibDao.prototype.createJobContent = function(cJobData, callback){
                     cb(err)
                 }
                 else {
-                    let newJobId = result.value.sequence_value;
+                    let newJobId = result.sequence_value;
                     newJobContent = {
                         id: newJobId,
                         billsLibId: billsLibId,
@@ -2069,7 +2069,7 @@ billsLibDao.prototype.pasteJobs = function (data, callback) {
                         cb(err);
                     }
                     else {
-                        let newJobId = result.value.sequence_value;
+                        let newJobId = result.sequence_value;
                         jobObj.id = newJobId;
                         data.newJobId = newJobId
                         JobContent.create(jobObj, function(err){
@@ -2117,7 +2117,7 @@ billsLibDao.prototype.edCreateJob = function(data, callback){
                     cb(err, null);
                 }
                 else {
-                    let newJobId = result.value.sequence_value;
+                    let newJobId = result.sequence_value;
                     cb(null, newJobId);
                 }
             })
@@ -2196,7 +2196,7 @@ billsLibDao.prototype.edUpdateJob = function(data, callback){
                     cb(err, null);
                 }
                 else {
-                    let newJobId = result.value.sequence_value;
+                    let newJobId = result.sequence_value;
                     cb(null, newJobId);
                 }
             })
@@ -2286,7 +2286,7 @@ billsLibDao.prototype.createItemCharacter = function(cItemData, callback){
                     cb(err);
                 }
                 else{
-                    let newItemId = result.value.sequence_value;
+                    let newItemId = result.sequence_value;
                     newItemCharacter = {
                         id: newItemId,
                         billsLibId: billsLibId,
@@ -2712,7 +2712,7 @@ billsLibDao.prototype.pasteItems = function (data, callback) {
                         cb(err);
                     }
                     else{
-                        let newItemId = result.value.sequence_value;
+                        let newItemId = result.sequence_value;
                         itemObj.id = newItemId;
                         data.newItemId = newItemId;
                         ItemCharacter.create(itemObj, function(err){
@@ -2901,7 +2901,7 @@ billsLibDao.prototype.edCreateItem = function(data, callback){
                     cb(err, null);
                 }
                 else {
-                    let newItemId = result.value.sequence_value;
+                    let newItemId = result.sequence_value;
                     cb(null, newItemId);
                 }
             })
@@ -2980,7 +2980,7 @@ billsLibDao.prototype.edUpdateItem = function(data, callback){
                     cb(err, null);
                 }
                 else {
-                    let newItemId = result.value.sequence_value;
+                    let newItemId = result.sequence_value;
                     cb(null, newItemId);
                 }
             })

modules/ration_repository/models/coe.js

@@ -92,7 +92,7 @@ coeListDAO.prototype.saveToCoeList = function(data, callback) {
 coeListDAO.prototype.addItems = function(addArr, callback) {
     if (addArr && addArr.length > 0) {
         counter.counterDAO.getIDAfterCount(counter.moduleName.coeList, addArr.length, function(err, result){
-            let maxId = result.value.sequence_value;
+            let maxId = result.sequence_value;
             let functions = [];
             for (let i = 0; i < addArr.length; i++) {
                 let obj = new coeListModel(addArr[i]);

modules/ration_repository/models/glj_repository.js

@@ -173,7 +173,7 @@ gljItemDAO.prototype.removeGljItems = function(repId, lastOpr, rIds, callback) {
 gljItemDAO.prototype.addGljItems = function(repId, lastOpr, items, callback) {
     if (items && items.length > 0) {
         counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, items.length, function(err, result){
-            var maxId = result.value.sequence_value;
+            var maxId = result.sequence_value;
             var arr = [];
             for (var i = 0; i < items.length; i++) {
                 var obj = new gljItemModel(items[i]);
@@ -295,7 +295,7 @@ gljItemDAO.prototype.removeNodes =  function(repId, lastOpr, nodeIds, preNodeId,
 gljItemDAO.prototype.createNewNode = function(repId, lastOpr, lastNodeId, nodeData, callback) {
     return counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, 1, function(err, result){
         nodeData.repositoryId = repId;
-        nodeData.ID = result.value.sequence_value;
+        nodeData.ID = result.sequence_value;
         var node = new gljTypeModel(nodeData);
         async.parallel([
             function (cb) {

modules/ration_repository/models/ration_item.js

@@ -140,7 +140,7 @@ rationItemDAO.prototype.getRationItem = function (repId, code, callback) {
 rationItemDAO.prototype.addRationItems = function(rationLibId, lastOpr, sectionId, items,callback){
     if (items && items.length > 0) {
         counter.counterDAO.getIDAfterCount(counter.moduleName.rations, items.length, function(err, result){
-            var maxId = result.value.sequence_value;
+            var maxId = result.sequence_value;
             var arr = [];
             for (var i = 0; i < items.length; i++) {
                 var obj = new rationItemModel(items[i]);
@@ -721,7 +721,7 @@ rationItemDAO.prototype.batchAddFromExcel = async function(rationRepId, data) {
 
     // 组织id
     const counterInfo = await counter.counterDAO.getIDAfterCount(counter.moduleName.rations, insertData.length);
-    let maxId = counterInfo.value.sequence_value;
+    let maxId = counterInfo.sequence_value;
     maxId = parseInt(maxId);
 
     let count = 0;

modules/ration_repository/models/ration_section_tree.js

@@ -23,7 +23,7 @@ rationChapterTreeDAO.prototype.getNewRationTreeID = function (callback) {
             callback(err, null);
         }
         else{
-            callback(0, result.value.sequence_value);
+            callback(0, result.sequence_value);
         }
     });
 };
@@ -39,7 +39,7 @@ rationChapterTreeDAO.prototype.getRationChapterTreeByRepId = function(repId,call
 rationChapterTreeDAO.prototype.createNewNode = function(lastOpr, libId, lastNodeId, nodeData,callback){
     counter.counterDAO.getIDAfterCount(counter.moduleName.rationTree, 1, function(err, result){
         nodeData.rationRepId = libId;
-        nodeData.ID = result.value.sequence_value;
+        nodeData.ID = result.sequence_value;
         var node = new rationChapterTreeModel(nodeData);
         async.parallel([
             function (cb) {

modules/ration_repository/models/repository_map.js

@@ -129,7 +129,7 @@ rationRepositoryDao.prototype.getRepositoryById = function(repId,callback = null
 rationRepositoryDao.prototype.addRationRepository = function( rationLibObj,callback){
     counter.counterDAO.getIDAfterCount(counter.moduleName.rationMap, 1, function(err, result){
         var rMap = createNewLibModel(rationLibObj);
-        rMap.ID = result.value.sequence_value;
+        rMap.ID = result.sequence_value;
         new rationRepository(rMap).save(function(err, result) {
             if (err) callback("Error", null);
             else{

modules/reports/controllers/rpt_tpl_controller.js

@@ -243,7 +243,7 @@ let mExport = {
         let params = JSON.parse(req.body.params),
             scope = params.scope;
         counter.counterDAO.getIDAfterCount(counter.moduleName.report, scope, function(err, result){
-            callback(req,res, false, "", result.value.sequence_value);
+            callback(req,res, false, "", result.sequence_value);
         });
     },
     createDftRptTpl: function(req, res) {

modules/std_glj_lib/models/gljMapModel.js

@@ -113,7 +113,7 @@ class GljMapDao extends OprDao{
             }
             else{
                 let newGljLib = GljMapDao.createNewLibModel(gljLibObj);
-                newGljLib.ID = result.value.sequence_value;
+                newGljLib.ID = result.sequence_value;
                 gljMapModel.create(newGljLib, function (err, result) {
                     if(err){
                         callback(err, '创建新工料机库失败！', null);

modules/std_glj_lib/models/gljModel.js

@@ -281,7 +281,7 @@ class GljDao  extends OprDao{
     static addGljItems (repId, lastOpr, items, callback) {
         if (items && items.length > 0) {
             counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, items.length, function(err, result){
-                var maxId = result.value.sequence_value;
+                var maxId = result.sequence_value;
                 var arr = [];
                 for (var i = 0; i < items.length; i++) {
                     var obj = new gljModel(items[i]);
@@ -457,7 +457,7 @@ class GljDao  extends OprDao{
     createNewNode(repId, lastOpr, lastNodeId, nodeData, callback) {
         return counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, 1, function(err, result){
             nodeData.repositoryId = repId;
-            nodeData.ID = result.value.sequence_value;
+            nodeData.ID = result.sequence_value;
             var node = new gljModel(nodeData);
             async.parallel([
                 function (cb) {