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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-19 15:26:23 +08:00
parent c0c859b323
commit 0b3789acd2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,6 +451,9 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
// 开单日期 // 开单日期
oneMap.put("create_time", jsonFormMst.getString("create_time").substring(0,10)); oneMap.put("create_time", jsonFormMst.getString("create_time").substring(0,10));
// 开单人
oneMap.put("create_name", jsonFormMst.getString("create_name"));
/* /*
* 多组填充 * 多组填充
*/ */

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java
View File

@@ -155,15 +155,18 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
DeptService deptService = SpringContextHolder.getBean(DeptService.class); DeptService deptService = SpringContextHolder.getBean(DeptService.class);
WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile");
WQLObject userTab = WQLObject.getWQLObject("sys_user");
Long currentUserId = SecurityUtils.getCurrentUserId(); Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName(); String nickName = SecurityUtils.getNickName();
String now = DateUtil.now(); String now = DateUtil.now();
JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + currentUserId + "'").uniqueResult(0);
// 前一天运行记录表 超过三条没填的报错 // 根据登陆人员的部门查询设备使用班组对应的运行记录 超过三条没填的报错
JSONArray numRunArr = new JSONArray(); 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); 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(); JSONObject map = new JSONObject();
map.put("flag", "5"); 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()) + "条"); if (numRunArr.size() > 3) throw new BadRequestException("昨天设备运行记录有超过3条未填写,未填写:"+String.valueOf(numRunArr.size()) + "条");
JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser();
Long deptId = currentUser.getDeptId(); Long deptId = currentUser.getDeptId();
// 登录人所在班组下的设备维修单（结束维修） > 2 报错 // 登录人所在班组下的设备维修单（结束维修） > 2 报错
JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + currentUserId + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonUser)) { if (ObjectUtil.isNotEmpty(jsonUser)) {
String dept_str = deptService.getChildIdStr(jsonUser.getLong("dept_id")); 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); JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParam("flag", "4").addParam("deptIds", dept_str).process().uniqueResult(0);