|
|
@@ -1197,6 +1197,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
if (bNode.children && bNode.children.length > 0 && bNode.children[0].sourceType == ModuleNames.ration) {
|
|
|
for (let r of bNode.children) {
|
|
|
if (r.data.type == rationType.ration) {
|
|
|
+ if(isEmptyRation(r.data)) continue;//定额空行不输出到接口文件中。
|
|
|
Norms.push(new Ration(r.data));
|
|
|
} else {
|
|
|
Costs.push(new Cost(r.data));
|
|
|
@@ -1208,6 +1209,11 @@ INTERFACE_EXPORT = (() => {
|
|
|
if (bNode.data.calcBase) CostComposition.children.push(new Formula(bNode.data));
|
|
|
return CostComposition.children.length > 0 ? CostComposition : null;
|
|
|
|
|
|
+ //定额空行不输出到接口文件中。 //定额空行的判断是:定额编码、定额名称、定额单位、定额单位、定额工程量为零或为空时
|
|
|
+ function isEmptyRation(ration){
|
|
|
+ return !gljUtil.isNotEmpty(ration.code)&&!gljUtil.isNotEmpty(ration.name)&&!gljUtil.isNotEmpty(ration.unit)&&(!gljUtil.isNotEmpty(ration.quantity)||ration.quantity == 0)
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
function Formula(bills) {
|
|
|
const attrs = [{
|