Browse Source

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

zhengbingbing 6 years ago
parent
commit
822c76e378

+ 7 - 0
codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_Department.cs

64
 
64
 
65
             return dal.GetModel(F_DeptId);
65
             return dal.GetModel(F_DeptId);
66
         }
66
         }
67
+        /// <summary>
68
+        /// 得到一个对象实体
69
+        /// </summary>
70
+        public Model.T_Sys_Department GetModel(string DeptName)
71
+        {
67
 
72
 
73
+            return dal.GetModel(DeptName);
74
+        }
68
         /// <summary>
75
         /// <summary>
69
         /// 获得数据列表
76
         /// 获得数据列表
70
         /// </summary>
77
         /// </summary>

+ 1 - 1
codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerBaseNew.cs

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

+ 23 - 0
codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_Department.cs

197
                 return false;
197
                 return false;
198
             }
198
             }
199
         }
199
         }
200
+        /// <summary>
201
+        /// 得到一个对象实体
202
+        /// </summary>
203
+        public Model.T_Sys_Department GetModel(string DeptName)
204
+        {
205
+
206
+            StringBuilder strSql = new StringBuilder();
207
+            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");
208
+            strSql.Append(" where F_DeptName=@F_DeptName");
209
+            SqlParameter[] parameters = {
210
+                    new SqlParameter("@F_DeptName", SqlDbType.VarChar,50)         };
211
+            parameters[0].Value = DeptName;
200
 
212
 
213
+            Model.T_Sys_Department model = new Model.T_Sys_Department();
214
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
215
+            if (ds.Tables[0].Rows.Count > 0)
216
+            {
217
+                return DataRowToModel(ds.Tables[0].Rows[0]);
218
+            }
219
+            else
220
+            {
221
+                return null;
222
+            }
223
+        }
201
 
224
 
202
         /// <summary>
225
         /// <summary>
203
         /// 得到一个对象实体
226
         /// 得到一个对象实体

+ 79 - 5
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

25
         BLL.T_Sys_Department deptbll = new BLL.T_Sys_Department();
25
         BLL.T_Sys_Department deptbll = new BLL.T_Sys_Department();
26
         BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
26
         BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
27
         BLL.T_Cus_CustomerFinance finbll = new BLL.T_Cus_CustomerFinance();
27
         BLL.T_Cus_CustomerFinance finbll = new BLL.T_Cus_CustomerFinance();
28
+        BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
28
         #region 客户管理
29
         #region 客户管理
29
         /// <summary>
30
         /// <summary>
30
         /// 获取客户列表
31
         /// 获取客户列表
46
         public ActionResult GetList(string code, string cmpname, string legname, string legtel,string province, string city, 
47
         public ActionResult GetList(string code, string cmpname, string legname, string legtel,string province, string city, 
47
             string country, string township, int areaid = 0, int branchid = 0,int pageindex = 1, int pagesize = 10)
48
             string country, string township, int areaid = 0, int branchid = 0,int pageindex = 1, int pagesize = 10)
48
         {
49
         {
49
-            string sql = $" and F_DeleteFlag=0";
50
+            string sql = $" and F_IsDelete=0";
50
             DataTable dt = new DataTable();
51
             DataTable dt = new DataTable();
51
             #region 筛选条件
52
             #region 筛选条件
52
             if (areaid > 0)//大区
53
             if (areaid > 0)//大区
110
             var list = new List<Model.T_Cus_CustomerBaseNew>();
111
             var list = new List<Model.T_Cus_CustomerBaseNew>();
111
             if (!string.IsNullOrWhiteSpace(sql))
112
             if (!string.IsNullOrWhiteSpace(sql))
112
             {
113
             {
113
-                sql += " and F_DeleteFlag=0";
114
+                sql += " and F_IsDelete=0";
114
                 list = cusbll.GetModelList(sql);
115
                 list = cusbll.GetModelList(sql);
115
             }
116
             }
116
             if (list.Count > 0)
117
             if (list.Count > 0)
151
             if (!string.IsNullOrWhiteSpace(tel))
152
             if (!string.IsNullOrWhiteSpace(tel))
152
             {
153
             {
153
                 var sql = $" and (F_SalesPhone like '%" + tel.Trim() + "%' or F_LegalPhone like '%" + tel.Trim() + "%')";
154
                 var sql = $" and (F_SalesPhone like '%" + tel.Trim() + "%' or F_LegalPhone like '%" + tel.Trim() + "%')";
154
-                var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_DeleteFlag = 0 " + sql);
155
+                var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
155
                 if (userModel.Count() > 0)
156
                 if (userModel.Count() > 0)
156
                 {
157
                 {
157
                     var model = userModel.Last();
158
                     var model = userModel.Last();
239
             if (!string.IsNullOrWhiteSpace(input.F_CompanyName))
240
             if (!string.IsNullOrWhiteSpace(input.F_CompanyName))
240
                 model.F_CompanyName = input.F_CompanyName;
241
                 model.F_CompanyName = input.F_CompanyName;
241
             #region 基本字段
242
             #region 基本字段
243
+          
244
+            model.F_AreaID = input.F_AreaID;//大区ID
245
+            model.F_BranchID = input.F_BranchID;//分公司ID
246
+            model.F_Salesman = input.F_Salesman;//业务员
247
+            model.F_SalesPhone = input.F_SalesPhone;//业务员电话
248
+            model.F_CustomerNature = input.F_CustomerNature;//客户性质
249
+            model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
250
+            model.F_Credit = input.F_Credit;//信用等级:一星、二星、三星、四星、五星、空
251
+            model.F_Legal = input.F_Legal;//法人 
252
+            model.F_LegalPhone = input.F_LegalPhone;//法人电话
253
+            model.F_AddressProvince = input.F_AddressProvince;//省
254
+            model.F_AddressCity = input.F_AddressCity;//市
255
+            model.F_AddressCountry = input.F_AddressCountry;//县
256
+            model.F_AddressTownship = input.F_AddressTownship;//乡
257
+            model.F_AddressFull = input.F_AddressFull;//详细地址
258
+            model.F_Brands = input.F_Brands;// 经营品牌:心连心、手拉手、沃利沃、双心、空
259
+            model.F_Product = input.F_Product;//产品:复合肥心连心、复合肥手拉手、复合肥沃利沃、复合肥双心、尿素心连心、尿素手拉手、尿素沃利沃、尿素双心
260
+            model.F_FrozenFlag = input.F_FrozenFlag;//冻结标志
261
+            model.F_IsOpenAccount = input.F_IsOpenAccount;//是否开户:已开户、未开户
262
+            model.F_LevelCode = input.F_LevelCode;//上级客户编码
263
+            model.F_LevelName = input.F_LevelName;//上级客户名称
264
+            model.F_MnemonicCode = input.F_MnemonicCode;//助记码
265
+            model.F_InvoiceBank = input.F_InvoiceBank;//开票银行名称
266
+            model.F_InvoiceBankAccount = input.F_InvoiceBankAccount;//开票银行账号
267
+            model.F_TaxRegCode = input.F_TaxRegCode;//纳税人登记号
268
+            model.F_IsRunXLX = input.F_IsRunXLX;// 是否经营心连心:是、否
269
+            model.F_AnnualSales = input.F_AnnualSales;//年销量
270
+            model.F_Formula = input.F_Formula;//配方
271
+            model.F_RaiseCrops = input.F_RaiseCrops;//种植作物
272
+            model.F_PlantingArea = input.F_PlantingArea;//种植面积
273
+            model.F_FertilizerBrand = input.F_FertilizerBrand;//用肥品牌
274
+            model.F_Remark = input.F_Remark;//备注
275
+            model.F_FileId = 0;
242
             #endregion
276
             #endregion
243
             return model;
277
             return model;
244
         }
278
         }
248
         /// </summary>
282
         /// </summary>
249
         private bool getunique(int id, string code)
283
         private bool getunique(int id, string code)
250
         {
284
         {
251
-            var sql = " F_DeleteFlag=0 ";
285
+            var sql = " F_IsDelete=0 ";
252
             sql += "and (F_CustomerCode='" + code + "')";
286
             sql += "and (F_CustomerCode='" + code + "')";
253
             if (id > 0)
287
             if (id > 0)
254
                 sql += " and F_CustomerId<>"+id;
288
                 sql += " and F_CustomerId<>"+id;
391
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
425
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
392
                             {
426
                             {
393
                                 dModel.F_CustomerCode = dr["客户编号"].ToString();
427
                                 dModel.F_CustomerCode = dr["客户编号"].ToString();
428
+                                dModel.F_CompanyName = dr["公司名称"].ToString();
394
                                 #region
429
                                 #region
430
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
431
+                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
432
+                                if (!string .IsNullOrEmpty(pdModel.F_DeptId.ToString()))
433
+                                {
434
+                                    dModel.F_AreaID = pdModel.F_DeptId.ToString();
435
+                                }
436
+                                if (!string.IsNullOrEmpty(pdModel1.F_DeptId.ToString()))
437
+                                {
438
+                                    dModel.F_BranchID = pdModel1.F_DeptId.ToString();
439
+                                }
440
+                                dModel.F_Salesman = dr["业务员"].ToString();
441
+                                dModel.F_SalesPhone = dr["业务员电话"].ToString();
442
+                                dModel.F_CustomerNature = dr["客户性质"].ToString();
443
+                                dModel.F_Channel = dr["渠道类型"].ToString();
444
+                                dModel.F_Credit = dr["信用等级"].ToString();
445
+                                dModel.F_Legal = dr["法人"].ToString();
446
+                                dModel.F_LegalPhone = dr["法人电话"].ToString();
447
+                                dModel.F_AddressProvince = dr["省"].ToString();
448
+                                dModel.F_AddressCity = dr["市"].ToString();
449
+                                dModel.F_AddressCountry = dr["县"].ToString();
450
+                                dModel.F_AddressTownship = dr["乡"].ToString();
451
+                                dModel.F_AddressFull = dr["详细地址"].ToString();
452
+                                dModel.F_Brands = dr["经营品牌"].ToString();
453
+                                dModel.F_Product = dr["产品"].ToString();
454
+                                dModel.F_FrozenFlag = dr["冻结标志"].ToString();
455
+                                dModel.F_IsOpenAccount = dr["是否开户"].ToString();
456
+                                dModel.F_LevelCode = dr["上级客户编码"].ToString();
457
+                                dModel.F_LevelName = dr["上级客户名称"].ToString();
458
+                                dModel.F_MnemonicCode = dr["助记码"].ToString();
459
+                                dModel.F_InvoiceBank = dr["开票银行名称"].ToString();
460
+                                dModel.F_InvoiceBankAccount = dr["开票银行账号"].ToString();
461
+                                dModel.F_TaxRegCode = dr["纳税人登记号"].ToString();
462
+                                dModel.F_IsRunXLX = dr["是否经营心连心"].ToString();
463
+                                dModel.F_AnnualSales = dr["年销量"].ToString();
464
+                                dModel.F_Formula = dr["配方"].ToString();
465
+                                dModel.F_RaiseCrops = dr["种植作物"].ToString();
466
+                                dModel.F_PlantingArea = dr["种植面积"].ToString();
467
+                                dModel.F_FertilizerBrand = dr["用肥品牌"].ToString();
468
+                                dModel.F_Remark = dr["备注"].ToString();
395
                                 #endregion
469
                                 #endregion
396
                                 dModel.F_CreateOn = DateTime.Now;
470
                                 dModel.F_CreateOn = DateTime.Now;
397
                                 var res = cusbll.Add(dModel);
471
                                 var res = cusbll.Add(dModel);
428
         {
502
         {
429
             var res = false;
503
             var res = false;
430
             //11位数字
504
             //11位数字
431
-            if (code.Length == 11 && Regex.IsMatch(code, @"^\d{10}$"))
505
+            if (code.Length == 10 && Regex.IsMatch(code, @"^\d{10}$"))
432
                 res = true;
506
                 res = true;
433
             return res;
507
             return res;
434
         }
508
         }