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

rev：1.设备档案功能修改2.设备保养功能修改

Browse Source
This commit is contained in:
liuxy
2023-09-05 18:55:58 +08:00
parent a4f0e49a3c
commit dbd57d25d1
21 changed files with 109 additions and 1806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java
View File

@@ -30,36 +30,24 @@ public class DevicemaintenancemstController {
private final DevicemaintenancemstService devicemaintenancemstService;
@GetMapping
@ApiOperation("查询设备保养单(维修班)")
@ApiOperation("保养单维护查询")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/query")
@ApiOperation("查询设备保养单2")
@ApiOperation("保养单审核查询")
public ResponseEntity<Object> query2(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicemaintenancemstService.query2(whereJson, page), HttpStatus.OK);
}
@GetMapping("query3")
@ApiOperation("查询设备保养单填报（维修班）")
@ApiOperation("保养单实施填报查询")
public ResponseEntity<Object> query3(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicemaintenancemstService.query3(whereJson, page), HttpStatus.OK);
}
@GetMapping("query4")
@ApiOperation("查询设备保养单(班组)")
public ResponseEntity<Object> query4(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicemaintenancemstService.query4(whereJson, page), HttpStatus.OK);
}
@GetMapping("query5")
@ApiOperation("查询设备保养单填报（班组）")
public ResponseEntity<Object> query5(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicemaintenancemstService.query5(whereJson, page), HttpStatus.OK);
}
@PostMapping
@ApiOperation("新增设备保养单")
public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
@@ -115,20 +103,6 @@ public class DevicemaintenancemstController {
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/submitMain")
@ApiOperation("保养执行")
public ResponseEntity<Object> submitMain(@RequestBody JSONObject whereJson) {
devicemaintenancemstService.submitMain(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/confirmMaintain")
@ApiOperation("保养确认")
public ResponseEntity<Object> confirmMaintain(@RequestBody JSONObject whereJson) {
devicemaintenancemstService.confirmMaintain(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/auditMaintain")
@ApiOperation("审核")
public ResponseEntity<Object> auditMaintain(@RequestBody JSONObject whereJson) {
@@ -136,10 +110,4 @@ public class DevicemaintenancemstController {
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/createExcel")
@ApiOperation("下载Excel")
public ResponseEntity<Object> createExcel(@RequestParam Map whereJson, HttpServletResponse response) {
devicemaintenancemstService.createExcel(whereJson,response);
return new ResponseEntity<>(HttpStatus.OK);
}
}

31
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/DevicemaintenancemstService.java
View File

@@ -116,13 +116,6 @@ public interface DevicemaintenancemstService {
*/
void submitMain(JSONObject whereJson);
/**
* 保养确认
*
* @param whereJson /
*/
void confirmMaintain(JSONObject whereJson);
/**
* 审核
*
@@ -130,13 +123,6 @@ public interface DevicemaintenancemstService {
*/
void auditMaintain(JSONObject whereJson);
/**
* 下载excel
*
* @param whereJson /
*/
void createExcel(Map whereJson, HttpServletResponse response);
/**
* 查询数据分页
*
@@ -146,21 +132,4 @@ public interface DevicemaintenancemstService {
*/
Map<String, Object> query3(Map whereJson, Pageable page);
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> query4(Map whereJson, Pageable page);
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> query5(Map whereJson, Pageable page);
}

200
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
View File

@@ -156,7 +156,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
jsonMst.put("invstatus", "01");
jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
jsonMst.put("maint_object", whereJson.getString("maint_object"));
jsonMst.put("detail_count", tableData.size());
jsonMst.put("input_optid", currentUserId);
jsonMst.put("input_optname", nickName);
@@ -191,7 +190,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
jsonMst.put("devicerecord_id", whereJson.get("devicerecord_id"));
jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
jsonMst.put("maint_object", whereJson.getString("maint_object"));
jsonMst.put("detail_count", tableData.size());
mstTab.update(jsonMst);
@@ -373,39 +371,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void confirmMaintain(JSONObject whereJson) {
String maint_id = whereJson.getString("maint_id");
Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
String nickName = SecurityUtils.getCurrentNickName();
WQLObject mstTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceMst");
WQLObject dtlTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceDtl");
JSONObject jsonMst = mstTab.query("maint_id = '" + maint_id + "'").uniqueResult(0);
// 1.明细中的是否完成 ：必须为全部完成
JSONArray dtlArr = dtlTab.query("maint_id = '" + maint_id + "'").getResultJSONArray(0);
for (int i = 0; i < dtlArr.size(); i++) {
JSONObject json = dtlArr.getJSONObject(i);
if (StrUtil.equals(json.getString("isfinish"), "0")) throw new BadRequestException("保养项目未完成");
}
// 2.保养人，保养时间不能为空
String update_optname = jsonMst.getString("update_optname");
String update_time = jsonMst.getString("update_time");
if (ObjectUtil.isEmpty(update_optname) || ObjectUtil.isEmpty(update_time))
throw new BadRequestException("保养人或保养时间不能为空");
// 3.更新主表
jsonMst.put("invstatus", "05");
jsonMst.put("confirm_optid", currentUserId);
jsonMst.put("confirm_optname", nickName);
jsonMst.put("confirm_time", DateUtil.now());
mstTab.update(jsonMst);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void auditMaintain(JSONObject whereJson) {
@@ -422,6 +387,9 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
jsonMst.put("audit_optid", currentUserId);
jsonMst.put("audit_optname", nickName);
jsonMst.put("audit_time", DateUtil.now());
jsonMst.put("confirm_optid", currentUserId);
jsonMst.put("confirm_optname", nickName);
jsonMst.put("confirm_time", DateUtil.now());
mstTab.update(jsonMst);
// 2.根据来源标识 ： 为空不处理、否则更新设备保养计划表
@@ -439,88 +407,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void createExcel(Map whereJson, HttpServletResponse response) {
/* String maint_id = MapUtil.getStr(whereJson, "maint_id");
WQLObject mainMstTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceMst"); // 设备保养主表
try {
JSONObject jsonMainMst = mainMstTab.query("maint_id ='" + maint_id + "'").uniqueResult(0);
HashMap<String, String> paramMap1 = new HashMap<>();
paramMap1.put("flag", "1");
paramMap1.put("devicerecord_id", jsonMainMst.getString("devicerecord_id"));
JSONObject jsonFile = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN002").addParamMap(paramMap1).process().uniqueResult(0);
String template = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MAIN_EXCEL_PATH").getValue();
// 设置文件名和防止乱码现象
String fileName = URLEncoder.encode("eee", "UTF-8");
response.setHeader("Content-Disposition", "attachment; filename*=UTf-8''" + fileName + ".xlsx");
// 获取输出流
ServletOutputStream outputStream = response.getOutputStream();
// 创建模板工作簿
ExcelWriter workBook = EasyExcel.write(outputStream, DataDto.class).withTemplate(template).build();
// 获取第一个sheet
WriteSheet sheet = EasyExcel.writerSheet().build();
// 1.准备数据 - 单组填充
HashMap<String, String> sheetMap = new HashMap<>();
sheetMap.put("input_time", jsonMainMst.getString("input_time").substring(0, 10)); // 时间
sheetMap.put("plan_start_date", jsonMainMst.getString("plan_start_date").substring(0, 10)); // 计划日期
sheetMap.put("real_start_date", jsonMainMst.getString("real_start_date").substring(0, 10));
// 计划日期
sheetMap.put("update_optname1", jsonMainMst.getString("update_optname"));
sheetMap.put("update_optname2", jsonMainMst.getString("update_optname"));
sheetMap.put("update_optname3", jsonMainMst.getString("update_optname"));
sheetMap.put("confirm_optname", jsonMainMst.getString("confirm_optname"));
sheetMap.put("confirm_optname2", jsonMainMst.getString("confirm_optname"));
sheetMap.put("audit_optname", jsonMainMst.getString("audit_optname"));
if (ObjectUtil.isNotEmpty(jsonFile)) {
sheetMap.put("device_name", jsonFile.getString("device_name")); // 设备名称
sheetMap.put("extend_code", jsonFile.getString("extend_code")); // 出厂编号
sheetMap.put("device_model", jsonFile.getString("device_model")); // 型号
sheetMap.put("dept_name", jsonFile.getString("dept_name")); // 班组
}
// 2.准备数据 - 多组填充
HashMap<String, String> paramMap2 = new HashMap<>();
paramMap2.put("flag", "2");
paramMap2.put("maint_id", maint_id);
JSONArray jsonMainDtlArr = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN002").addParamMap(paramMap2).process().getResultJSONArray(0);
ArrayList<HashMap<String, Object>> data1 = new ArrayList<>();
ArrayList<HashMap<String, Object>> data2 = new ArrayList<>();
if (ObjectUtil.isNotEmpty(jsonMainDtlArr)) {
for (int i = 0; i < jsonMainDtlArr.size(); i++) {
JSONObject json = jsonMainDtlArr.getJSONObject(i);
HashMap<String, Object> dataMap1 = new HashMap<>();
HashMap<String, Object> dataMap2 = new HashMap<>();
dataMap1.put("contents", String.valueOf(i+1) + "." + json.getString("contents"));
dataMap2.put("acceptancecriteria", String.valueOf(i+1) + "." + json.getString("acceptancecriteria"));
data1.add(dataMap1);
data2.add(dataMap2);
}
}
// 下载
workBook.fill(sheetMap, sheet);
workBook.fill(new FillWrapper("data1", data1), sheet);
workBook.fill(new FillWrapper("data2", data2), sheet);
workBook.finish();
} catch (Exception e) {
System.out.println(e.getMessage());
throw new BadRequestException("下载异常");
}*/
}
@Override
public Map<String, Object> query3(Map whereJson, Pageable page) {
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
@@ -531,7 +417,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
String invstatus = MapUtil.getStr(whereJson, "invstatus");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time");
String maint_object = MapUtil.getStr(whereJson, "maint_object");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "4");
@@ -539,7 +424,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
map.put("invstatus", invstatus);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("maint_object", maint_object);
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
//处理物料当前节点的所有子节点
@@ -555,82 +439,4 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
return json;
}
@Override
public Map<String, Object> query4(Map whereJson, Pageable page) {
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String device_code = MapUtil.getStr(whereJson, "device_code");
String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
String maint_code = MapUtil.getStr(whereJson, "maint_code");
String invstatus = MapUtil.getStr(whereJson, "invstatus");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "5");
map.put("maintenancecycle", maintenancecycle);
map.put("invstatus", invstatus);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
map.put("material_type_id", material_type_id);
String classIds = classstandardService.getChildIdStr(material_type_id);
map.put("classIds", classIds);
} else if (ObjectUtil.isNotEmpty(class_idStr)) {
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
// 归属部门
String dept_id = MapUtil.getStr(whereJson, "dept_id");
if (!StrUtil.isEmpty(dept_id)) {
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
return json;
}
@Override
public Map<String, Object> query5(Map whereJson, Pageable page) {
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String device_code = MapUtil.getStr(whereJson, "device_code");
String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
String maint_code = MapUtil.getStr(whereJson, "maint_code");
String invstatus = MapUtil.getStr(whereJson, "invstatus");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time");
String maint_object = MapUtil.getStr(whereJson, "maint_object");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "6");
map.put("maintenancecycle", maintenancecycle);
map.put("invstatus", invstatus);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("maint_object", maint_object);
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
map.put("material_type_id", material_type_id);
String classIds = classstandardService.getChildIdStr(material_type_id);
map.put("classIds", classIds);
} else if (ObjectUtil.isNotEmpty(class_idStr)) {
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
// 归属部门
String dept_id = MapUtil.getStr(whereJson, "dept_id");
if (!StrUtil.isEmpty(dept_id)) {
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC");
return json;
}
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql
View File

@@ -117,7 +117,7 @@
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
file.is_delete = '0'
AND file.status not in (90,91)
@@ -173,7 +173,7 @@
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
file.is_delete = '0'
AND file.status not in (90,91)

200
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql
View File

@@ -64,11 +64,10 @@
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.maint_object = '02'
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
@@ -119,7 +118,7 @@
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.invstatus in ('05','99')
AND mst.invstatus in ('04','99')
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
@@ -193,11 +192,10 @@
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.maint_object = '02'
AND mst.invstatus in ('02','03')
OPTION 输入.device_code <> ""
@@ -218,10 +216,6 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.maint_object <> ""
mst.maint_object = 输入.maint_object
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
@@ -249,11 +243,10 @@
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.maint_object = '01'
AND mst.invstatus in ('04')
OPTION 输入.device_code <> ""
@@ -274,10 +267,6 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.maint_object <> ""
mst.maint_object = 输入.maint_object
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
@@ -292,183 +281,4 @@
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "5"
PAGEQUERY
SELECT
mst.*,
class.class_name,
file.device_code,
file.material_type_id,
file.device_name,
file.extend_code,
d1.name AS dept_name,
d2.name AS use_name
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.maint_object = '01'
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
file.device_name like 输入.device_code)
ENDOPTION
OPTION 输入.maint_code <> ""
(mst.maint_code like 输入.maint_code or
mst.maint_code like 输入.maint_code)
ENDOPTION
OPTION 输入.deptIds <> ""
d2.dept_id in 输入.deptIds
ENDOPTION
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.maintenancecycle <> ""
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
mst.plan_start_date <= 输入.end_time
ENDOPTION
OPTION 输入.invstatus <> ""
mst.invstatus = 输入.invstatus
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "6"
PAGEQUERY
SELECT
mst.*,
class.class_name,
file.device_code,
file.device_name,
file.extend_code,
d1.name AS dept_name,
d2.name AS use_name
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.maint_object = '01'
AND mst.invstatus in ('02','03')
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
file.device_name like 输入.device_code)
ENDOPTION
OPTION 输入.maint_code <> ""
(mst.maint_code like 输入.maint_code or
mst.maint_code like 输入.maint_code)
ENDOPTION
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.deptIds <> ""
d2.dept_id in 输入.deptIds
ENDOPTION
OPTION 输入.maintenancecycle <> ""
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.maint_object <> ""
mst.maint_object = 输入.maint_object
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
mst.plan_start_date <= 输入.end_time
ENDOPTION
OPTION 输入.invstatus <> ""
mst.invstatus = 输入.invstatus
ENDOPTION
UNION
SELECT
mst.*,
class.class_name,
file.device_code,
file.device_name,
file.extend_code,
d1.name AS dept_name,
d2.name AS use_name
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.maint_object = '02'
AND mst.invstatus in ('04')
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
file.device_name like 输入.device_code)
ENDOPTION
OPTION 输入.maint_code <> ""
(mst.maint_code like 输入.maint_code or
mst.maint_code like 输入.maint_code)
ENDOPTION
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.maintenancecycle <> ""
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.maint_object <> ""
mst.maint_object = 输入.maint_object
ENDOPTION
OPTION 输入.begin_time <> ""
mst.plan_start_date >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
mst.plan_start_date <= 输入.end_time
ENDOPTION
OPTION 输入.invstatus <> ""
mst.invstatus = 输入.invstatus
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
ENDIF

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java
View File

@@ -219,15 +219,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
if (!"11,00".contains(nowStatus)) {
throw new BadRequestException("只有停用、生成状态才可启用！");
}
if (StrUtil.isEmpty(jsonMst.getString("device_bom_id"))) {
throw new BadRequestException("设备BOM不能为空！");
}
if (StrUtil.isEmpty(jsonMst.getString("use_deptid"))) {
throw new BadRequestException("使用部门不能为空！");
}
if (StrUtil.isEmpty(jsonMst.getString("use_groupid"))) {
throw new BadRequestException("使用班组不能为空！");
}
if (StrUtil.isEmpty(jsonMst.getString("user_name"))) {
throw new BadRequestException("使用人不能为空！");
}