Procházet zdrojové kódy

02表组成物分离,数量计算逻辑修改

TonyKang před 6 roky
rodič
revize
3635758cb4

+ 1 - 1
modules/reports/util/rpt_yanghu_data_util.js

@@ -883,7 +883,7 @@ function moveRationData(rationData, rawDataObj) {
                             copyItem.projectID = rationGljItem.projectID;
                             copyItem.rationID = rationGljItem.rationID;
                             // copyItem.rationItemQuantity = rationGljItem.quantity;
-                            copyItem.quantity = prjGljItem.quantity * comItem.consumption;
+                            copyItem.quantity = parseFloat(rationGljItem.quantity) * parseFloat(comItem.consumption);
                             copyItem.name = comItem.name;
                             copyItem.code = comItem.code;
                             copyItem.unit = comItem.unit;

+ 2 - 2
test/unit/reports/test_rpt_test_template.js

@@ -111,9 +111,9 @@ test('测试 - 测试模板啦: ', function (t) {
                 try {
                     let dt = new Date();
                     console.log('取完项目数据时间:' + (dt));
-                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataObject_测试模板.jsp");
+                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataObject_测试模板.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
-                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
+                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/YangHuCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/YangHuCost/tmp/rptTplAssembledData_测试模板.jsp");
                     //it's time to build the report!!!
                     let printCom = JpcEx.createNew();