工单详情页面

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderBase.cs

@@ -1918,7 +1918,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 if (bllOrderHistory.Update(eidthistoryModel))
                 {
                     //判断是否所有的转办已经被处理 F_WORKORDERSTATEID=1 处理中  F_WORKORDERTYPEID=1转单
-                    int n = bllOrderHistory.GetRecordCount(string.Format("F_WORKORDERSTATEID=0  and  (F_REMARK !='已撤消' or  F_REMARK IS NULL)   and F_INSTANCEID=(select F_WORKORDERID from T_Wo_WorkOrderBase where F_WORKORDERID='{0}' and F_WORKORDERSTATEID=1 and F_WORKORDERTYPEID=1)", eidthistoryModel.F_INSTANCEID));
+                    int n = bllOrderHistory.GetRecordCount(string.Format("F_WORKORDERSTATEID=0  and  (F_REMARK !='已撤回' or  F_REMARK IS NULL)   and F_INSTANCEID=(select F_WORKORDERID from T_Wo_WorkOrderBase where F_WORKORDERID='{0}' and F_WORKORDERSTATEID=1 and F_WORKORDERTYPEID=1)", eidthistoryModel.F_INSTANCEID));
                     EditStatus = true;
                     if (n == 0)
                     {
@@ -2344,13 +2344,11 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 strSql.Append(" update T_Wo_WorkOrderBase set ");
                 strSql.Append(" F_WORKORDERSTATEID=0,F_WORKORDERTYPEID=1,F_REPAIRREQUEST='待处理',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
                 strSql.Append(" update T_Wo_WorkOrderHistory set ");
-                strSql.Append(" F_REMARK = '已撤消' where F_INSTANCEID=" + workOrderId);
+                strSql.Append(" F_REMARK = '已撤回' where F_HISTORYID in ( SELECT TOP 1  F_HISTORYID FROM  dbo.T_Wo_WorkOrderHistory where F_INSTANCEID=" + workOrderId+ " order by F_OPTDATE desc)");
+                  result= DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
 
                 int hisid = EditOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc);
-                if (hisid > 0)
-                {
-                    result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
-                }
+            
             }
             return result;
         }
@@ -2370,7 +2368,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             historyModel.F_WORKORDERSTATEID = 0;
             historyModel.F_StateName = "已处理";
             historyModel.F_TASKFLAG = 2;
-            historyModel.F_REMARK = "撤销，转补录工单";
+            historyModel.F_REMARK = "撤回，转补录工单";
             historyId = InsertWorkOrderHistoryModel(historyModel);
             //if (historyId > 0)
             //{

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/ViewMyOrder.cshtml

@@ -275,14 +275,32 @@
                       操作时间：@string.Format("{0:yyyy-MM-dd HH:mm:ss}", Model.HistoryOrderList[i].F_OPTDATE)<i class="layui-icon"
                         style="font-size: 20px; color: #1E9FFF;">&#xe60e;</i>
                     实际回复时间：@Model.HistoryOrderList[i].ReplayTimeFormat<i class="layui-icon"
-                        style="font-size: 20px; color: #1E9FFF;">&#xe60c;</i> 处理方式：转办 <i class="layui-icon"
-                        style="font-size: 20px; color: #1E9FFF;">&#xe756;</i> 处理状态:@Model.HistoryOrderList[i].F_StateName <i
-                        class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe613;</i>
-                      处理部门:@Model.HistoryOrderList[i].F_NEXTOWNERARRID <i class="layui-icon"
-                        style="font-size: 20px; color: #1E9FFF;">&#xe612;</i> 处理人：@Model.HistoryOrderList[i].F_UserName <i
-                        class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe60e;</i> 要求回复时间：无
-
-                    </h3>
+                        style="font-size: 20px; color: #1E9FFF;">&#xe60c;</i> 
+                     @if (!string.IsNullOrEmpty(Model.HistoryOrderList[i].F_REMARK))
+                    {
+                     if (Model.HistoryOrderList[i].F_REMARK == "撤回，转补录工单")
+                      {
+                         <i>处理方式: 撤回</i>
+                      }
+                      else
+                      {
+                         <i> 处理方式：转办 </i >
+                      }
+
+
+                     }
+                     else
+                     {
+                        <i>
+                            处理方式：转办 </i >
+                     }
+                          
+                    <i class="layui-icon"
+                       style="font-size: 20px; color: #1E9FFF;">&#xe756;</i> 处理状态:@Model.HistoryOrderList[i].F_StateName <i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe613;</i>
+                    处理部门:@Model.HistoryOrderList[i].F_NEXTOWNERARRID <i class="layui-icon"
+                                                                        style="font-size: 20px; color: #1E9FFF;">&#xe612;</i> 处理人：@Model.HistoryOrderList[i].F_UserName <i class="layui-icon" style="font-size: 20px; color: #1E9FFF;">&#xe60e;</i> 要求回复时间：无
+
+</h3>
                   }