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 6d67bd75..ee034b7a 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 @@ -260,6 +260,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONArray dtlJa2 = WQL.getWO("statistical_report_query_02").addParam("flag", "4") .addParam("begin_time", begin_time) .addParam("end_time", end_time) + .addParam("org_ids",org_ids_new) .process() .getResultJSONArray(0); for (int i = 0; i < dtlJa2.size(); i++) { @@ -339,17 +340,17 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { //JSONObject num_jo = null; - JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); +// JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); //合同在途 double notqty = 0; - if (ObjectUtil.isNotEmpty(num_jo)) { - notqty = num_jo.getDoubleValue("notqty"); - if (notqty < 0) { - notqty = 0; - } - } +// if (ObjectUtil.isNotEmpty(num_jo)) { +// notqty = num_jo.getDoubleValue("notqty"); +// if (notqty < 0) { +// notqty = 0; +// } +// } jo6.put(material_id, String.format("%.2f", notqty)); //5、库/需差额量 :库存现存量-排产需求量 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql index 242d97e4..5aaba957 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql @@ -35,6 +35,7 @@ 输入.send_name TYPEAS s_string 输入.is_send0 TYPEAS s_string 输入.is_send12 TYPEAS s_string + 输入.org_ids TYPEAS f_string [临时表] @@ -177,6 +178,7 @@ SUM( FormulaDtl.formula_qty ) AS qty FROM PDM_BI_Formula Formula inner JOIN PDM_BI_FormulaDtl FormulaDtl ON FormulaDtl.formula_id = Formula.formula_id + left JOIN pdm_bi_workorder ON Formula.workorder_code = pdm_bi_workorder.workorder_code where 1=1 and Formula.is_delete='0' OPTION 输入.begin_time <> "" @@ -184,6 +186,9 @@ ENDOPTION OPTION 输入.end_time <> "" Formula.create_time <= 输入.end_time + ENDOPTION + OPTION 输入.org_ids <> "" + pdm_bi_workorder.org_id in 输入.org_ids ENDOPTION GROUP BY FormulaDtl.material_id diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue index ab65b86f..3eaac2c0 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -265,7 +265,7 @@ - +