diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index 8170fbd8..8337554e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -139,31 +139,31 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONArray rows = new JSONArray(); JSONArray mater_rows = WQL.getWO("statistical_report_query_01").addParam("flag", "3").process().getResultJSONArray(0); JSONObject jo1 = new JSONObject(); - jo1.put("1", "库存现存量"); + jo1.put("first", "库存现存量"); rows.add(jo1); JSONObject jo22 = new JSONObject(); - jo22.put("1", "已开单重量"); + jo22.put("first", "已开单重量"); rows.add(jo22); JSONObject jo2 = new JSONObject(); - jo2.put("1", "排产需求量"); + jo2.put("first", "排产需求量"); rows.add(jo2); JSONObject jo3 = new JSONObject(); - jo3.put("1", "库/需差额量"); + jo3.put("first", "库/需差额量"); rows.add(jo3); JSONObject jo4 = new JSONObject(); - jo4.put("1", "待检入库量"); + jo4.put("first", "待检入库量"); rows.add(jo4); JSONObject jo5 = new JSONObject(); - jo5.put("1", "覆盖日期"); + jo5.put("first", "覆盖日期"); rows.add(jo5); JSONObject jo6 = new JSONObject(); - jo6.put("1", "合同在途"); + jo6.put("first", "合同在途"); rows.add(jo6); JSONObject jo7 = new JSONObject(); - jo7.put("1", "最低储备定额"); + jo7.put("first", "最低储备定额"); rows.add(jo7); JSONObject jo8 = new JSONObject(); - jo8.put("1", "采购缺口"); + jo8.put("first", "采购缺口"); rows.add(jo8); //汇总所有配方明细物料 @@ -241,7 +241,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONObject map = new JSONObject(); map.put("flag", "4"); map.put("ext_id", jsonMater.getString("ext_id")); + //JSONObject num_jo = null; + JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); + //合同在途 double notqty = 0; if (ObjectUtil.isNotEmpty(num_jo)) { @@ -351,7 +354,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONArray jsonArr = WQL.getWO("statistical_report_query_01").addParam("flag", "3").process().getResultJSONArray(0); JSONArray jonsResuftArr = new JSONArray(); JSONObject jsonResuft1 = new JSONObject(); - jsonResuft1.put("prop", "1"); + jsonResuft1.put("prop", "first"); jsonResuft1.put("label", "统计项点"); jonsResuftArr.add(jsonResuft1); for (int i = 0; i < jsonArr.size(); i++) { diff --git a/mes/qd/src/views/wms/statistics/materPlan/index.vue b/mes/qd/src/views/wms/statistics/materPlan/index.vue index f460c5d7..1976305c 100644 --- a/mes/qd/src/views/wms/statistics/materPlan/index.vue +++ b/mes/qd/src/views/wms/statistics/materPlan/index.vue @@ -49,8 +49,12 @@ > @@ -160,6 +164,8 @@ export default { }) return true }, + open2() { + }, hand(value) { this.crud.toQuery() },