1550076451 %!s(int64=3) %!d(string=před) roky
rodič
revize
3f456dafd7

+ 28 - 0
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

205
                                     true,
205
                                     true,
206
                                     out recordCount
206
                                     out recordCount
207
                                     );
207
                                     );
208
+                if (data != null && data.Rows.Count > 0)
209
+                {
210
+                    data.Columns.Add("Buttons", typeof(object));
211
+                    foreach (DataRow it in data.Rows)
212
+                    {
213
+                        switch (it["F_State"].ToString())
214
+                        {
215
+                            case "0":
216
+                                it["StateName"] = "待接单";
217
+                                break;
218
+                              case "2":
219
+                                it["StateName"] = "已接单";
220
+                                break;
221
+                              case "4":
222
+                                it["StateName"] = "处理中";
223
+                                break;
224
+                                     case "10":
225
+                                it["StateName"] = "已完成";
226
+                                break;
227
+                        }
228
+                            
229
+                      GetDescriptionOriginal(it ["F_State"].ToString());
230
+                    }
231
+                }
208
                 var obj = new
232
                 var obj = new
209
                 {
233
                 {
210
                     state = "success",
234
                     state = "success",
817
                 var model = orderbll.GetModel(orderid);
841
                 var model = orderbll.GetModel(orderid);
818
                 if (model !=null )
842
                 if (model !=null )
819
                 {
843
                 {
844
+                    if (model.F_State  !=0)
845
+                    {
846
+                        return Error("工单已分配,不可撤单");
847
+                    }
820
                     string deptname = "";
848
                     string deptname = "";
821
                     var deptmodel = deptbll.GetModel(User.F_DeptId);
849
                     var deptmodel = deptbll.GetModel(User.F_DeptId);
822
                     if (deptmodel != null)
850
                     if (deptmodel != null)