|
@@ -590,7 +590,7 @@ async function getProjectGLJinfo(projectID,t_newRationGLJList,gljKeyMap,gljCodes
|
|
|
let rkey = getIndex(ration_glj);
|
|
|
let pglj = projectGLJMap[rkey];
|
|
|
let subList = [];
|
|
|
- await setUnitPrice(pglj,unitPriceMap);
|
|
|
+ await setUnitPrice(pglj,unitPriceMap,ration_glj);
|
|
|
if(existMixRatioMap[rkey]){//如果有组成物
|
|
|
for(let m of existMixRatioMap[rkey]){
|
|
|
let mpglj = projectGLJMap[getIndex(m)]
|
|
@@ -617,12 +617,14 @@ async function getProjectGLJinfo(projectID,t_newRationGLJList,gljKeyMap,gljCodes
|
|
|
|
|
|
|
|
|
|
|
|
- async function setUnitPrice(p,unitPriceMap){
|
|
|
+ async function setUnitPrice(p,unitPriceMap,ration_glj){
|
|
|
let unitPrice = unitPriceMap[getIndex(p)];
|
|
|
if(unitPrice){
|
|
|
p.unit_price = unitPrice;
|
|
|
}else{
|
|
|
unitPrice = newPriceDataFromPGlj(p,unitPriceFileId);
|
|
|
+ unitPrice.base_price = ration_glj.basePrice;
|
|
|
+ unitPrice.market_price = ration_glj.marketPrice;
|
|
|
await unitPriceModel.insertMany([unitPrice]);
|
|
|
p.unit_price =unitPrice
|
|
|
}
|