1550076451 преди 3 години
родител
ревизия
14d19a50bc

Файловите разлики са ограничени, защото са твърде много
+ 21 - 9
RMYY_CallCenter_Api.Dal/T_Car_WorkOrder.cs


+ 4 - 0
RMYY_CallCenter_Api.Model/T_Car_WorkOrder.cs

323
             get; set;
323
             get; set;
324
         }
324
         }
325
         /// <summary>
325
         /// <summary>
326
+        /// 是否新生儿转运
327
+        /// </summary>
328
+        public int F_Birth { set; get; }
329
+        /// <summary>
326
         /// 调度员
330
         /// 调度员
327
         /// </summary>
331
         /// </summary>
328
         public string F_ControlManCode { get; set; }
332
         public string F_ControlManCode { get; set; }

+ 11 - 3
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

254
         /// <returns></returns>
254
         /// <returns></returns>
255
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
255
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
256
             int detpid,string startplace,string endplace,string needman,string phon,
256
             int detpid,string startplace,string endplace,string needman,string phon,
257
-            int cartype,string remark,string source,string usertime,string callid ="")
257
+            int cartype,string remark,string source,string usertime,int birth,string callid ="")
258
         {
258
         {
259
             if (User!=null)
259
             if (User!=null)
260
             {
260
             {
286
                 model.F_Phon = phon;//联系电话
286
                 model.F_Phon = phon;//联系电话
287
                 model.F_CarType = cartype;//车辆大小
287
                 model.F_CarType = cartype;//车辆大小
288
                 model.F_Content = content;//调度内容
288
                 model.F_Content = content;//调度内容
289
+                model.F_Birth = birth;
289
                 model.F_Remark = remark;//备注
290
                 model.F_Remark = remark;//备注
290
                 model.F_HosId = hosid;
291
                 model.F_HosId = hosid;
291
                 model.F_CreateTime = DateTime.Now;
292
                 model.F_CreateTime = DateTime.Now;
323
         /// <returns></returns>
324
         /// <returns></returns>
324
         public ActionResult UpdateWorkOrder(string WorkOrderCode, 
325
         public ActionResult UpdateWorkOrder(string WorkOrderCode, 
325
             string usertime,string content, int type,int hosid, int detpid, string startplace, string endplace,
326
             string usertime,string content, int type,int hosid, int detpid, string startplace, string endplace,
326
-            string needman,string needmanName, string phon, int cartype, string remark)
327
+            string needman,string needmanName, string phon,int birth, int cartype, string remark)
327
         {
328
         {
328
             int userId = 1;
329
             int userId = 1;
329
             if (userId != 0)
330
             if (userId != 0)
359
                 model.F_Content = content;//调度内容
360
                 model.F_Content = content;//调度内容
360
                 model.F_CarType = cartype;//车辆大小
361
                 model.F_CarType = cartype;//车辆大小
361
                 model.F_Remark = remark;//备注
362
                 model.F_Remark = remark;//备注
362
-               
363
+                model.F_Birth = birth;
363
                 #endregion
364
                 #endregion
364
                 bool n = orderbll.Update(model);
365
                 bool n = orderbll.Update(model);
365
                 if (n)
366
                 if (n)
774
                 var car = DbHelperSQL.GetSingle(carsql).ToString ();
775
                 var car = DbHelperSQL.GetSingle(carsql).ToString ();
775
                 if (int .Parse(car) <=0)
776
                 if (int .Parse(car) <=0)
776
                 {
777
                 {
778
+                    var carmodel = carbll.GetModel(model.F_CarId .Value );
779
+                    if (carbll == null)
780
+                    {
781
+                        carmodel.F_State = 0;
782
+                        new Bll.T_Car_Message().Update(carmodel);
783
+                    }
784
+                   
777
                     model.F_State = (int)EnumWorkOrderState.finish;
785
                     model.F_State = (int)EnumWorkOrderState.finish;
778
                     if (new BLL.T_Car_AssignWorkOrder().Update(model))
786
                     if (new BLL.T_Car_AssignWorkOrder().Update(model))
779
                     {
787
                     {