diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index 4e6e2bca..e411e393 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -56,11 +56,12 @@ public class DailyplanServiceImpl implements DailyplanService { @Override public Map queryAll2(Map whereJson) { HashMap map = new HashMap<>(whereJson); - + String plan_org_code = map.get("plan_org_code"); String material_code = map.get("material_code"); if (StrUtil.isNotEmpty(material_code)) { map.put("material_code", "%" + material_code + "%"); } + map.put("plan_org_code",plan_org_code); map.put("flag", "1"); JSONArray json = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).process().getResultJSONArray(0); JSONArray ja = new JSONArray(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql index ed90efa6..4939b5f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql @@ -25,6 +25,7 @@ 输入.device_id TYPEAS s_string 输入.old_mark TYPEAS s_string 输入.material_id TYPEAS s_string + 输入.plan_org_code TYPEAS s_string 输入.workorder_type TYPEAS s_string @@ -73,6 +74,9 @@ LEFT JOIN PCS_IF_ProductPlanProc ProductPlanProc ON ProductPlanProc.plan_id = pp.plan_id WHERE 1=1 + OPTION 输入.plan_org_code <> "" + pp.plan_org_code = 输入.plan_org_code + ENDOPTION OPTION 输入.status <> "" pp.status = 输入.status ENDOPTION 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 1a359d48..be955f64 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 @@ -92,7 +92,8 @@ mater.material_name, dtl.pcsn, dtl.receive_code, - dtl.material_id + dtl.material_id, + mst.source_name FROM PCS_RC_ReceiveDtl dtl inner JOIN pcs_rc_receivemst mst ON mst.receive_id = dtl.receive_id diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue index cac5dc84..8c675a48 100644 --- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue @@ -71,6 +71,21 @@ /> + + + + + +