|
|
@@ -48,7 +48,7 @@ async function calculateQuantity(query,noNeedCal=null,refreshRationName = false)
|
|
|
glj_result:[],
|
|
|
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 coeList = await ration_coe.find({rationID:query.rationID}).sort('seq').exec();
|
|
|
let assList=[], assRation = null, adjustState=[],mixRatioMap = {};
|
|
|
@@ -101,7 +101,7 @@ async function calculateQuantity(query,noNeedCal=null,refreshRationName = false)
|
|
|
setData.name = 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;
|
|
|
return result;
|
|
|
}catch (err){
|