Merge branch 'feat-liucheng'

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -211,7 +211,8 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <returns></returns>
         public ActionResult GetCodeCustomer(string code)
         {
-            var list = new List<Model.T_Cus_CustomerBaseNew>(); DataTable dt = new DataTable();
+            var list = new List<Model.T_Cus_CustomerBaseNew>();
+            DataTable dt = new DataTable();
             string sql = "  F_IsDelete=0";
             if (!string.IsNullOrWhiteSpace(code))//客户编号
             {
@@ -786,8 +787,37 @@ namespace CallCenterApi.Interface.Controllers.customer
                             Input1.F_Gender = "女";
                         }
                     }
-                    Input1.F_Salesman = model[i].F_Salesman;//业务员
-                    Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
+
+                    if (!string.IsNullOrEmpty(model[i].F_Salesman))
+                    {
+                        Input1.F_Salesman = model[i].F_Salesman;//业务员
+                        Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
+                    }
+                    else
+                    {
+                        string sql = $" F_DeleteFlag=0";
+                        if (!string.IsNullOrWhiteSpace(model[i].F_AddressCountry))//县
+                        {
+                            sql += $" and (F_Remark like '%{  model[i].F_AddressCountry.Trim()}%'";
+                            if (!string.IsNullOrWhiteSpace(model[i].F_AddressCity))//市
+                                sql += $" or F_Remark like '%{ model[i].F_AddressCity.Trim()}%')";
+                            else
+                                sql += $")";
+                        }
+                        else if (!string.IsNullOrWhiteSpace(model[i].F_AddressCity))//市
+                            sql += $" and F_Remark like '%{ model[i].F_AddressCity.Trim()}%'";
+                        else
+                            sql += $" and 1!=1";
+
+                        var modelist = new BLL.T_Sys_UserAccount().GetModelList(sql).FirstOrDefault();
+
+                        if (modelist!=null)
+                        {
+                            Input1.F_Salesman = modelist.F_UserName;//业务员
+                            Input1.F_SalesPhone = modelist.F_Mobile;//业务员电话  
+                        }
+                        
+                    }
 
                     Input1.F_Channel = model[i].F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
                     Input1.F_Credit = model[i].F_Credit;//信用等级:一星、二星、三星、四星、五星、空

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -403,10 +403,10 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     {
                         model.F_CategoryId = 0;
                     }
-                    model.F_Title = dataRow[0].ToString();
-                    model.F_KeyWords = dataRow[1].ToString();
-                    model.F_Content = WebHelper.UrlDecode(dataRow[2].ToString());
-                    model.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(dataRow[0].ToString()));
+                    model.F_Title = dataRow[1].ToString();
+                    model.F_KeyWords = dataRow[2].ToString();
+                    model.F_Content = WebHelper.UrlDecode(dataRow[3].ToString());
+                    model.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(dataRow[3].ToString()));
                     model.F_CreateOn = DateTime.Now;
                     model.F_DeleteFlag = 0;
                     model.F_CreateBy = userId;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -1738,7 +1738,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
                 if (modlelist.Count > 0)
                 {
-                    List<WorkOrderNewInput> Input = modeltooip(modlelist, ua);
+                    List<WorkOrderNewInput> Input =modeltooip(modlelist, ua);
                     var obj = new
                     {
                         state = "success",
@@ -3968,19 +3968,19 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
 
                     #region 内线超时时间计算
-                    float c2 = TimeToOver(model1[i].F_ID, model1[i].F_limit, 2);
-                    float a2 = Math.Abs(c2);
-                    int days2 = (int)Math.Floor(Convert.ToDouble(a2 / 24));
-                    int hours2 = days2 > 0
-                                   ? (int)Math.Floor(Convert.ToDouble((a2 - days2 * 24)))
-                                   : (int)Math.Floor(Convert.ToDouble(a2));
-                    float minutes2 = hours2 > 0
-                                   ? a2 * 60 - days2 * 1440 - hours2 * 60
-                                   : 0;
-                    if (c2 > 0)
-                        model.RemainingTime2 = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
-                    else
-                        model.RemainingTime2 = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
+                    //float c2 = TimeToOver(model1[i].F_ID, model1[i].F_limit, 2);
+                    //float a2 = Math.Abs(c2);
+                    //int days2 = (int)Math.Floor(Convert.ToDouble(a2 / 24));
+                    //int hours2 = days2 > 0
+                    //               ? (int)Math.Floor(Convert.ToDouble((a2 - days2 * 24)))
+                    //               : (int)Math.Floor(Convert.ToDouble(a2));
+                    //float minutes2 = hours2 > 0
+                    //               ? a2 * 60 - days2 * 1440 - hours2 * 60
+                    //               : 0;
+                    //if (c2 > 0)
+                    //    model.RemainingTime2 = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
+                    //else
+                    //    model.RemainingTime2 = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
                     #endregion
 
                     if (ua != null)
@@ -4045,6 +4045,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_Manufacturers = model1[i].F_Manufacturers;//质量管理科-原料及厂家
                     model.F_ProductionNum = model1[i].F_ProductionNum;//质量管理科-该批次生产数量
                     model.F_Flag = model1[i].F_Flag;//1单线外 2单线内 3双线 9市场科可以双线指派工单 0 未指派工单
+
+                    if (!string.IsNullOrEmpty(model1[i].F_Material_CreateBy))
+                    {
+                        model.F_Material_CreateBy = userAccountBLL.GetModel(model1[i].F_Material_CreateBy).F_UserName;
+                        model.F_Material_CreateTime = model1[i].F_Material_CreateTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "";
+                    }
+
                     if (ua != null)
                     {
                         model.inout = GetNodeState(model1[i].F_ID, ua.F_UserCode, state);
@@ -5255,9 +5262,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <param name="model"></param>
         /// <param name="input"></param>
         /// <returns></returns>
-        private Model.T_Wo_WorkOrder InToworkModel(Model.T_Wo_WorkOrder model, WorkOrderNewInput input)
+        private Model.T_Wo_WorkOrder InToworkModel(Model.T_Wo_WorkOrder model, WorkOrderNewInput input,Model.T_Sys_UserAccount ua)
 
         {
+            string str = ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "  ";
             if (!string.IsNullOrEmpty(input.F_SC_ProductBase))
                 model.F_SC_ProductBase = input.F_SC_ProductBase;//市场管理科-生产基地（新乡、新疆、九江、东北、贴牌、无法确定）
             if (!string.IsNullOrEmpty(input.F_SC_PreliminaryOpinion))
@@ -5290,8 +5298,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_ZL_CResponsibleUnits = input.F_ZL_CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
             if (!string.IsNullOrEmpty(input.F_ZL_Fquantity))
                 model.F_ZL_Fquantity = input.F_ZL_Fquantity;// 质量管理科-确认实收数量（吨）
-            if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements))
-                model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
+            if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements) && !model.F_ZL_ImprovementRequirements.Contains(input.F_ZL_ImprovementRequirements))
+            {
+                string strimprovement = str + input.F_ZL_ImprovementRequirements + ";@# ";
+                model.F_ZL_ImprovementRequirements = string.IsNullOrEmpty(model.F_ZL_ImprovementRequirements) ? strimprovement : model.F_ZL_ImprovementRequirements + strimprovement; //质量管理科-改进要求
+            }
             if (!string.IsNullOrEmpty(input.F_ZL_CApprovalNo))
                 model.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
             if (!string.IsNullOrEmpty(input.F_ZL_CJ_IsRecord))
@@ -5317,8 +5328,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_UnLoadingFee = input.F_UnLoadingFee;
             if (input.F_MaterialFee > 0) //返料费
                 model.F_MaterialFee = input.F_MaterialFee;
-            if (!string.IsNullOrEmpty(input.F_EventReason))
-                model.F_EventReason = input.F_EventReason;//质量管理科-事件原因
+            if (!string.IsNullOrEmpty(input.F_EventReason) &&  !model.F_EventReason.Contains(input.F_EventReason))
+            {
+                string strevent = str + input.F_EventReason + ";@# ";
+                model.F_EventReason = string.IsNullOrEmpty(model.F_EventReason) ? strevent : model.F_EventReason + strevent; //质量管理科-事件原因
+            }
             if (!string.IsNullOrEmpty(input.F_DrivePhone))
                 model.F_DrivePhone = input.F_DrivePhone;//电话号码
             if (!string.IsNullOrEmpty(input.F_WorkmanShip))
@@ -5606,6 +5620,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                                         itemlist.Add(itemodel);
                                                     }
                                                     model.MaterialItems = itemlist;
+                                                    model.F_SC_PreliminaryOpinion = "退换货";
+                                                    model.F_Material_CreateBy = ua.F_UserCode;
+                                                    model.F_Material_CreateTime = DateTime.Now;
                                                 }
 
                                             }
@@ -5940,7 +5957,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
 
                 }
-                InToworkModel(model, input);
+                InToworkModel(model, input, nowUser);
 
                 if (!string.IsNullOrEmpty(F_Files))
                 {
@@ -7369,7 +7386,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //}
 
                 model.F_DealTime = DateTime.Now;
-                InToworkModel(model, input);
+                InToworkModel(model, input,nowUser);
                 woBLL.Update(model);
                 #endregion
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -1,4 +1,5 @@
 using CallCenter.Utility;
+using CallCenterApi.Cache.Models;
 using CallCenterApi.Common;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
@@ -3407,16 +3408,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             dt.Columns.Add("问题数量");
                             dt.Columns.Add("销售基地");                                       
                             dt.Columns.Add("生产批次号");
-                            if (type == 5)
-                            {
-                                dt.Columns.Add("问题类别");
-                            }
-                            else
-                            {
-                                dt.Columns.Add("问题类别1");
-                                dt.Columns.Add("问题类别2");
-                                dt.Columns.Add("问题类别3");
-                            }
+                            dt.Columns.Add("问题类别1");
+                            dt.Columns.Add("问题类别2");
+                            dt.Columns.Add("问题类别3");
+                            //if (type == 5)
+                            //{
+                            //    dt.Columns.Add("问题类别");
+                            //}
+                            //else
+                            //{
+                            //    dt.Columns.Add("问题类别1");
+                            //    dt.Columns.Add("问题类别2");
+                            //    dt.Columns.Add("问题类别3");
+                            //}
                             dt.Columns.Add("重要级别");
                             dt.Columns.Add("品牌");
                             dt.Columns.Add("客户编号");
@@ -3493,7 +3497,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         dt.Columns.Add("超时时限");
                         dt.Columns.Add("剩余时间");
                         dt.Columns.Add("创建时间");
-                        dt.Columns.Add("回访时间");
+                        dt.Columns.Add("完结时间");
                         dt.Columns.Add("用时(天)");
                         //dt.Columns.Add("剩余时间-内线");
                         //dt.Columns.Add("超时原因");
@@ -3506,7 +3510,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         dt.Columns.Add("该批次生产数量");
                         dt.Columns.Add("车牌号");
                         dt.Columns.Add("返账金额");
-                        dt.Columns.Add("实收货数量");
+                        dt.Columns.Add("实收返厂数量");
+                        dt.Columns.Add("是否退换货");
                         //dt.Columns.Add("工单记录");
                         #endregion
                         foreach (var it in depts)
@@ -3688,6 +3693,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["内线工单状态"] = "已撤回待指派";
                             }
                             #endregion
+
+                            int cropid = 0;
                             if (type == 1 || type == 4)
                             {
                                 if (!string.IsNullOrEmpty(it.F_QuestionType))
@@ -3707,18 +3714,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
                                 }
                                 drNew["产品名称"] = it.F_TS_Category;
-                                drNew["问题数量"] = it.F_ZX_Quantity;//投诉-（吨）
+                                drNew["问题数量"] = string.IsNullOrEmpty(it.F_ZX_Quantity)? it.F_TS_Quantity : it.F_ZX_Quantity;//投诉-（吨）
                                 drNew["销售基地"] = it.F_SalesBase;
                             }
                             else if (type == 2 || type==5)
                             {
                                 drNew["产品名称"] = it.F_TS_Category;
-                                if (!string.IsNullOrEmpty(it.F_TS_Quantity))
-                                {
-                                    drNew["问题数量"] = it.F_TS_Quantity + "吨";//投诉-问题数量（吨）
-                                }
-                                else
-                                    drNew["问题数量"] = "";
+                                drNew["问题数量"] = string.IsNullOrEmpty(it.F_TS_Quantity)? it.F_ZX_Quantity : it.F_TS_Quantity + "吨";//投诉-问题数量（吨）
+                                //if (!string.IsNullOrEmpty(it.F_TS_Quantity))
+                                //{
+                                //    drNew["问题数量"] =string.IsNullOrEmpty(it.F_TS_Quantity)? it.F_ZX_Quantity : it.F_TS_Quantity + "吨";//投诉-问题数量（吨）
+                                //}
+                                //else
+                                //    drNew["问题数量"] = "";
                                 drNew["销售基地"] = it.F_SalesBase;
                                 drNew["生产批次号"] = it.F_BatchNumber;
                                 if (!string.IsNullOrEmpty(it.F_QuestionType))
@@ -3731,7 +3739,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         {
                                             if (type == 5)
                                             {
-                                                drNew["问题类别"] = manage.F_QuestionName;
+                                                drNew["问题类别1"] = manage.F_QuestionName;
+                                                if (manage.F_QuestionName.Contains("肥效"))
+                                                {
+                                                    if (int.TryParse(it.F_Crops.Trim(), out cropid))
+                                                    {
+                                                        drNew["问题类别2"] = new BLL.T_Sys_DictionaryValue().GetModel(cropid)?.F_Name ?? "";//作物
+                                                    }
+                                                    else drNew["问题类别2"] = "";
+                                                }
                                             }
                                             else
                                             {
@@ -3767,9 +3783,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={it.F_ID}");
                                 if (materlist != null)
                                 {
-                                  drNew["实收货数量"] = materlist.Sum(x => x.F_ReturnQuantity).ToString();
+                                  drNew["实收返厂数量"] = materlist.Sum(x => x.F_ReturnQuantity).ToString();
                                 }
-                        
+
+                                drNew["是否退换货"] = it.F_SC_PreliminaryOpinion;
+
                                 //dt.Columns.Add("原料及厂家");
                                 //dt.Columns.Add("车牌号");
                                 //dt.Columns.Add("返账金额");
@@ -3908,7 +3926,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             drNew["客户电话"] = it.F_CusPhone;//
                             drNew["问题描述"] = it.F_Description;//
                             drNew["创建时间"] = it.F_CreateOn;
-                            drNew["回访时间"] = it.F_VisitOn;
+                            #region  获取外线完结时间
+                            var itemlasts = itembll.GetModelList($" F_WoID={it.F_ID} and F_ItemType={(int)EnumItemType.deal} and F_OptType={(int)EnumItemOpt.end} and F_Type=1 order by F_CreateTime desc").FirstOrDefault();
+                            if (itemlasts != null)
+                                drNew["完结时间"] = itemlasts.F_CreateTime;
+                            #endregion
 
                             drNew["事发地-省"] = it.F_IncidentProvince;//
                             drNew["事发地-市"] = it.F_IncidentCity;//
@@ -3920,17 +3942,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             drNew["处理详情-内线"] = it.F_DealContent2;//处理内容
                             drNew["回访备注"] = it.F_VisitRemarks;//处理内容
                             drNew["注解"] = it.F_Annotation;//处理内容
-                            drNew["超时时限"] = it.F_limit;//处理内容
-                            #region
-                            float RemainingTime = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit)));
-                            if (RemainingTime >= 0)
-                            {
-                                drNew["剩余时间"] = RemainingTime;//处理内容
-                            }
+                            #region 超时时限
+                            int day = (int)Math.Floor(Convert.ToDouble(it.F_limit / 24));
+                            int hour = day > 0
+                                           ? (int)Math.Floor(Convert.ToDouble((it.F_limit - day * 24)))
+                                           : (int)Math.Floor(Convert.ToDouble(it.F_limit));
+
+                            string time = "";
+                            if (day > 0) time += day + "天";
+                            if (hour > 0) time += hour + "小时";
+                            drNew["超时时限"] = time;//超时时限
+                            #endregion
+
+
+                            #region  剩余时间
+                            float c = TimeToOver(it.F_ID, it.F_limit);
+                            float a = Math.Abs(c);
+                            int days1 = (int)Math.Floor(Convert.ToDouble(a / 24));
+                            int hours = days1 > 0
+                                           ? (int)Math.Floor(Convert.ToDouble((a - days1 * 24)))
+                                           : (int)Math.Floor(Convert.ToDouble(a));
+                            float minutes = hours > 0
+                                           ? a * 60 - days1 * 1440 - hours * 60
+                                           : 0;
+                            if (c > 0)
+                                drNew["剩余时间"] = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days1, hours, minutes);
                             else
-                            {
-                                drNew["剩余时间"] = "超时" + Math.Abs(RemainingTime);//处理内容
-                            }
+                                drNew["剩余时间"] = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days1, hours, minutes);
+                            float RemainingTime = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit)));                        
                             float aa = Math.Abs(it.F_limit-RemainingTime);
                             int days = (int)Math.Floor(Convert.ToDouble(aa / 24));
                             drNew["用时(天)"] = days+"天";
@@ -3947,7 +3986,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //}
                             //#endregion
                             //drNew["超时原因"] = it.F_Reasontimeout;//处理内容it
-                            int cropid = 0;
+                            //int cropid = 0;
                             if (int.TryParse(it.F_Crops.Trim(), out cropid))
                             {
                                 drNew["作物"] = new BLL.T_Sys_DictionaryValue().GetModel(cropid)?.F_Name ?? "";//作物
@@ -6996,8 +7035,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_Flag = model1[i].F_Flag;//1单线外 2单线内 3双线 9市场科可以双线指派工单 0 未指派工单
                     model.inout = GetNodeState(model1[i].F_ID,state);
                     model.woflag = IsMarketAssign(model1[i].F_ID);
-
-
+                    
+                    if (!string.IsNullOrEmpty(model1[i].F_Material_CreateBy))
+                    {
+                        model.F_Material_CreateBy = sysUserAccountBll.GetModel(model1[i].F_Material_CreateBy).F_UserName;
+                        model.F_Material_CreateTime = model1[i].F_Material_CreateTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "";
+                    }                  
 
                     if (ua != null)
                     {
@@ -7989,6 +8032,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 itemlist.Add(itemodel);
                                             }
                                             modlelist.MaterialItems = itemlist;
+                                            model.F_SC_PreliminaryOpinion = "退换货";
+                                            model.F_Material_CreateBy = ua.F_UserCode;
+                                            model.F_Material_CreateTime = DateTime.Now;
                                         }
 
                                     }
@@ -8054,14 +8100,39 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else if (flag == 2)
                         {
-                            var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
-                            Overorder(ua, modlelist, 2,1);
+
+                            if (clbm2 == 427) //运营中心
+                            {
+                                flag = 3;
+                                model.F_Flag = 9;
+                                model.F_State = (int)EnumWorkOrderState.assign;
+                                model.F_State2 = (int)EnumWorkOrderState.assign;
+                                AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 3,9);
+                            }
+                            else
+                            {
+                                var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2, flag);
+                                Overorder(ua, modlelist, 2,1);
+                            }
+
                             //DealWO(ua, modlelist, input, "", "", 1, "", 1, "",flag);
                         }
                         else
                         {
-                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,flag);
-                            Overorder(ua, modlelist,2,2);
+                            if (clbm == 427) //运营中心
+                            {
+                                flag = 3;
+                                model.F_Flag = 9;
+                                model.F_State = (int)EnumWorkOrderState.assign;
+                                model.F_State2 = (int)EnumWorkOrderState.assign;
+                                AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                            }
+                            else
+                            {
+                                var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms, flag);
+                                Overorder(ua, modlelist, 2, 2);
+                            }
+                           
                             //DealWO(ua, modlelist, input, "", "", 1, "", 2, "",flag);
 
                         }
@@ -8623,6 +8694,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             flag = 3;
                             DealWO(ua, model, input, cont2, "", 1, "", 1, flag,isApprovalp);
+                            model.F_Flag = flag;
+                            AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
                         }
                         else if (opttype == 3) // 待处理状态
                         {
@@ -8631,13 +8704,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modellast.F_Flag = flag;
                             modellast.F_NextDept = 0;
                             itembll.Update(modellast);
+                            model.F_Flag = flag;
+                            AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
                         }
                         else //完结工单
                         {
-                           Overorder(ua, model, 2, 1);
+                            if (clbm == 427) //运营中心
+                            {
+                                flag = 3;
+                                model.F_Flag = 9;
+                                model.F_State = (int)EnumWorkOrderState.assign;
+                                model.F_State2 = (int)EnumWorkOrderState.assign;
+                                AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                            }
+                            else
+                            {
+                                Overorder(ua, model, 2, 1);
+                                model.F_Flag = flag;
+                                AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
+                            }
                         }
-                        model.F_Flag = flag;
-                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
+                       
                         //DealWO(ua, model, input, "", "", 1, "", 1, "",flag);
                     }
                     else
@@ -8650,6 +8737,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             flag = 3;
                             DealWO(ua, model, input, cont2, "", 1, "", 2, flag, isApprovalp);
+                            model.F_Flag = flag;
+                            AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
                         }
                         else if (opttype == 3) // 待处理状态
                         {
@@ -8658,13 +8747,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modellast.F_Flag = flag;
                             modellast.F_NextDept = 0;
                             itembll.Update(modellast);
+                            model.F_Flag = flag;
+                            AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
                         }
                         else //完结工单
                         {
-                            Overorder(ua, model, 2, 2);
+                            if (clbm == 427) //运营中心
+                            {
+                                flag = 3;
+                                model.F_Flag = 9;
+                                model.F_State = (int)EnumWorkOrderState.assign;
+                                model.F_State2 = (int)EnumWorkOrderState.assign;
+                                AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                            }
+                            else
+                            {
+                                Overorder(ua, model, 2, 2);
+                                model.F_Flag = flag;
+                                AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
+                            }
                         }
-                        model.F_Flag = flag;
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag,Supercont);                               
+                                                    
                     }
                     return Success("转派成功");
                 }
@@ -8779,6 +8882,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                     itemlist.Add(itemodel);
                                                 }
                                                 model.MaterialItems = itemlist;
+                                                model.F_SC_PreliminaryOpinion = "退换货";
+                                                model.F_Material_CreateBy = ua.F_UserCode;
+                                                model.F_Material_CreateTime = DateTime.Now;
                                             }
 
                                         }
@@ -10252,9 +10358,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     else
                         model.F_Files = F_Files;
                 }
-
+                string strcont = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                 if (!string.IsNullOrEmpty(cont))
                 {
+                    string strconts1 = strcont + " " + cont + ";@# ";
                     if (model.F_Source == "3")
                     {
                         if (flag == 2)
@@ -10284,6 +10391,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (model.F_SuperiorOpinion.Trim() != cont.Trim())
                         {
                             model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                            //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion)? strconts1:model.F_SuperiorOpinion + strconts1;
                         }
                     }
                     else if (flag == 2)
@@ -10291,6 +10399,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (model.F_SuperiorOpinion2.Trim() != cont.Trim())
                         {
                             model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                            //model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
                         }
                     }                 
                 }
@@ -10468,6 +10577,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private Model.T_Wo_WorkOrder InToworkModel(Model.T_Wo_WorkOrder model, WorkOrderNewInput input)
 
         {
+            CurrentUserInfo ua =CurrentUser.UserData;
+            string str = ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "  ";
             if (!string.IsNullOrEmpty(input.F_SC_ProductBase))
                 model.F_SC_ProductBase = input.F_SC_ProductBase;//市场管理科-生产基地（新乡、新疆、九江、东北、贴牌、无法确定）
             if (!string.IsNullOrEmpty(input.F_SC_PreliminaryOpinion))
@@ -10500,8 +10611,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_ZL_CResponsibleUnits = input.F_ZL_CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
             if (!string.IsNullOrEmpty(input.F_ZL_Fquantity))
                 model.F_ZL_Fquantity = input.F_ZL_Fquantity;// 质量管理科-确认实收数量（吨）
-            if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements))
-                model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
+            if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements) && !model.F_ZL_ImprovementRequirements.Contains(input.F_ZL_ImprovementRequirements) )
+            {
+               string  strimprovement = str + input.F_ZL_ImprovementRequirements + ";@# ";
+                model.F_ZL_ImprovementRequirements = string.IsNullOrEmpty(model.F_ZL_ImprovementRequirements) ? strimprovement : model.F_ZL_ImprovementRequirements + strimprovement; //质量管理科-改进要求
+                //model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
+            }
             if (!string.IsNullOrEmpty(input.F_ZL_CApprovalNo))
                 model.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
             if (!string.IsNullOrEmpty(input.F_ZL_CJ_IsRecord))
@@ -10530,8 +10645,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_UnLoadingFee = input.F_UnLoadingFee;
             if (input.F_MaterialFee > 0) //返料费
                 model.F_MaterialFee = input.F_MaterialFee;
-            if (!string.IsNullOrEmpty(input.F_EventReason))
-                model.F_EventReason = input.F_EventReason;//质量管理科-事件原因
+            if (!string.IsNullOrEmpty(input.F_EventReason) && !model.F_EventReason.Contains(input.F_EventReason))
+            {
+                string strevent = str + input.F_EventReason + ";@# ";
+                model.F_EventReason = string.IsNullOrEmpty(model.F_EventReason) ? strevent : model.F_EventReason + strevent; //质量管理科-事件原因
+            }
             if (!string.IsNullOrEmpty(input.F_DrivePhone))
                 model.F_DrivePhone = input.F_DrivePhone;//电话号码
             if (!string.IsNullOrEmpty(input.F_WorkmanShip))
@@ -11239,7 +11357,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 返厂数量
         /// </summary>
-        public int? returnum { get; set; }
+        public decimal? returnum { get; set; }
         /// <summary>
         /// 规格
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -1013,6 +1013,9 @@ namespace CallCenterApi.Interface.Models.Input
         
         public int? inout { get; set; }
         public int? woflag { get; set; }
+        public string F_Material_CreateBy { get; set; }
+        public string F_Material_CreateTime { get; set; }
+       
 
         #region 多物料
         public List<T_Wo_MaterialItems> MaterialItems { get; set; }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_MaterialItems.cs

@@ -19,7 +19,7 @@ namespace CallCenterApi.Model
         private decimal? _f_loadingfee;
         private decimal? _f_unloadingfee;
         private decimal? _f_materialfee;
-        private int? _f_returnquantity = 0;
+        private decimal? _f_returnquantity = 0;
         private long _f_woid;
         private string _f_remark;
         private string _f_createby;
@@ -83,7 +83,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 实收返厂数量
         /// </summary>
-        public int? F_ReturnQuantity
+        public decimal? F_ReturnQuantity
         {
             set { _f_returnquantity = value; }
             get { return _f_returnquantity; }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -111,7 +111,7 @@ namespace CallCenterApi.Model
         private decimal? _f_unloadingfee;
         private decimal? _f_materialfee;
         private string _f_formula;
-        private int? _f_returnquantity;
+        private decimal? _f_returnquantity;
         private string _f_eventreason;
         private string _f_mailingnumber;
         private string _f_expressname;
@@ -127,6 +127,10 @@ namespace CallCenterApi.Model
         private string _f_workmanship;
         private string _f_manufacturers;
         private int? _f_productionnum;
+        private int? _f_cj_isqualified = 0;
+        private int? _f_test_isqualified = 0;
+        private string _f_material_createby;
+        private DateTime? _f_material_createtime;
         public string F_Annotation
         {
             set { _f_annotation = value; }
@@ -910,7 +914,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 实收返厂数量
         /// </summary>
-        public int? F_ReturnQuantity
+        public decimal? F_ReturnQuantity
         {
             set { _f_returnquantity = value; }
             get { return _f_returnquantity; }
@@ -1061,6 +1065,40 @@ namespace CallCenterApi.Model
         /// </summary>
         public int? F_Flag { get; set; }
 
+
+        /// <summary>
+		/// 
+		/// </summary>
+		public int? F_CJ_IsQualified
+        {
+            set { _f_cj_isqualified = value; }
+            get { return _f_cj_isqualified; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_Test_IsQualified
+        {
+            set { _f_test_isqualified = value; }
+            get { return _f_test_isqualified; }
+        }
+        /// <summary>
+        /// 退换货填写人
+        /// </summary>
+        public string F_Material_CreateBy
+        {
+            set { _f_material_createby = value; }
+            get { return _f_material_createby; }
+        }
+        /// <summary>
+        /// 退换货填写时间
+        /// </summary>
+        public DateTime? F_Material_CreateTime
+        {
+            set { _f_material_createtime = value; }
+            get { return _f_material_createtime; }
+        }
+
         #endregion Model
 
         #region 多物料