rev:故障分类修改：新增故障分类字段维护

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java

@@ -114,6 +114,7 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
         json.put("device_faultclass_code", CodeUtil.getNewCode("DEVICE_FACLASS_CODE"));
         json.put("device_faultclass_name", whereJson.getString("device_faultclass_name"));
         json.put("material_type_id", whereJson.getString("material_type_id"));
+        json.put("faultclass_type_id", whereJson.getString("faultclass_type_id"));
         json.put("solutions", whereJson.getString("solutions"));
         json.put("remark", whereJson.getString("remark"));
         json.put("create_id", currentUserId);
@@ -132,6 +133,7 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
         JSONObject json = wo.query("device_faultclass_id = '" + whereJson.getString("device_faultclass_id") + "'").uniqueResult(0);
         json.put("device_faultclass_name", whereJson.getString("device_faultclass_name"));
         json.put("material_type_id", whereJson.getString("material_type_id"));
+        json.put("faultclass_type_id", whereJson.getString("faultclass_type_id"));
         json.put("solutions", whereJson.getString("solutions"));
         json.put("remark", whereJson.getString("remark"));
         json.put("update_optid", currentUserId);

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql

@@ -44,10 +44,12 @@
 		PAGEQUERY
 			SELECT
             	mst.*,
-            	class.class_name
+            	class.class_name,
+            	class2.class_name AS class_name_faultclass
             FROM
             	EM_BI_DeviceFaultClass mst
             	LEFT JOIN md_pb_classstandard class ON mst.material_type_id = class.class_id
+            	LEFT JOIN md_pb_classstandard class2 ON mst.faultclass_type_id = class2.class_id
             WHERE
                 mst.is_delete = '0'