~yxj/MES-WEB-API.git

			@@ -399,7 +399,7 @@
			case 0:
			switch (Glida)
			{
			case 0:
			case 0://纯流水号
			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "'", "Gy_MaxNum");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			@@ -418,11 +418,30 @@
			}
			return sBillNo;

			case 1:
			case 1://根据 YY年+MM月日 + 流水号生成单据号（日采用了仓库的字段）
			sKjYear = sKjYear.Substring(2, 2);
			sPeriod = "0" + sPeriod;
			sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
			sDay = "";
			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
			sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
			}
			else //插入新记录
			{
			sStr = new string(c, CodeLen - 1);
			oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
			sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + "1";
			}
			if (Add == true)
			{
			oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
			}
			return sBillNo;

			case 2: //当前年当前期间生成单据号
			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear=" + sKjYear + " and Period=" + sPeriod + " and Day=" + sDay, "Gy_MaxNum");
			case 2: //根据年+月+日生成单据号
			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
			@@ -431,12 +450,144 @@
			else //插入新记录
			{
			sStr = new string(c, CodeLen - 1);
			oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,Day,NowNumber) values('" + BillCode.Trim() + "'," + sKjYear + "," + sPeriod + "," + sDay + ",1)");
			oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
			sBillNo = Profix.Trim() + sKjYear + ClsPub.isStrNull(("0" + sPeriod)).Substring(ClsPub.isStrNull(("0" + sPeriod)).Length - 2, 2) + ClsPub.isStrNull(("0" + sDay)).Substring(ClsPub.isStrNull(("0" + sDay)).Length - 2, 2) + sStr + 1;
			}
			if (Add == true)
			{
			oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear=" + sKjYear + " and Period=" + sPeriod + " and Day=" + sDay);
			oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
			}
			return sBillNo;
			default:
			return sBillNo;

			}

			case 1:
			return sBillNo;

			default:
			return sBillNo;

			}
			oCn.CnClose();
			oCn.CnDispose();
			oCn = null;
			}

			//得到最大单据号
			public static string CreateBillCode(string BillCode,string HOrgNumber,Int64 HOrgID,string HWhNumber, ref string sReturn, bool Add)
			{
			Int64 BillCodeMode;
			string Profix;
			Int64 Glida;
			Int32 CodeLen;
			string sBillNo = "";
			char c = Convert.ToChar("0");
			string sKjYear = DateTime.Today.Year.ToString();
			string sPeriod = DateTime.Today.Month.ToString();
			string sDay = DateTime.Today.Day.ToString();
			//得到单据号表信息
			ClsSqlHelper oCn = new ClsSqlHelper();
			DataSet Ds = new DataSet();
			Ds = oCn.RunProcReturn("Select * from Gy_BillNumber where BillCode='" + BillCode.Trim() + "'", "Gy_BillNumber");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			BillCodeMode = ClsPub.isLong(Ds.Tables[0].Rows[0]["BillCodeMode"].ToString());
			Profix = ClsPub.isStrNull(Ds.Tables[0].Rows[0]["Profix"].ToString());
			Glida = ClsPub.isLong(Ds.Tables[0].Rows[0]["Glida"].ToString());
			CodeLen = ClsPub.isInt(Ds.Tables[0].Rows[0]["CodeLen"].ToString());
			}
			else
			{
			return "";
			}
			//
			string sStr;
			switch (BillCodeMode)
			{
			case 0:
			switch (Glida)
			{
			case 0://纯流水号
			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "'", "Gy_MaxNum");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
			sBillNo = Profix.Trim() + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
			}
			else //插入新记录
			{
			sStr = new string(c, CodeLen - 1);
			oCn.RunProc("insert into Gy_MaxNum(BillCode,NowNumber) values('" + BillCode.Trim() + "',1)");
			sBillNo = Profix.Trim() + sStr + 1;
			}
			if (Add == true)
			{
			oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "'");
			}
			return sBillNo;

			case 1://根据 YY年+MM月日 + 流水号生成单据号（日采用了仓库的字段）
			sKjYear = sKjYear.Substring(2, 2);
			sPeriod = "0" + sPeriod;
			sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
			sDay = "";
			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
			sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
			}
			else //插入新记录
			{
			sStr = new string(c, CodeLen - 1);
			oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
			sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + "1";
			}
			if (Add == true)
			{
			oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
			}
			return sBillNo;
			case 2: //根据年+月+日生成单据号 (这功能好像是作废了）
			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
			sBillNo = Profix.Trim() + sKjYear + ClsPub.isStrNull(("0" + sPeriod)).Substring(ClsPub.isStrNull(("0" + sPeriod)).Length - 2, 2) + ClsPub.isStrNull(("0" + sDay)).Substring(ClsPub.isStrNull(("0" + sDay)).Length - 2, 2) + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
			}
			else //插入新记录
			{
			sStr = new string(c, CodeLen - 1);
			oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
			sBillNo = Profix.Trim() + sKjYear + ClsPub.isStrNull(("0" + sPeriod)).Substring(ClsPub.isStrNull(("0" + sPeriod)).Length - 2, 2) + ClsPub.isStrNull(("0" + sDay)).Substring(ClsPub.isStrNull(("0" + sDay)).Length - 2, 2) + sStr + 1;
			}
			if (Add == true)
			{
			oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
			}
			return sBillNo;
			case 3://根据前缀+组织+ YY年+MM月 + 流水号生成单据号（组织采用了仓库的字段）
			sKjYear = sKjYear.Substring(2, 2);
			sPeriod = "0" + sPeriod;
			sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);

			Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + HOrgNumber + "'", "Gy_MaxNum");
			if (Ds.Tables[0].Rows.Count != 0)
			{
			sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
			sBillNo = Profix.Trim() + HOrgNumber + sKjYear + sPeriod + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
			}
			else //插入新记录
			{
			sStr = new string(c, CodeLen - 1);
			oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + HOrgNumber + "',1)");
			sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + "1";
			}
			if (Add == true)
			{
			oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + HOrgNumber + "'");
			}
			return sBillNo;
			default:
			@@ -557,8 +708,6 @@
			return "ERROR";
			}
			}



			//得到最大HINTERID 存储过程
			public static Int64 CreateBillID_Prod(string BillCode, ref string sReturn)
			@@ -809,6 +958,116 @@
			if (Msg == true)
			{
			MessageBox.Show("判断权限时发现错误,请与管理员联系！", "提示");
			}
			return false;
			}
			}

			public static bool Security_Log_second(string gnsy, int LogTF, bool Msg, string CurUserName)
			{
			//gnsy 功能索引,模块
			//usercode 当前用户代码
			//LogTF 1判断权限并写日志，2只写日志，3只判断权限
			//Msg 没有权限时是否提示框
			string UserID = CurUserName;
			try
			{
			ClsSqlHelper oCn = new ClsSqlHelper();
			DataSet Ds = new DataSet();
			DataSet DsUser = new DataSet();
			DataSet DsJS = new DataSet();//角色
			long ModID = 0;
			bool HavRight = false;
			//找到模块权限
			Ds = oCn.RunProcReturn("select * from xt_xtgnb where gnsy='" + gnsy.Trim() + "'", "xt_xtgnb");
			if (Ds.Tables[0].Rows.Count == 0)
			{
			if (Msg == true)
			{
			return false;
			//MessageBox.Show("没有找到该功能模块！", "提示");
			}
			return false;
			}
			else
			{
			ModID = ClsPub.isLong(Ds.Tables[0].Rows[0]["ID"].ToString()); //返回模块
			}
			if (LogTF == 1 \|\| LogTF == 3)//需要判断权限
			{
			//根据用户名称判断权限
			DsUser = oCn.RunProcReturn("select * from gy_czygl where czymc='" + UserID.Trim() + "'", "gy_czygl");
			if (DsUser.Tables[0].Rows.Count == 0)
			{
			if (Msg == true)
			{
			return false;
			//MessageBox.Show("没有找到当前操作员！", "提示");
			}
			return false;
			}
			//根据用户名称判断权限
			if ((bool)DsUser.Tables[0].Rows[0]["ManagerFlag"]) //是否管理员
			{
			HavRight = true;
			}
			else
			{
			if (DsUser.Tables[0].Rows[0]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
			{
			HavRight = true;
			}
			else
			{
			//获取用户组并循环判断权限
			//判断角色是否有权限
			DsJS = oCn.RunProcReturn("select isnull(AuthorityID,'') AuthorityID from System_UserGroupinfo a inner join System_UserGroup b on a.GroupID=b.GroupID " +
			" Where a.USERID='" + UserID.Trim() + "'", "gy_czygl");
			if (DsJS == null)
			{
			HavRight = false;
			}
			else
			{
			HavRight = false;
			for (int i = 0; i < DsJS.Tables[0].Rows.Count; i++)
			{
			if (ClsPub.isStrNull(DsJS.Tables[0].Rows[i]["AuthorityID"]).Length > ModID)
			{
			if (DsJS.Tables[0].Rows[i]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
			{
			HavRight = true;
			break;
			}
			}
			}

			}
			}
			}

			if (HavRight == false)
			{
			if (Msg == true)
			{
			return false;
			//MessageBox.Show("您没有权限,请与管理员联系！", "提示");
			}
			}
			}
			//需要写入日志
			if ((LogTF == 1 && HavRight) \|\| LogTF == 2)
			{
			Add_Log(Ds.Tables[0].Rows[0]["id"].ToString().Trim(), gnsy + "," + Ds.Tables[0].Rows[0]["gnmc"].ToString().Trim(), CurUserName);
			}
			return HavRight;
			}
			catch (Exception e)
			{
			if (Msg == true)
			{
			return false;
			//MessageBox.Show("判断权限时发现错误,请与管理员联系！", "提示");
			}
			return false;
			}
			@@ -1221,6 +1480,10 @@
			{
			try
			{
			if (oGrd.RowCount <= 1)
			{
			return;
			}
			int Cols;
			char c = Convert.ToChar(",");
			string sStr = ClsIni.ReadIni("GridSave", KeyItem, AppPath + @"\" + "grdWidth.wyini");