From 8e21813b1de2f6395a9efa2674caf6ea8ca5ed12 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 4 Jul 2022 11:03:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../out/service/impl/HandPFOutIvtServiceImpl.java | 6 +++--- .../wms/pf/service/impl/FlourworkServiceImpl.java | 2 ++ .../java/org/nl/wms/pf/wql/QPDM_BI_FORMULA01.wql | 6 ++++++ .../impl/ProductionDayQueryServiceImpl.java | 2 +- mes/qd/src/views/wms/pf/flourwork/index.vue | 15 ++++++++++++++- .../wms/statistics/productionDayQuery/index.vue | 1 - 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index b21c2aef..e8ac7ea5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -410,7 +410,7 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { @Override public Map confirmOutStore2(Map jsonObject) { String input_optid = MapUtil.getStr(jsonObject, "input_optid"); - String input_optname = MapUtil.getStr(jsonObject, "input_optid"); + String input_optname = MapUtil.getStr(jsonObject, "input_optname"); Long currentUserId = SecurityUtils.getCurrentUserId(); UserDto userDto = userService.findById(currentUserId); // 仓位属性表【ST_IVT_StructAttr】 @@ -556,8 +556,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { invrow.put("input_optid", input_optid); invrow.put("input_optname", input_optname); invrow.put("input_time", now); - invrow.put("update_optid", currentUserId); - invrow.put("update_optname", userDto.getNickName()); + invrow.put("update_optid", input_optid); + invrow.put("update_optname", input_optname); invrow.put("update_time", now); invrow.put("dis_optid", currentUserId); invrow.put("dis_optname", userDto.getNickName()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java index a51f7a54..0d7cfd39 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java @@ -59,6 +59,7 @@ public class FlourworkServiceImpl implements FlourworkService { public Map queryAll(Map whereJson, Pageable page) { String is_all = MapUtil.getStr(whereJson, "is_all"); String biz_date = MapUtil.getStr(whereJson, "biz_date"); + String pcsn = MapUtil.getStr(whereJson, "pcsn"); HashMap map = new HashMap<>(); map.put("flag", "1"); map.put("device_id", MapUtil.getStr(whereJson, "device_id")); @@ -68,6 +69,7 @@ public class FlourworkServiceImpl implements FlourworkService { map.put("status", is_all); } if (StrUtil.equals(is_all, "0")) map.put("status", "99"); + if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%"+pcsn+"%"); JSONObject json = WQL.getWO("QPDM_BI_FORMULA01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "fMst.status,task.start_time,fMst.bucket_type ASC"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPDM_BI_FORMULA01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPDM_BI_FORMULA01.wql index 516fa8f8..45f60334 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPDM_BI_FORMULA01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPDM_BI_FORMULA01.wql @@ -16,6 +16,7 @@ 输入.flag TYPEAS s_string 输入.biz_date TYPEAS s_string 输入.device_id TYPEAS s_string + 输入.pcsn TYPEAS s_string 输入.status TYPEAS s_string 输入.formula_id TYPEAS s_string 输入.formuladtl_id TYPEAS s_string @@ -87,6 +88,7 @@ fMst.end_name, der.workordercard_id, device.device_code, + device.device_name, device.device_id, fMst.formula_id, @@ -113,6 +115,10 @@ task.device_id = 输入.device_id ENDOPTION + OPTION 输入.pcsn <> "" + fMst.pcsn like 输入.pcsn + ENDOPTION + OPTION 输入.status <> "1" fMst.status <> 输入.status ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/ProductionDayQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/ProductionDayQueryServiceImpl.java index 0c174863..22d50532 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/ProductionDayQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/ProductionDayQueryServiceImpl.java @@ -56,7 +56,7 @@ public class ProductionDayQueryServiceImpl implements ProductionDayQueryService JSONArray arr = WQL.getWO("QP_WORKTASKJOB01").addParam("flag", "3").addParam("workorder_id", workorder_id).process().getResultJSONArray(0); for (int j = 0; j < arr.size(); j++) { JSONObject jsonObject = arr.getJSONObject(j); - jsonResult.put(jsonObject.getString("workprocedure_id"),jsonObject.getString("end_name")); + jsonResult.put(jsonObject.getString("workprocedure_id"),jsonObject.getString("create_name")); jsonResult.put(jsonObject.getString("workprocedure_id") + "planstart_time"+"",jsonObject.getString("planstart_time")); jsonResult.put(jsonObject.getString("workprocedure_id") + "start_time"+"",jsonObject.getString("start_time")); } diff --git a/mes/qd/src/views/wms/pf/flourwork/index.vue b/mes/qd/src/views/wms/pf/flourwork/index.vue index 469d43bb..bf9b8345 100644 --- a/mes/qd/src/views/wms/pf/flourwork/index.vue +++ b/mes/qd/src/views/wms/pf/flourwork/index.vue @@ -34,6 +34,18 @@ + + + + + diff --git a/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue b/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue index 631f39d3..6eae1287 100644 --- a/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue @@ -63,7 +63,6 @@ v-loading="crud.loading" :data="crud.data" size="mini" - border style="width: 100%;" @selection-change="crud.selectionChangeHandler" >