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-09-27 10:02:34 +08:00
parent ae82252af5
commit c60243e10c
6 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls
View File

Binary file not shown.

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

@@ -48,6 +48,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String repair_type = MapUtil.getStr(whereJson, "repair_type");
String device_code = MapUtil.getStr(whereJson, "device_code");
String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
String repair_plan_code = MapUtil.getStr(whereJson, "repair_plan_code");
@@ -62,6 +63,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
map.put("is_active", is_active);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("repair_type", repair_type);
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%");
if (ObjectUtil.isNotEmpty(repair_plan_code)) map.put("repair_plan_code","%"+repair_plan_code+"%");
//处理物料当前节点的所有子节点
@@ -128,6 +130,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
jsonMst.put("repair_type",whereJson.getString("repair_type"));
jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
jsonMst.put("detail_count",tableData.size());
jsonMst.put("create_id",currentUserId);
@@ -169,6 +172,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
jsonMst.put("repair_type",whereJson.getString("repair_type"));
jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
jsonMst.put("detail_count",tableData.size());
jsonMst.put("update_optid",currentUserId);
@@ -268,6 +272,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
jsonMst.put("repair_plan_name",whereJson.getString("repair_plan_name"));
jsonMst.put("devicerecord_id",whereJson.get("devicerecord_id"));
jsonMst.put("maintenancecycle",whereJson.getString("maintenancecycle"));
jsonMst.put("repair_type",whereJson.getString("repair_type"));
jsonMst.put("plan_start_date",whereJson.getString("plan_start_date"));
jsonMst.put("detail_count",tableData.size());
jsonMst.put("create_id",currentUserId);

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
View File

@@ -22,6 +22,7 @@
输入.is_active TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.repair_type TYPEAS s_string
[临时表]
@@ -80,6 +81,10 @@
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION
OPTION 输入.repair_type <> ""
mst.repair_type = 输入.repair_type
ENDOPTION
OPTION 输入.is_active <> ""
mst.is_active = 输入.is_active
ENDOPTION