合并修改

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

@@ -44,8 +44,8 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <param name="conname">联系人姓名</param>
         /// <param name="contel">联系人电话</param>
         /// <returns></returns>
-        public ActionResult GetList(string code, string cmpname, string legname, string legtel,string province, string city, 
-            string country, string township, int areaid = 0, int branchid = 0,int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList(string code, string cmpname, string legname, string legtel, string province, string city,
+            string country, string township, int areaid = 0, int branchid = 0, int pageindex = 1, int pagesize = 10)
         {
             string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
@@ -116,10 +116,10 @@ namespace CallCenterApi.Interface.Controllers.customer
                 sql += " and F_IsDelete=0";
                 list = cusbll.GetModelList(sql);
             }
-            if (list.Count >0)
+            if (list.Count > 0)
             {
                 List<CustomerBaseNewInput> Input = modeltooip(list);
-                if (Input!=null )
+                if (Input != null)
                     return Success("根据关键字获取公司信息", Input.FirstOrDefault());
                 else
                     return Error("没有获取到相关公司，请重新搜索");
@@ -132,7 +132,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         ///根据客户编码获取客户信息
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetCodeCustomer(string  code)
+        public ActionResult GetCodeCustomer(string code)
         {
             var list = new List<Model.T_Cus_CustomerBaseNew>(); DataTable dt = new DataTable();
             string sql = "  F_IsDelete=0";
@@ -149,7 +149,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                     if (Input != null)
                         return Success("获取成功", Input.FirstOrDefault());
                     else
-                        return Success("没有获取到客户信息，请检查客户编号", null );
+                        return Success("没有获取到客户信息，请检查客户编号", null);
                 }
                 else
                 {
@@ -159,7 +159,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             else
             {
                 return Success("请输入客户编号", null);
-             
+
             }
         }
         /// <summary>
@@ -216,7 +216,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 return Error("参数传输失败");
             }
         }
-        private string  GetIntCode(int i )
+        private string GetIntCode(int i)
         {
             DateTime times = DateTime.Now.AddMinutes(i);
             string time = times.ToString("yyMMddhhmm");
@@ -231,17 +231,17 @@ namespace CallCenterApi.Interface.Controllers.customer
             var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
             if (userModel.Count() > 0)
             {
-            var model = cusbll.GetModel(userModel[0].F_CustomerId);
+                var model = cusbll.GetModel(userModel[0].F_CustomerId);
                 #region 保存客户基本信息
-           model = inputtoobj(model, input);
-            #endregion
-            bool n = cusbll.Update(model);
-            if (n)
-            {
-                return Success("保存成功！");
-            }
-            else
-                return Error("保存失败！");
+                model = inputtoobj(model, input);
+                #endregion
+                bool n = cusbll.Update(model);
+                if (n)
+                {
+                    return Success("保存成功！");
+                }
+                else
+                    return Error("保存失败！");
             }
             else
             {
@@ -305,8 +305,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                 {
                     if (!getunique(0, GetIntCode(i)))
                     {
-                        input.F_CustomerCode= GetIntCode(i);
-                        break ;
+                        input.F_CustomerCode = GetIntCode(i);
+                        break;
                     }
                     else
                     {
@@ -359,25 +359,25 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <summary>
         /// 根据model返回CustomerBaseNewInput对象
         /// </summary>
-        private List<CustomerBaseNewInput> modeltooip(List <Model.T_Cus_CustomerBaseNew> model)
+        private List<CustomerBaseNewInput> modeltooip(List<Model.T_Cus_CustomerBaseNew> model)
         {
-            if (model!=null &&model .Count >0)
+            if (model != null && model.Count > 0)
             {
                 List<CustomerBaseNewInput> Input = new List<CustomerBaseNewInput>(model.Count);
-                for (int i=0;i<model .Count;i++)
+                for (int i = 0; i < model.Count; i++)
                 {
                     CustomerBaseNewInput Input1 = new CustomerBaseNewInput();
                     #region 基本字段
                     Input1.F_CustomerId = model[i].F_CustomerId;//业务员
                     if (!string.IsNullOrWhiteSpace(model[i].F_CustomerCode))
                         Input1.F_CustomerCode = model[i].F_CustomerCode;
-                 
+
                     if (!string.IsNullOrWhiteSpace(model[i].F_CompanyName))
                         Input1.F_CompanyName = model[i].F_CompanyName;
                     Input1.F_AreaID = model[i].F_AreaID;//大区ID
                     Input1.F_BranchID = model[i].F_BranchID;//分公司ID
-                    if (!string .IsNullOrEmpty (model[i].F_AreaID))
-                   {
+                    if (!string.IsNullOrEmpty(model[i].F_AreaID))
+                    {
                         Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(model[i].F_AreaID));
                         if (pdModel != null)
                         {
@@ -392,9 +392,9 @@ namespace CallCenterApi.Interface.Controllers.customer
                             Input1.F_BranchName = pdModel1.F_DeptName.ToString();
                         }
                     }
-                    if (!string .IsNullOrEmpty (model[i].F_Gender) )
+                    if (!string.IsNullOrEmpty(model[i].F_Gender))
                     {
-                        if (model[i].F_Gender=="1")
+                        if (model[i].F_Gender == "1")
                         {
                             Input1.F_Gender = "男";
                         }
@@ -405,7 +405,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                     }
                     Input1.F_Salesman = model[i].F_Salesman;//业务员
                     Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
-                
+
                     Input1.F_Channel = model[i].F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
                     Input1.F_Credit = model[i].F_Credit;//信用等级:一星、二星、三星、四星、五星、空
                     Input1.F_Legal = model[i].F_Legal;//法人 
@@ -440,7 +440,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <summary>
         /// 根据传入的对象和input的内容返回对象
         /// </summary>
-        private Model.T_Cus_CustomerBaseNew inputtoobj(Model.T_Cus_CustomerBaseNew model,CustomerBaseNewInput input)
+        private Model.T_Cus_CustomerBaseNew inputtoobj(Model.T_Cus_CustomerBaseNew model, CustomerBaseNewInput input)
         {
             var newmodel = model;
             if (!string.IsNullOrWhiteSpace(input.F_CustomerCode))
@@ -452,7 +452,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             #region 基本字段
             model.F_AreaID = input.F_AreaID;//大区ID
             model.F_BranchID = input.F_BranchID;//分公司ID
-            model.F_Gender = input.F_Gender ;//分公司ID
+            model.F_Gender = input.F_Gender;//分公司ID
             model.F_Salesman = input.F_Salesman;//业务员
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话
             model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
@@ -486,9 +486,9 @@ namespace CallCenterApi.Interface.Controllers.customer
             var sql = " F_IsDelete=0 ";
             sql += "and (F_CustomerCode='" + code + "')";
             if (id > 0)
-                sql += " and F_CustomerId<>"+id;
-            var count=cusbll.GetModelList(sql).Count();
-            
+                sql += " and F_CustomerId<>" + id;
+            var count = cusbll.GetModelList(sql).Count();
+
             return count > 0;
         }
         /// <summary>
@@ -638,39 +638,14 @@ namespace CallCenterApi.Interface.Controllers.customer
 
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
                             {
-<<<<<<< .merge_file_a05968
-                               if (getunphone(0, dr["客户电话"].ToString()))
-                               {
-                                    if (!getunique(0, dr["客户编号"].ToString()))
-=======
-                                if (!getunique(0, dr["客户编号"].ToString()))
+
+                                if (getunphone(0, dr["客户电话"].ToString()))
                                 {
-                                    dModel.F_CustomerCode = dr["客户编号"].ToString();
-                                    dModel.F_CompanyName = dr["公司名称"].ToString();
-                                    #region
-                                    Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
-                                    if (pdModel != null)
-                                    {
-                                        dModel.F_AreaID = pdModel.F_DeptId.ToString();
-                                    }
-                                    Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
-                                    if (pdModel1 != null)
-                                    {
-                                        dModel.F_BranchID = pdModel1.F_DeptId.ToString();
-                                    }
 
-                                    dModel.F_Salesman = dr["业务员"].ToString();
-                                    dModel.F_SalesPhone = dr["业务员电话"].ToString();
-                                    dModel.F_CustomerNature = dr["客户性质"].ToString();
-                                    dModel.F_Channel = dr["渠道类型"].ToString();
-                                    dModel.F_Credit = dr["信用等级"].ToString();
-                                    dModel.F_Legal = dr["客户"].ToString();
-                                    if (!string.IsNullOrEmpty(dr["性别"].ToString()))
->>>>>>> .merge_file_a02452
+                                    if (!getunique(0, dr["客户编号"].ToString()))
                                     {
                                         dModel.F_CustomerCode = dr["客户编号"].ToString();
                                         dModel.F_CompanyName = dr["公司名称"].ToString();
-                                        #region
                                         Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
                                         if (pdModel != null)
                                         {
@@ -681,7 +656,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                         {
                                             dModel.F_BranchID = pdModel1.F_DeptId.ToString();
                                         }
-
+                                        #region
                                         dModel.F_Salesman = dr["业务员"].ToString();
                                         dModel.F_SalesPhone = dr["业务员电话"].ToString();
                                         dModel.F_Channel = dr["渠道类型"].ToString();
@@ -698,7 +673,6 @@ namespace CallCenterApi.Interface.Controllers.customer
                                                 dModel.F_Gender = "1";
                                             }
                                         }
-
                                         dModel.F_LegalPhone = dr["客户电话"].ToString();
                                         dModel.F_AddressProvince = dr["省"].ToString();
                                         dModel.F_AddressCity = dr["市"].ToString();
@@ -723,58 +697,22 @@ namespace CallCenterApi.Interface.Controllers.customer
                                         }
                                         else
                                         {
-
                                             msg = msg + "第" + headrow + "行，导入失败<br>";
                                         }
                                     }
-<<<<<<< .merge_file_a05968
+
                                     else
                                     {
                                         msg = msg + "第" + headrow + "行，客户编号重复，未导入<br>";
-=======
-
-                                    dModel.F_LegalPhone = dr["客户电话"].ToString();
-                                    dModel.F_AddressProvince = dr["省"].ToString();
-                                    dModel.F_AddressCity = dr["市"].ToString();
-                                    dModel.F_AddressCountry = dr["县"].ToString();
-                                    dModel.F_AddressTownship = dr["乡"].ToString();
-                                    dModel.F_AddressFull = dr["详细地址"].ToString();
-                                    dModel.F_Brands = dr["经营品牌"].ToString();
-                                    dModel.F_Product = dr["产品"].ToString();
-                                    dModel.F_FrozenFlag = dr["冻结标志"].ToString();
-                                    dModel.F_IsOpenAccount = dr["是否开户"].ToString();
-                                    dModel.F_LevelCode = dr["上级客户编码"].ToString();
-                                    dModel.F_LevelName = dr["上级客户名称"].ToString();
-                                    dModel.F_MnemonicCode = dr["助记码"].ToString();
-                                    dModel.F_InvoiceBank = dr["开票银行名称"].ToString();
-                                    dModel.F_InvoiceBankAccount = dr["开票银行账号"].ToString();
-                                    dModel.F_TaxRegCode = dr["纳税人登记号"].ToString();
-                                    dModel.F_IsRunXLX = dr["是否经营心连心"].ToString();
-                                    dModel.F_AnnualSales = dr["年销量"].ToString();
-                                    dModel.F_Formula = dr["配方"].ToString();
-                                    dModel.F_RaiseCrops = dr["种植作物"].ToString();
-                                    dModel.F_PlantingArea = dr["种植面积"].ToString();
-                                    dModel.F_FertilizerBrand = dr["用肥品牌"].ToString();
-                                    dModel.F_Remark = dr["备注"].ToString();
-                                    #endregion
-                                    dModel.F_CreateOn = DateTime.Now;
-                                    var res = cusbll.Add(dModel);
-                                    if (res > 0)
-                                    {
-                                        addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
                                     }
-                                    else
-                                    {
 
-                                        msg = msg + "第" + headrow + "行，导入失败<br>";
->>>>>>> .merge_file_a02452
-                                    }
+
                                 }
                                 else
                                 {
                                     msg = msg + "第" + headrow + "行，客户电话重复，未导入<br>";
                                 }
-                                
+
                             }
                             else
                                 msg = msg + "第" + headrow + "行，客户编号为空或格式不正确，未导入<br>";
@@ -817,4 +755,4 @@ namespace CallCenterApi.Interface.Controllers.customer
         }
         #endregion
     }
-}
+}

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

@@ -164,13 +164,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (type == (int)EnumWOType.SpotCheck)//抽检
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
             int recordCount = 0;
-<<<<<<< .merge_file_a04624
-            if (QuestionName==""&& type == (int)EnumWOType.Complaint)
-                {
-=======
+
+         
             if (QuestionName == "" && type == (int)EnumWOType.Complaint)
             {
->>>>>>> .merge_file_a19284
+
                 dt = BLL.PagerBLL.GetListPager(
                        "T_Wo_QuestionManage",
                        "F_ID",
@@ -195,11 +193,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                       true,
                       out recordCount);
             }
-<<<<<<< .merge_file_a04624
-        
-=======
 
->>>>>>> .merge_file_a19284
             List<Model.TreeModel> modelList = BindTree(dt, "0");
             if (modelList != null)
             {

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

@@ -4178,38 +4178,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 long n = workOrder.Add(model);
                 if (n > 0)
                 {
-<<<<<<< .merge_file_a17512
+
                     Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
                     WorkOrderNewInput inputs = new WorkOrderNewInput();
                         if (clbm == 0 && clid == 0)
                         {
                             return Error("请选择接收部门");
                         }
-                        else
-=======
-                    DataTable dt = new DataTable();
-                    dt = new BLL.T_Wo_WorkOrder().GetList(1, "", "F_ID desc").Tables[0];
-                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
-                    WorkOrderNewInput inputs = new WorkOrderNewInput();
-                    //if (clbm == 0 && clid == 0)
-                    //{
-                    //    return Error("请选择接收人");
-                    //}
-                    //else
-                    //{
-                    if (clbm == 0)
-                        return Error("请选择指派部门");
                     var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
-                    if (deptmodel != null)
-                    {
-                        if (modlelist != null && modlelist.Count > 0)
->>>>>>> .merge_file_a11592
+                            if (deptmodel != null)
+                              {
+                               if (modlelist != null)
+
                         {
-                            if (modlelist[0].F_Type == "2")
-                            {
-<<<<<<< .merge_file_a17512
-                                if (modlelist != null)
-                                {
                                     if (modlelist.F_Type == "2")
                                     {
                                         if (deptmodel.F_DeptId == 37)
@@ -4254,56 +4235,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                     inputs.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//销售内勤-确认返账金额
                                     }
-                                    else if (deptmodel.F_DeptId == 36)
-                                    {
-=======
-                                if (deptmodel.F_DeptId == 37)
-                                {
-                                    inputs.F_SC_PreliminaryOpinion = deptment.PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
-                                }
-                                else if (deptmodel.F_DeptId == 12)
-                                {
-                                    inputs.F_IsVisit = isvisit;
-                                    inputs.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
-                                    inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
-                                    inputs.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
-                                    inputs.F_ZL_ApprovalOpinions = deptment.ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
-                                    inputs.F_ZL_ApprovalDisagree = deptment.ApprovalDisagree;// 质量管理科-审批不同意意见
-                                    inputs.F_ZL_CompensationMethod = deptment.CompensationMethod;// 质量管理科-补偿方式（实物、钱款【单位元】，若选择钱款，增加输入框输入补充内容）
-                                    inputs.F_ZL_CompensationMoney = deptment.CompensationMoney;// 质量管理科-补偿钱款
-                                    inputs.F_ZL_CResponsibleUnits = deptment.CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
->>>>>>> .merge_file_a11592
-                                    inputs.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量（吨）
-                                    inputs.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;//  质量管理科-改进要求
-                                    inputs.F_ZL_CApprovalNo = deptment.CApprovalNo;// 质量管理科-对应审批工作流单号
-
-                                }
-                            }
-                            else if (modlelist[0].F_Type == "3")
-                            {
-                                if (deptmodel.F_DeptId == 37)
-                                {
-                                    inputs.F_SC_CJ_SpotResult = deptment.SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
-                                    inputs.F_SC_CJ_SelfResult = deptment.SelfResult;//市场管理科-抽检-自检结果
-                                    inputs.F_SC_CJ_ApprovalNo = deptment.ApprovalNo;//市场管理科-抽检-对应审批工作流单号
-                                    inputs.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
-                                }
-                                else if (deptmodel.F_DeptId == 12)
-                                {
-                                    inputs.F_IsVisit = isvisit;
-                                    inputs.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
-                                    inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
-                                }
-                            }
-                            if (deptmodel.F_DeptId == 25)
-                            {
-
-                                inputs.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//销售内勤-确认返账金额
-                            }
-                            else if (deptmodel.F_DeptId == 36)
-                            {
-                                inputs.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量（吨）
-                            }
+                                   else if (deptmodel.F_DeptId == 36)
+                                   {
+                                     inputs.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量（吨）
+                                   }
                         }
                         else
                             return Error("工单不存在！");
@@ -4312,22 +4247,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         return Error("请选择接收部门");
                     }
-                    //}
-
-<<<<<<< .merge_file_a17512
+  
                         if (modlelist != null)
                         {
-=======
-                    if (modlelist[0] != null && modlelist.Count > 0)
-                    {
->>>>>>> .merge_file_a11592
+
                         string deptname = "";
                         //var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel != null)
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-<<<<<<< .merge_file_a17512
+
                         AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                         var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
                             if (res)
@@ -4337,20 +4267,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else
                             return Error("工单不存在！");
-=======
-                        AddLog(modlelist[0].F_ID, modlelist[0].F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
-                        var res = AssignWO(ua, modlelist[0], inputs, cont, clbm, clid, overtime, sms);
-                        if (res)
-                            return Success("转派成功");
-                        else
-                            return Error("转派失败！");
-                    }
-                    else
-                        return Error("工单不存在！");
-
-
 
->>>>>>> .merge_file_a11592
                 }
                 else
                     return Error("添加失败！");