update

controller/agrMatController.js

@@ -80,8 +80,8 @@ async function queryMatApprList(req, res, next) {
         let page = req.body.page || 1;
         let pageSize = req.body.pageSize || 10;
         let skip = (page - 1) * pageSize;
-        let count = await DB.AgrMaterialApproval.countDocuments(search)
-        let list = await DB.AgrMaterialApproval.find(search).skip(skip).limit(pageSize).lean().exec();
+        let count = await DB.AgrMatApproval.countDocuments(search)
+        let list = await DB.AgrMatApproval.find(search).skip(skip).limit(pageSize).lean().exec();
         res.sendData({count, list});
     } catch (error) {
         next(error)
@@ -115,7 +115,7 @@ async function saveMatAppr(req, res, next) {
             if(matInOutList.length > 0) {
                 await DB.AgrMatInOut.insertMany(matInOutList); // 插入清单
             }
-            let matApr = await DB.AgrMaterialApproval.create({ // 创建单据
+            let matApr = await DB.AgrMatApproval.create({ // 创建单据
                 _id: matAprId,
                 type: type,
                 materials: matIds,
@@ -123,7 +123,7 @@ async function saveMatAppr(req, res, next) {
             return res.sendData(matApr);
         } else {
             // 更新
-            let existsMatApr = await DB.AgrMaterialApproval.findOne({_id: req.body._id});
+            let existsMatApr = await DB.AgrMatApproval.findOne({_id: req.body._id});
             if(!existsMatApr) {
                 return res.sendError(errorMessage.resourceNotFound);
             }
@@ -152,7 +152,7 @@ async function saveMatAppr(req, res, next) {
             if(matInOutList.length > 0) {
                 await Promise.all(matInOutList);
             }
-            let matApr = await DB.AgrMaterialApproval.findOneAndUpdate({_id},{
+            let matApr = await DB.AgrMatApproval.findOneAndUpdate({_id},{
                 type: type,
                 materials: matIds,
             });

db/models/letianAgrMatApproval.js

@@ -76,5 +76,5 @@ function setNameToApproval(v) {
 }
 
 
-const AgrMaterialApproval = mongoose.model('AgrMaterialApproval', AgrMaterialApprovalSchema, 'letianAgrMaterialApproval');
-module.exports = AgrMaterialApproval;
+const AgrMatApproval = mongoose.model('AgrMatApproval', AgrMaterialApprovalSchema, 'letianAgrMaterialApproval');
+module.exports = AgrMatApproval;
\ No newline at end of file

db/models/letianAgrMatType.js

@@ -5,7 +5,7 @@ const moment = require('moment');
 /**
  * 农资管理-农资类型
  */
-const AgrMaterialSchema = new Schema({
+const AgrMaterialTypeSchema = new Schema({
 
     name: {
         type: String,
@@ -41,5 +41,5 @@ const AgrMaterialSchema = new Schema({
 });
 
 
-const AgrMaterial = mongoose.model('AgrMaterial', AgrMaterialSchema, 'letianAgrMaterial');
-module.exports = AgrMaterial;
+const AgrMatType = mongoose.model('AgrMatType', AgrMaterialTypeSchema, 'letianAgrMaterialType');
+module.exports = AgrMatType;
\ No newline at end of file