Explorar el Código

修改客户信息编号和公司名提醒bug

mengjie %!s(int64=5) %!d(string=hace) años
padre
commit
a54e2470df

+ 50 - 10
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

260
             #region 添加验证判断
260
             #region 添加验证判断
261
             if (string.IsNullOrEmpty(input.F_CustomerCode))
261
             if (string.IsNullOrEmpty(input.F_CustomerCode))
262
                 return Error("编号不能为空!");
262
                 return Error("编号不能为空!");
263
-            if (getunique(0, input.F_CustomerCode, input.F_CompanyName))
264
-                return Error("编号已被占用,请重新输入!");
263
+            int b = 0;
264
+            if (getunique(0, input.F_CustomerCode, input.F_CompanyName, out b))
265
+            {
266
+                if (b > 0)
267
+                {
268
+                    return Error("公司名称已被占用,请重新输入!");
269
+                }
270
+                else
271
+                {
272
+                    return Error("编号已被占用,请重新输入!");
273
+                }
274
+            }
265
             #endregion
275
             #endregion
266
             var model = new Model.T_Cus_CustomerBaseNew();
276
             var model = new Model.T_Cus_CustomerBaseNew();
267
             #region 保存客户基本信息
277
             #region 保存客户基本信息
324
             #region 添加验证判断
334
             #region 添加验证判断
325
             if (input.F_CustomerId <= 0)
335
             if (input.F_CustomerId <= 0)
326
                 return Error("参数错误!");
336
                 return Error("参数错误!");
327
-            if (getunique(input.F_CustomerId, input.F_CustomerCode, input.F_CompanyName))
328
-                return Error("编号已被占用,请重新输入!");
337
+            int b = 0;
338
+            if (getunique(0, input.F_CustomerCode, input.F_CompanyName, out b))
339
+            {
340
+                if (b > 0)
341
+                {
342
+                    return Error("公司名称已被占用,请重新输入!");
343
+                }
344
+                else
345
+                {
346
+                    return Error("编号已被占用,请重新输入!");
347
+                }
348
+            }
329
             #endregion
349
             #endregion
330
             var model = cusbll.GetModel(input.F_CustomerId);
350
             var model = cusbll.GetModel(input.F_CustomerId);
331
             #region 保存客户基本信息
351
             #region 保存客户基本信息
451
         /// <summary>
471
         /// <summary>
452
         /// 验证客户编号是否唯一
472
         /// 验证客户编号是否唯一
453
         /// </summary>
473
         /// </summary>
454
-        private bool getunique(int id, string code,string name)
474
+        private bool getunique(int id, string code,string name,out int b)//是否公司名称重复
455
         {
475
         {
456
             var sql = " F_DeleteFlag=0 ";
476
             var sql = " F_DeleteFlag=0 ";
457
-            sql += "and (F_CustomerCode='" + code + "' or F_CompanyName='"+ name + "')";
477
+            var sql1 = " F_DeleteFlag=0 ";
478
+            sql += "and (F_CustomerCode='" + code + "')";
479
+            sql1 += "and ( F_CompanyName='" + name + "')";
458
             if (id > 0)
480
             if (id > 0)
459
-                sql += " and F_CustomerId<>"+id;
481
+            {
482
+                sql += " and F_CustomerId<>" + id;
483
+                sql1 += " and F_CustomerId<>" + id;
484
+            }
460
             var count=cusbll.GetModelList(sql).Count();
485
             var count=cusbll.GetModelList(sql).Count();
461
-            
462
-            return count > 0;
486
+            var count1 = cusbll.GetModelList(sql1).Count();
487
+            if (count > 0)
488
+            {
489
+                b = 0;
490
+                return true;
491
+            }
492
+            else if (count1 > 0)
493
+            {
494
+                b = 1;
495
+                return true;
496
+            }
497
+            else
498
+            {
499
+                b = 0;
500
+                return count1 + count > 0;
501
+            }
463
         }
502
         }
464
         /// <summary>
503
         /// <summary>
465
         /// 删除客户
504
         /// 删除客户
867
                         cusmodel.F_CustomerCode = dataRow["编号"].ToString();
906
                         cusmodel.F_CustomerCode = dataRow["编号"].ToString();
868
                         cusmodel.F_CompanyName = dataRow["公司名称"].ToString();
907
                         cusmodel.F_CompanyName = dataRow["公司名称"].ToString();
869
                         //判断编号唯一
908
                         //判断编号唯一
870
-                        if (getunique(0, cusmodel.F_CustomerCode, cusmodel.F_CompanyName))
909
+                        int b = 0;
910
+                        if (getunique(0, cusmodel.F_CustomerCode, cusmodel.F_CompanyName,out b))
871
                             continue;
911
                             continue;
872
                         #region 处理关键字
912
                         #region 处理关键字
873
                         var keyword = cusmodel.F_CompanyName;
913
                         var keyword = cusmodel.F_CompanyName;