1550076451 3 年 前
コミット
4c86846b4b

File diff suppressed because it is too large
+ 20 - 8
RMYY_CallCenter_Api.Dal/T_Car_WorkOrder.cs


+ 5 - 0
RMYY_CallCenter_Api.Model/T_Car_WorkOrder.cs

@@ -350,6 +350,11 @@ namespace RMYY_CallCenter_Api.Model
350 350
         public string F_ProposerDeptName { get; set; }
351 351
         public string F_CarName { get; set; }
352 352
         public string StateName { set; get; }
353
+
354
+        public int? F_LeaveRecordId
355
+        {
356
+            set; get;
357
+        }
353 358
         #endregion Model
354 359
 
355 360
     }

+ 21 - 1
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -339,7 +339,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
339 339
         /// <returns></returns>
340 340
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
341 341
             int detpid,string startplace,string endplace,string needman,string phon,
342
-            int cartype,string remark,string source,string usertime,int birth,string callid ="")
342
+            int cartype,string remark,  string source,string usertime,int birth,string callid ="",int LeaveRecordId=0)
343 343
         {
344 344
             if (User!=null)
345 345
             {
@@ -378,6 +378,25 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
378 378
                 model.F_State = (int)EnumWorkOrderState.neworder;//0
379 379
                 model.F_CreateUser = User.F_UserCode;
380 380
                 model.F_IsDel = 0;
381
+                if ( LeaveRecordId> 0)
382
+
383
+                {
384
+                    var ld = new Bll.T_Call_LeaveRecord().GetModel(LeaveRecordId);
385
+                    if (ld != null)
386
+                    {
387
+
388
+                        ld.F_Status = 1;
389
+                        ld.F_DealTime = DateTime.Now;
390
+                        ld.F_UserId = User.F_UserId;
391
+                        ld.F_UserCode = User.F_UserCode;
392
+                        ld.F_UserName = User.F_UserName;
393
+                        ld.F_WorkOrderId = model.F_WorkOrderCode;
394
+                        ld.F_Type = 4000;
395
+                        new Bll.T_Call_LeaveRecord().Update(ld);
396
+                        model.F_LeaveRecordId =LeaveRecordId;
397
+                    }
398
+                }
399
+
381 400
                 #endregion
382 401
                 int n = orderbll.Add(model);
383 402
                 if (n > 0)
@@ -1231,6 +1250,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
1231 1250
             if (dmodel != null)
1232 1251
             {
1233 1252
                 string sql = "F_DeptId="+ deptid;
1253
+                sql += "and F_EnableFlag=1";
1234 1254
                 var ua = userbll.GetModelList(sql);
1235 1255
                 if (ua.Count > 0)
1236 1256
                 {

+ 19 - 2
RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -820,7 +820,24 @@ namespace RMYY_CallCenter_Api.Controllers
820 820
                 model.F_Cathetertime = input.F_Cathetertime;//置管时间
821 821
                 model.F_BedNum = input.F_BedNum;//床号
822 822
                 model.F_InpatientNum = input.F_InpatientNum;//住院号
823
-            
823
+            if (input.LeaveRecordId != null &&input .LeaveRecordId > 0)
824
+            {
825
+                var ld = new Bll.T_Call_LeaveRecord().GetModel(input.LeaveRecordId.Value );
826
+                if (ld != null)
827
+                {
828
+
829
+                    ld.F_Status = 1;
830
+                    ld.F_DealTime = DateTime.Now;
831
+                    ld.F_UserId = User.F_UserId;
832
+                    ld.F_UserCode = User.F_UserCode;
833
+                    ld.F_UserName = User.F_UserName;
834
+                    ld.F_WorkOrderId = model.F_WorkOrderCode;
835
+                    ld.F_Type = 1000;
836
+                    new Bll.T_Call_LeaveRecord().Update(ld);
837
+                    model.F_LeaveRecordId = input.LeaveRecordId;
838
+                }
839
+            }
840
+
824 841
 
825 842
             //model.F_DealType = input.F_DealType;//处理方式:立即办理,提交审核,转派部门
826 843
             model.F_WorkOrderContents = input.F_WorkOrderContents;//工单内容
@@ -1704,7 +1721,7 @@ namespace RMYY_CallCenter_Api.Controllers
1704 1721
         public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,string reason)
1705 1722
         {
1706 1723
             #region 工单处理
1707
-            var opt = "单";
1724
+            var opt = "退单";
1708 1725
             int optbut = (int)EnumItemOpt.reback;
1709 1726
             int wostate = (int)EnumWorkOrderState.reback;
1710 1727
 

+ 5 - 4
RMYY_CallCenter_Api/Models/Input/Con_WorkOrderInput.cs

@@ -143,8 +143,8 @@ namespace RMYY_CallCenter_Api.Models.Input
143 143
         {
144 144
             get; set;
145 145
         }
146
-     
147
-        
146
+
147
+
148 148
 
149 149
         /// <summary>
150 150
         /// 处理方式:1立即办理,2提交审核,3转派(健康事业部)
@@ -188,7 +188,7 @@ namespace RMYY_CallCenter_Api.Models.Input
188 188
         /// <summary>
189 189
         /// 处理时间
190 190
         /// </summary>
191
-        public string  F_HandleTime
191
+        public string F_HandleTime
192 192
         {
193 193
             get; set;
194 194
         }
@@ -440,7 +440,8 @@ namespace RMYY_CallCenter_Api.Models.Input
440 440
         /// <summary>
441 441
         /// 预约时间
442 442
         /// </summary>
443
-       public DateTime ? F_AppointmentTime { set; get; }
443
+        public DateTime? F_AppointmentTime { set; get; }
444
+        public int? LeaveRecordId{set ;get ;}
444 445
         #endregion Model
445 446
 
446 447
     }