|
|
@@ -1400,14 +1400,16 @@ const XMLStandard = (function () {
|
|
|
//定额人材机排序
|
|
|
rationGljData = gljUtil.sortRationGLJ(rationGljData);
|
|
|
for (let rGlj of rationGljData) {
|
|
|
- if (skipGLJTypes.includes(rGlj.type)) {
|
|
|
+ const totalQuantity = gljUtil.getTotalQuantity(rGlj, rationData, decimal.glj.quantity, decimal.ration.quantity);
|
|
|
+ const parsedTotalQuantity = parseFloat(totalQuantity);
|
|
|
+ if (skipGLJTypes.includes(rGlj.type) || !parsedTotalQuantity) {
|
|
|
continue;
|
|
|
}
|
|
|
let gljSource = {
|
|
|
code: rGlj.code,
|
|
|
//code: getGljCode(rGlj.projectGLJID),
|
|
|
quantity: rGlj.quantity,
|
|
|
- totalQuantity: gljUtil.getTotalQuantity(rGlj, rationData, decimal.glj.quantity, decimal.ration.quantity)
|
|
|
+ totalQuantity
|
|
|
};
|
|
|
let gljContent = new GljContent(gljSource);
|
|
|
gljAnalyze.children.push(gljContent);
|