1.3.12

.env

@@ -2,4 +2,4 @@
 #Development
 #Staging
 DEV_ENVIRONMENT=Development 
-version=1.3.11
+version=1.3.12

Ropin.Inspection.Api/Controllers/SYS/TsysMessageController.cs

@@ -244,7 +244,7 @@ namespace Ropin.Inspection.Api.Controllers
 
                 IWorkbook workbook = new XSSFWorkbook();
                 ISheet sheet = workbook.CreateSheet("sheet1");
-                sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, 6));
+                sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, 5));
                 var titleRow = sheet.CreateRow(0);
                 titleRow.Height = 20 * 25;
                 ICell titleCell = titleRow.CreateCell(0);

Ropin.Inspection.Api/TmtnRepairOrderController.cs

@@ -283,7 +283,7 @@ namespace Ropin.Inspection.Api
                     DevName = "",
                     GenerationType = 2,
                     msgStatus = 0,
-                },"设备维修",null, results?.C_ID,"1");
+                },"设备维修",null, results?.C_ID,"1", content.C_Name);
             }
             catch (Exception ex)
             {
@@ -358,7 +358,7 @@ namespace Ropin.Inspection.Api
                     DevName = "",
                     GenerationType = 2,
                     msgStatus = 0,
-                }, "设备维修",null, id,updateModel.C_Status);
+                }, "设备维修",null, id,updateModel.C_Status, updateModel.C_Name);
             }
             catch (Exception ex)
             {

Ropin.Inspection.Api/TmtnRepairOrderItemController.cs

@@ -251,9 +251,10 @@ namespace Ropin.Inspection.Api
             }
             try
             {
-                //await _tmtnRepairOrderService.UpdateAsync(content.C_RepairRecord, TmtnRepairOrderItemUpdateModel updateModel);
                 await _TmtnRepairOrderItemService.CreateRepairOrderItemAsync(content);
-                //await _pushMsgService.PushAlarmMsgAsync(new TpushMsgModel { C_DevStoreCode = devStoreCode, C_MsgTypeCode = "MSG_TYPE_008", Msg = content.C_RepairRecord });
+                var orderDta = await _tmtnRepairOrderService.GetByIdAsync(content.C_RepairCode);
+                string title = "";
+                if (orderDta != null) { title = orderDta.C_Name; }
                 await _pushMsgService.PushAlarmMsgAsync(new TpushMsgModel
                 {
                     C_DevStoreCode = devStoreCode,
@@ -282,7 +283,7 @@ namespace Ropin.Inspection.Api
                     DevName = "",
                     GenerationType = 2,
                     msgStatus = 0,
-                },"设备维修",null, content.C_RepairCode, content.C_Status);
+                },"设备维修",null, content.C_RepairCode, content.C_Status, title);
             }
             catch (Exception ex)
             {

Ropin.Inspection.Common/DataDictionaryHelper.cs

@@ -122,7 +122,7 @@ namespace Ropin.Inspection.Common
                     case "MSG_TYPE_014": //val = "正在维修"; break;
                     case "MSG_TYPE_015": //val = "维修返工"; break;
                     case "MSG_TYPE_016": //val = "维修完成确认"; break;
-                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + dataId + "&StoreCode=" + StoreCode;
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + dataId + "&StoreCode=" + StoreCode + "&Title=" + title;
                         break;
                     case "MSG_TYPE_002": //val = "通知运维"; break;
                     case "MSG_TYPE_009": //val = "运维审核"; break;