zhangweicheng 6 лет назад
Родитель
Сommit
70d611d1c7
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      modules/all_models/std_glj.js
  2. 2 2
      modules/ration_glj/facade/glj_calculate_facade.js

+ 1 - 1
modules/all_models/std_glj.js

@@ -20,7 +20,7 @@ const std_gljComponent = new Schema(
 
 
 const std_glj = new Schema({
 const std_glj = new Schema({
     deleted: Boolean,
     deleted: Boolean,
-    repositoryId: Number,
+    repositoryId: {type: Number,index: true},
     ID: Number,
     ID: Number,
     code: String,
     code: String,
     name: String,
     name: String,

+ 2 - 2
modules/ration_glj/facade/glj_calculate_facade.js

@@ -48,7 +48,7 @@ async function calculateQuantity(query,noNeedCal=null,refreshRationName = false)
              glj_result:[],
              glj_result:[],
              rationID:query.rationID
              rationID:query.rationID
          };
          };
-         let impactRation = await ration.findOne({ID:query.rationID,projectID:query.projectID});
+         let impactRation = await ration.findOne({ID:query.rationID});
          let gljList = await ration_glj.find(query);//{projectID:query.projectID,rationID:query.rationID}
          let gljList = await ration_glj.find(query);//{projectID:query.projectID,rationID:query.rationID}
          let coeList = await ration_coe.find({rationID:query.rationID}).sort('seq').exec();
          let coeList = await ration_coe.find({rationID:query.rationID}).sort('seq').exec();
          let assList=[], assRation = null, adjustState=[],mixRatioMap = {};
          let assList=[], assRation = null, adjustState=[],mixRatioMap = {};
@@ -101,7 +101,7 @@ async function calculateQuantity(query,noNeedCal=null,refreshRationName = false)
              setData.name = newName;
              setData.name = newName;
              result.rationName = newName;
              result.rationName = newName;
          }
          }
-         await ration.update({projectID:query.projectID,ID:query.rationID,deleteInfo: null},setData);
+         await ration.update({ID:query.rationID},setData);
          result.adjustState=adjustStateString;
          result.adjustState=adjustStateString;
          return result;
          return result;
     }catch (err){
     }catch (err){