Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/XinXiangXLX_API

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_Department.cs

 
             return dal.GetModel(F_DeptId);
         }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_Department GetModel(string DeptName)
+        {
 
+            return dal.GetModel(DeptName);
+        }
         /// <summary>
         /// 获得数据列表
         /// </summary>

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerBaseNew.cs

         {
             StringBuilder strSql = new StringBuilder();
             //strSql.Append("delete from T_Cus_CustomerBaseNew ");
-            strSql.Append("update T_Cus_CustomerBaseNew set F_DeleteFlag=1 ");
+            strSql.Append("update T_Cus_CustomerBaseNew set F_IsDelete=1 ");
             strSql.Append(" where F_CustomerId in (" + F_CustomerIdlist + ")  ");
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
             if (rows > 0)

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_Department.cs

                 return false;
             }
         }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_Department GetModel(string DeptName)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select TOP 1 F_DeptId,F_DeptCode,(SELECT B.F_DeptName FROM T_Sys_Department B WHERE B.F_DeptId=A.F_ParentId) AS F_ParentName,F_ParentId,F_ParentCode,F_DeptName,F_State,F_Layer,F_Type,F_Sort,F_Remark,F_Telephone,F_Mobile,F_OtherPhone,F_Email,F_Header from T_Sys_Department  A");
+            strSql.Append(" where F_DeptName=@F_DeptName");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_DeptName", SqlDbType.VarChar,50)         };
+            parameters[0].Value = DeptName;
 
+            Model.T_Sys_Department model = new Model.T_Sys_Department();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
 
         /// <summary>
         /// 得到一个对象实体

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

         BLL.T_Sys_Department deptbll = new BLL.T_Sys_Department();
         BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
         BLL.T_Cus_CustomerFinance finbll = new BLL.T_Cus_CustomerFinance();
+        BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
         #region 客户管理
         /// <summary>
         /// 获取客户列表
         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_DeleteFlag=0";
+            string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
             #region 筛选条件
             if (areaid > 0)//大区
             var list = new List<Model.T_Cus_CustomerBaseNew>();
             if (!string.IsNullOrWhiteSpace(sql))
             {
-                sql += " and F_DeleteFlag=0";
+                sql += " and F_IsDelete=0";
                 list = cusbll.GetModelList(sql);
             }
             if (list.Count > 0)
             if (!string.IsNullOrWhiteSpace(tel))
             {
                 var sql = $" and (F_SalesPhone like '%" + tel.Trim() + "%' or F_LegalPhone like '%" + tel.Trim() + "%')";
-                var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_DeleteFlag = 0 " + sql);
+                var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
                 if (userModel.Count() > 0)
                 {
                     var model = userModel.Last();
             if (!string.IsNullOrWhiteSpace(input.F_CompanyName))
                 model.F_CompanyName = input.F_CompanyName;
             #region 基本字段
+          
+            model.F_AreaID = input.F_AreaID;//大区ID
+            model.F_BranchID = input.F_BranchID;//分公司ID
+            model.F_Salesman = input.F_Salesman;//业务员
+            model.F_SalesPhone = input.F_SalesPhone;//业务员电话
+            model.F_CustomerNature = input.F_CustomerNature;//客户性质
+            model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
+            model.F_Credit = input.F_Credit;//信用等级:一星、二星、三星、四星、五星、空
+            model.F_Legal = input.F_Legal;//法人 
+            model.F_LegalPhone = input.F_LegalPhone;//法人电话
+            model.F_AddressProvince = input.F_AddressProvince;//省
+            model.F_AddressCity = input.F_AddressCity;//市
+            model.F_AddressCountry = input.F_AddressCountry;//县
+            model.F_AddressTownship = input.F_AddressTownship;//乡
+            model.F_AddressFull = input.F_AddressFull;//详细地址
+            model.F_Brands = input.F_Brands;// 经营品牌:心连心、手拉手、沃利沃、双心、空
+            model.F_Product = input.F_Product;//产品:复合肥心连心、复合肥手拉手、复合肥沃利沃、复合肥双心、尿素心连心、尿素手拉手、尿素沃利沃、尿素双心
+            model.F_FrozenFlag = input.F_FrozenFlag;//冻结标志
+            model.F_IsOpenAccount = input.F_IsOpenAccount;//是否开户:已开户、未开户
+            model.F_LevelCode = input.F_LevelCode;//上级客户编码
+            model.F_LevelName = input.F_LevelName;//上级客户名称
+            model.F_MnemonicCode = input.F_MnemonicCode;//助记码
+            model.F_InvoiceBank = input.F_InvoiceBank;//开票银行名称
+            model.F_InvoiceBankAccount = input.F_InvoiceBankAccount;//开票银行账号
+            model.F_TaxRegCode = input.F_TaxRegCode;//纳税人登记号
+            model.F_IsRunXLX = input.F_IsRunXLX;// 是否经营心连心:是、否
+            model.F_AnnualSales = input.F_AnnualSales;//年销量
+            model.F_Formula = input.F_Formula;//配方
+            model.F_RaiseCrops = input.F_RaiseCrops;//种植作物
+            model.F_PlantingArea = input.F_PlantingArea;//种植面积
+            model.F_FertilizerBrand = input.F_FertilizerBrand;//用肥品牌
+            model.F_Remark = input.F_Remark;//备注
+            model.F_FileId = 0;
             #endregion
             return model;
         }
         /// </summary>
         private bool getunique(int id, string code)
         {
-            var sql = " F_DeleteFlag=0 ";
+            var sql = " F_IsDelete=0 ";
             sql += "and (F_CustomerCode='" + code + "')";
             if (id > 0)
                 sql += " and F_CustomerId<>"+id;
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
                             {
                                 dModel.F_CustomerCode = dr["客户编号"].ToString();
+                                dModel.F_CompanyName = dr["公司名称"].ToString();
                                 #region
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
+                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
+                                if (!string .IsNullOrEmpty(pdModel.F_DeptId.ToString()))
+                                {
+                                    dModel.F_AreaID = pdModel.F_DeptId.ToString();
+                                }
+                                if (!string.IsNullOrEmpty(pdModel1.F_DeptId.ToString()))
+                                {
+                                    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();
+                                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);
         {
             var res = false;
             //11位数字
-            if (code.Length == 11 && Regex.IsMatch(code, @"^\d{10}$"))
+            if (code.Length == 10 && Regex.IsMatch(code, @"^\d{10}$"))
                 res = true;
             return res;
         }