root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-11-17 10:01:52 +08:00
parent 5e39718d77
commit 5bc993f39b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
View File

@@ -138,7 +138,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
for (int i = 0; i < mater_rows.size(); i++) { for (int i = 0; i < mater_rows.size(); i++) {
JSONObject mater = mater_rows.getJSONObject(i); JSONObject mater = mater_rows.getJSONObject(i);
String material_id = mater.getString("material_id"); 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); JSONObject mater_ivt = WQL.getWO("statistical_report_query_01").addParam("flag", "4").addParam("material_id", material_id).process().uniqueResult(0);
double now_ivt = 0; double now_ivt = 0;
@@ -152,10 +152,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
jo1.put(material_id, String.format("%.3f", now_ivt)); 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)); 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); 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; double bom_qty = 0;
if (ObjectUtil.isNotEmpty(nedd_mater)) { if (ObjectUtil.isNotEmpty(nedd_mater)) {

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql
View File

@@ -457,7 +457,7 @@
FROM FROM
pdm_bi_workorder wo pdm_bi_workorder wo
WHERE WHERE
wo.`status` < 40 wo.`status` < 50
AND is_delete = '0' AND is_delete = '0'
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
wo.planstart_time >= 输入.begin_time wo.planstart_time >= 输入.begin_time