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-09-20 16:55:54 +08:00
parent 1e886b0dca
commit 1dd8ba896e
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
View File

@@ -255,7 +255,7 @@
QUERY QUERY
SELECT SELECT
sum(ProcedureOffline.qty) AS total_qty, sum(ProcedureOffline.qty) AS total_qty,
WorkOrder.device_id MAX(WorkOrder.device_id) AS device_id
FROM FROM
PDM_BI_WorkOrder WorkOrder PDM_BI_WorkOrder WorkOrder
LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id
@@ -377,7 +377,7 @@
SELECT SELECT
sum(ProcedureOffline.qty) AS total_qty, sum(ProcedureOffline.qty) AS total_qty,
count(WorkOrder.workorder_id) AS in_num, count(WorkOrder.workorder_id) AS in_num,
WorkOrder.device_id MAX(WorkOrder.device_id) AS device_id
FROM FROM
PDM_BI_WorkOrder WorkOrder PDM_BI_WorkOrder WorkOrder
LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id

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

@@ -212,9 +212,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
JSONArray rows = new JSONArray(); JSONArray rows = new JSONArray();
for (int i = 0; i < jsonArr.size(); i++) { for (int i = 0; i < jsonArr.size(); i++) {
JSONObject row = jsonArr.getJSONObject(i); JSONObject row = jsonArr.getJSONObject(i);
String material_code = row.getString("material_code");
JSONObject bom = WQLObject.getWQLObject("md_pd_productbom").query("material_id = '"+row.get("material_id")+"'").uniqueResult(0); JSONObject bom = WQLObject.getWQLObject("md_pd_productbom").query("material_id = '"+row.get("material_id")+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(bom)){ if (ObjectUtil.isEmpty(bom)){
throw new BadRequestException("未查询到该产品对应BOM信息"); throw new BadRequestException("未查询到该产品 "+material_code+" 对应BOM信息");
} }
row.put("1",row.getString("planstart_date")); row.put("1",row.getString("planstart_date"));
row.put("2",row.getString("old_mark")); row.put("2",row.getString("old_mark"));

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

@@ -58,14 +58,14 @@
SELECT SELECT
MAX( mb.material_code ) AS material_code, MAX( mb.material_code ) AS material_code,
SUM( off.qty ) AS qty, SUM( off.qty ) AS qty,
off.material_id, MAX( off.material_id) AS material_id,
off.pcsn, MAX( off.pcsn) AS pcsn,
MAX( off.create_time ) AS create_time, MAX( off.create_time ) AS create_time,
MAX( off.create_name ) AS create_name, MAX( off.create_name ) AS create_name,
MAX( wo.planend_time ) AS planend_time, MAX( wo.planend_time ) AS planend_time,
MAX( wo.realend_time ) AS realend_time, MAX( wo.realend_time ) AS realend_time,
datediff (MAX( wo.planend_time ),MAX( wo.realend_time )) AS off_days, datediff (MAX( wo.planend_time ),MAX( wo.realend_time )) AS off_days,
ext.old_mark MAX( ext.old_mark) AS old_mark
FROM FROM
pdm_bi_procedureoffline off pdm_bi_procedureoffline off
LEFT JOIN pdm_bi_workorder wo ON wo.workorder_id = off.workorder_id LEFT JOIN pdm_bi_workorder wo ON wo.workorder_id = off.workorder_id
@@ -446,10 +446,12 @@
plan.product_num, plan.product_num,
ext.old_mark, ext.old_mark,
plan.product_weight, plan.product_weight,
plan.material_id plan.material_id,
materialbase.material_code
FROM FROM
mps_bd_productdailyplan plan mps_bd_productdailyplan plan
LEFT JOIN md_me_producmaterialext ext ON ext.material_id = plan.material_id LEFT JOIN md_me_producmaterialext ext ON ext.material_id = plan.material_id
LEFT JOIN md_me_materialbase materialbase ON materialbase.material_id = plan.material_id
WHERE WHERE
1=1 1=1
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""