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 5f738a7f..34187b70 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 @@ -175,7 +175,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { jo7.put(material_id, String.format("%.3f",safe_qty)); //8、采购缺口:库存+待检+在途+最低储备-排产量 - double buy_qty = bom_qty - (now_ivt + noqty + notqty + safe_qty); + double buy_qty = bom_qty - (now_ivt + noin_qty + notqty + safe_qty); jo8.put(material_id, String.format("%.3f",buy_qty)); //6、覆盖日期:物料库存可坚持到哪一天:库存现存量减每天需求量,哪天<0,取前一天 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql index 7be95c9e..7d9d7e5e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql @@ -486,7 +486,7 @@ UNION ALL SELECT - wo.planstart_time AS planstart_date, + LEFT(wo.planstart_time,10) AS planstart_date, COUNT(wo.workorder_id) AS product_num, MAX(ext.old_mark) AS old_mark, SUM(wo.workorder_qty) AS product_weight,