合并

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

             if (!string.IsNullOrWhiteSpace(code))//客户编号
             {
                 if (valcode(code))
+                {
                     sql += " and F_CustomerCode='" + code.Trim() + "'";
-                list = cusbll.GetModelList(sql);
+                    list = cusbll.GetModelList(sql);
+                }
                 if (list.Count > 0)
                 {
                     List<CustomerBaseNewInput> Input = modeltooip(list);
                         {
                             #region 数据入库
                             headrow = headrow + 1;
-                            
+
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
                             {
+<<<<<<< .merge_file_a05968
                                if (getunphone(0, dr["客户电话"].ToString()))
                                {
                                     if (!getunique(0, dr["客户编号"].ToString()))
+=======
+                                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)
+                                    {
+                                        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
                                     {
                                         dModel.F_CustomerCode = dr["客户编号"].ToString();
                                         dModel.F_CompanyName = dr["公司名称"].ToString();
                                             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
                             #endregion
                         }
                         if (string.IsNullOrEmpty(msg))
-                            return Success("导入成功 " );
+                            return Success("导入成功 ");
                         else
                             return Error(msg);
                     }

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

             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",
                       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

         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string code, string cusname, string cusphone,string keywords, string companyname, string province, string city,
+        public ActionResult GetList(string code, string cusname, string cusphone, string starttime, string endtime, string keywords, string companyname, string province, string city,
             string country, string township, string touser, int source=0,int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
         {
            
                     sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
+                if (starttime.Trim() != "" && starttime != "undefined")
+                    sql += " and datediff(day,F_CreateOn,'" + starttime + "')<=0 ";
+                if (endtime.Trim() != "" && endtime != "undefined")
+                    sql += " and datediff(day,F_CreateOn,'" + endtime + "')>=0   ";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and ( F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
         /// 创建工单时指派
         /// </summary>
         /// <returns></returns>
-          public ActionResult Createass(WorkOrderNewInput input, string cont, WorkOrdeDeptment deptment, int isvisit = 1,
-            int  overtime = 0, int sms = 0, int clbm = 0, int clid = 0)
+        public ActionResult Createass(WorkOrderNewInput input, string cont, WorkOrdeDeptment deptment, int isvisit = 1,
+          int overtime = 0, int sms = 0, int clbm = 0, int clid = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
                 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
                         {
-                        var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
-                        if (deptmodel != null)
+                            if (modlelist[0].F_Type == "2")
                             {
+<<<<<<< .merge_file_a17512
                                 if (modlelist != null)
                                 {
                                     if (modlelist.F_Type == "2")
                                     }
                                     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
-                                    return Error("工单不存在！");
                             }
-                            else
+                            else if (modlelist[0].F_Type == "3")
                             {
-                                return Error("请选择接收部门");
+                                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
+                            return Error("工单不存在！");
+                    }
+                    else
+                    {
+                        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);
+                        //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)
                         }
                         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("添加失败！");
                 return Error("无操作权限！");
             }
         }
+
         public ActionResult CreatOver(WorkOrderNewInput input )
         {
             int userId = CurrentUser.UserData.F_UserId;