From 5bc993f39b7525fa099fc36cfb644823ecbfc27f Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Thu, 17 Nov 2022 10:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StatisticalReportServiceImpl.java | 6 +++--- .../nl/wms/statistics/wql/statistical_report_query_01.wql | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 dad51080..b14ed506 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 @@ -138,7 +138,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { for (int i = 0; i < mater_rows.size(); i++) { JSONObject mater = mater_rows.getJSONObject(i); String material_id = mater.getString("material_id"); - //1、库存现存量：现有库存 - 开单领料重量 + //1、库存现存量：现有库存 JSONObject mater_ivt = WQL.getWO("statistical_report_query_01").addParam("flag", "4").addParam("material_id", material_id).process().uniqueResult(0); double now_ivt = 0; @@ -152,10 +152,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { jo1.put(material_id, String.format("%.3f", now_ivt)); - double canuse_num = NumberUtil.sub(now_ivt - need_qty).doubleValue(); + double canuse_num = now_ivt; //已开单重量 jo22.put(material_id, String.format("%.3f", need_qty)); - //2、排产需求量(未开单的工令重量+排产未生成工令日计划重量)根据bom计算需要多少原料库存重量： + //2、排产需求量(未开工的工令重量+排产未生成工令日计划重量)根据bom计算需要多少原料库存重量： JSONObject nedd_mater = WQL.getWO("statistical_report_query_01").addParam("flag", "6").addParam("material_id", material_id).addParam("begin_time", begin_time).addParam("end_time", end_time).addParam("org_id", org_id).process().uniqueResult(0); double bom_qty = 0; if (ObjectUtil.isNotEmpty(nedd_mater)) { 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 56a7453c..39f3d1f4 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 @@ -457,7 +457,7 @@ FROM pdm_bi_workorder wo WHERE - wo.`status` < 40 + wo.`status` < 50 AND is_delete = '0' OPTION 输入.begin_time <> "" wo.planstart_time >= 输入.begin_time