|
@@ -721,16 +721,17 @@ const stageIm = (function () {
|
|
imDefault.contract_jl = ZhCalc.add(imDefault.contract_jl, p.contract_tp);
|
|
imDefault.contract_jl = ZhCalc.add(imDefault.contract_jl, p.contract_tp);
|
|
imDefault.qc_jl = ZhCalc.add(imDefault.qc_jl, p.qc_tp);
|
|
imDefault.qc_jl = ZhCalc.add(imDefault.qc_jl, p.qc_tp);
|
|
imDefault.qc_minus_jl = 0;
|
|
imDefault.qc_minus_jl = 0;
|
|
|
|
+ imDefault.pc_jl = ZhCalc.add(imDefault.pc_jl, p.pc_tp);
|
|
imDefault.used = true;
|
|
imDefault.used = true;
|
|
|
|
|
|
addBwBillsGclBills(imDefault, {
|
|
addBwBillsGclBills(imDefault, {
|
|
- b_code: p.b_code, name: p.name, unit: p.unit, unit_price: p.unit_price,
|
|
|
|
- jl: p.gather_qty, contract_jl: p.contract_qty, qc_jl: p.qc_qty, qc_minus_jl: p.qc_qty,
|
|
|
|
|
|
+ b_code: p.b_code, name: p.name, unit: p.unit, unit_price: p.unit_price, org_price: p.org_price,
|
|
|
|
+ jl: p.gather_qty, contract_jl: p.contract_qty, qc_jl: p.qc_qty, qc_minus_jl: p.qc_qty, pre_jl: p.pre_gather_qty
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (imDefault.used) {
|
|
if (imDefault.used) {
|
|
- imDefault.jl = ZhCalc.add(imDefault.contract_jl, imDefault.qc_jl);
|
|
|
|
|
|
+ imDefault.jl = ZhCalc.sum([imDefault.contract_jl, imDefault.qc_jl, imDefault.pc_jl]);
|
|
ImData.push(imDefault);
|
|
ImData.push(imDefault);
|
|
}
|
|
}
|
|
for (const im of nodeImData) {
|
|
for (const im of nodeImData) {
|