From c0c859b323040ce36c9b09e26d6de3e98177254a Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 19 Oct 2022 10:59:38 +0800 Subject: [PATCH 1/2] =?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 --- .../org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql | 8 ++++---- .../nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql index d775010a..45ce4c8e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql @@ -60,7 +60,7 @@ unit.unit_name, SUBSTR(oder.vbillcode,1,6) AS order_code_1, SUBSTR(oder.vbillcode,8,10) AS order_code_2, - ( oder.qty - dtl.instor_qty ) AS surplus_qty + ( oder.qty - dtl.receive_qty ) AS surplus_qty FROM PCS_IF_PurchaseOrderProc oder LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id @@ -82,7 +82,7 @@ LEFT JOIN PCS_RC_ReceiveMst mst ON mst.receive_id = dtl.receive_id AND mst.is_delete = '0' LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID WHERE - 1=1 + oder.dr = '0' OPTION 输入.begin_time <> "" oder.CREATE_DATE >= 输入.begin_time ENDOPTION @@ -122,7 +122,7 @@ unit.unit_name, SUBSTR(oder.vbillcode,1,6) AS order_code_1, SUBSTR(oder.vbillcode,8,10) AS order_code_2, - ( oder.qty - dtl.instor_qty ) AS surplus_qty + ( oder.qty - dtl.receive_qty ) AS surplus_qty FROM PCS_IF_PurchaseOrderProc oder LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id @@ -144,7 +144,7 @@ LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID LEFT JOIN ST_IVT_IOStorInv ivtmst ON ivtmst.iostorinv_id = dtl.iostorinv_id AND ivtmst.bill_type = '000202' WHERE - 1=1 + oder.dr = '0' OPTION 输入.type_id <> "" mater.material_type_id in 输入.type_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java index a6817593..d2f91223 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java @@ -466,8 +466,8 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { if (StrUtil.equals(json.getString("material_type"), "01")) { // 物料：查物料表关联分类表 JSONObject jsonDtlMater = materTab.query("material_id = '" + json.getString("material_id") + "'").uniqueResult(0); - JSONObject jsonDtlClass = classTab.query("class_id = '" + jsonDtlMater.getString("material_type_id") + "'").uniqueResult(0); - class_name = jsonDtlClass.getString("class_name"); +// JSONObject jsonDtlClass = classTab.query("class_id = '" + jsonDtlMater.getString("material_type_id") + "'").uniqueResult(0); + class_name = jsonDtlMater.getString("material_name"); } else { // 分类：直接用明细表的物料标识查基础分类表 JSONObject jsonDtlClass = classTab.query("class_id = '" + json.getString("material_id") + "'").uniqueResult(0); From 0b3789acd20fe45a6113e7f6905d9ae2777aa360 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 19 Oct 2022 15:26:23 +0800 Subject: [PATCH 2/2] =?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 --- .../nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java | 3 +++ .../service/impl/DevicerepairrequestServiceImpl.java | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java index d2f91223..885e3c55 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java @@ -451,6 +451,9 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { // 开单日期 oneMap.put("create_time", jsonFormMst.getString("create_time").substring(0,10)); + // 开单人 + oneMap.put("create_name", jsonFormMst.getString("create_name")); + /* * 多组填充 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java index 03581e4c..7f51a23d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java @@ -155,15 +155,18 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic DeptService deptService = SpringContextHolder.getBean(DeptService.class); WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); + WQLObject userTab = WQLObject.getWQLObject("sys_user"); Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); + JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + currentUserId + "'").uniqueResult(0); - // 前一天运行记录表 超过三条没填的报错 + // 根据登陆人员的部门查询设备使用班组对应的运行记录 超过三条没填的报错 JSONArray numRunArr = new JSONArray(); + JSONArray fileArr = fileTab.query("use_groupid = '"+jsonUser.getString("dept_id")+"' and is_delete = '0' and status not in ('90','91')").getResultJSONArray(0); + String yesterday = DateUtil.yesterday().toString().substring(0,10); - JSONArray fileArr = fileTab.query("is_delete = '0' and status not in ('90','91')").getResultJSONArray(0); JSONObject map = new JSONObject(); map.put("flag", "5"); @@ -178,10 +181,10 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic if (numRunArr.size() > 3) throw new BadRequestException("昨天设备运行记录有超过3条未填写,未填写:"+String.valueOf(numRunArr.size()) + "条"); + JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); Long deptId = currentUser.getDeptId(); // 登录人所在班组下的设备维修单（结束维修） > 2 报错 - JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + currentUserId + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonUser)) { String dept_str = deptService.getChildIdStr(jsonUser.getLong("dept_id")); JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParam("flag", "4").addParam("deptIds", dept_str).process().uniqueResult(0);