|
|
@@ -68,51 +68,51 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
|
|
|
}
|
|
|
- //仓库归属人真实姓名
|
|
|
- if (!string.IsNullOrEmpty(UserIdRealName))
|
|
|
- {
|
|
|
- DataTable dt = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + UserIdRealName + "%'");
|
|
|
- var Count = dt.Rows.Count;
|
|
|
- int times = 0;
|
|
|
- string UserIds = "";
|
|
|
- foreach (DataRow item in dt.Rows)
|
|
|
- {
|
|
|
- times++;
|
|
|
- if (times == Count)
|
|
|
- {
|
|
|
- UserIds += item["Id"].ToString();
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- UserIds += item["Id"].ToString() + ",";
|
|
|
- }
|
|
|
- }
|
|
|
- // condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
|
|
|
- condition += " and UserId in (" + UserIds + ")";
|
|
|
- }
|
|
|
- //仓库管理员真实姓名
|
|
|
-
|
|
|
- if (!string.IsNullOrEmpty(ManageUserIdRealName))
|
|
|
- {
|
|
|
- DataTable dts = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + ManageUserIdRealName + "%'");
|
|
|
- var Counts = dts.Rows.Count;
|
|
|
- int time = 1;
|
|
|
- string UserIdss = "";
|
|
|
- foreach (DataRow items in dts.Rows)
|
|
|
- {
|
|
|
- time++;
|
|
|
- if (time == Counts)
|
|
|
- {
|
|
|
- UserIdss += items["Id"].ToString();
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- UserIdss += items["Id"].ToString() + ",";
|
|
|
- }
|
|
|
- }
|
|
|
- // condition += " and ManageUserId in (select ManageUserId from UserForRealName where RealName='" + ManageUserIdRealName + "')";
|
|
|
- condition += " and UserId in (" + UserIdss + ")";
|
|
|
- }
|
|
|
+ // //仓库归属人真实姓名
|
|
|
+ // if (!string.IsNullOrEmpty(UserIdRealName))
|
|
|
+ // {
|
|
|
+ // DataTable dt = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + UserIdRealName + "%'");
|
|
|
+ // var Count = dt.Rows.Count;
|
|
|
+ // int times = 0;
|
|
|
+ // string UserIds = "";
|
|
|
+ // foreach (DataRow item in dt.Rows)
|
|
|
+ // {
|
|
|
+ // times++;
|
|
|
+ // if (times == Count)
|
|
|
+ // {
|
|
|
+ // UserIds += item["Id"].ToString();
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // UserIds += item["Id"].ToString() + ",";
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // // condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
|
|
|
+ // condition += " and UserId in (" + UserIds + ")";
|
|
|
+ // }
|
|
|
+ // //仓库管理员真实姓名
|
|
|
+
|
|
|
+ // if (!string.IsNullOrEmpty(ManageUserIdRealName))
|
|
|
+ // {
|
|
|
+ // DataTable dts = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + ManageUserIdRealName + "%'");
|
|
|
+ // var Counts = dts.Rows.Count;
|
|
|
+ // int time = 1;
|
|
|
+ // string UserIdss = "";
|
|
|
+ // foreach (DataRow items in dts.Rows)
|
|
|
+ // {
|
|
|
+ // time++;
|
|
|
+ // if (time == Counts)
|
|
|
+ // {
|
|
|
+ // UserIdss += items["Id"].ToString();
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // UserIdss += items["Id"].ToString() + ",";
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // // condition += " and ManageUserId in (select ManageUserId from UserForRealName where RealName='" + ManageUserIdRealName + "')";
|
|
|
+ // condition += " and UserId in (" + UserIdss + ")";
|
|
|
+ // }
|
|
|
//仓库管理员手机号
|
|
|
if (!string.IsNullOrEmpty(ManageUserIdMobile))
|
|
|
{
|