From 6585cda35b87eb1a3a05a948faf7dc5d08ef8ff7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 25 六月 2023 09:21:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsPub.cs | 140 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 137 insertions(+), 3 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs
index e560972..70be5da 100644
--- a/Pub_Class/CustomerCls/ClsPub.cs
+++ b/Pub_Class/CustomerCls/ClsPub.cs
@@ -458,6 +458,47 @@
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: //鏍规嵁 涔斾竴 锛圫 + 骞达紙23锛�+浜斾綅娴佹按鍙凤級瀹炰緥锛歋2300001
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='0' and whcode=''", "Gy_MaxNum");
+ sKjYear = sKjYear.Substring(2, 2);
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ Profix = Profix.Substring(0, 1);
+ sBillNo = Profix.Trim() + sKjYear + 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 + sStr + 1;
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='0' and whcode=''");
+ }
+ return sBillNo;
+ case 4: //鏍规嵁 涔斾竴 宸ュ簭娴佽浆鍗″彿鏀规垚骞�+鏈�+鍥涗綅娴佹按鍙凤紙23050001锛�
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='0' and whcode=''", "Gy_MaxNum");
+ sKjYear = sKjYear.Substring(2, 2);
+ sPeriod = "0" + sPeriod;
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ sBillNo = 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 + "','" + sDay + "',1)");
+ sBillNo = sKjYear + sPeriod + sStr + 1;
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='0' and whcode=''");
+ }
+ return sBillNo;
default:
return sBillNo;
@@ -889,7 +930,7 @@
if (LogTF == 1 || LogTF == 3)//闇�瑕佸垽鏂潈闄�
{
//鏍规嵁鐢ㄦ埛鍚嶇О鍒ゆ柇鏉冮檺
- DsUser = oCn.RunProcReturn("select * from gy_czygl where czymc='" + UserID.Trim() + "'", "gy_czygl");
+ DsUser = oCn.RunProcReturn("select ManagerFlag,isnull(AuthorityID,'') AuthorityID,Czybm from gy_czygl where czymc='" + UserID.Trim() + "'", "gy_czygl");
if (DsUser.Tables[0].Rows.Count == 0)
{
if (Msg == true)
@@ -905,7 +946,8 @@
}
else
{
- if (DsUser.Tables[0].Rows[0]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
+ if (ClsPub.isStrNull(DsUser.Tables[0].Rows[0]["AuthorityID"]).Length > ModID
+ && DsUser.Tables[0].Rows[0]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
{
HavRight = true;
}
@@ -914,7 +956,7 @@
//鑾峰彇鐢ㄦ埛缁� 骞跺惊鐜垽鏂潈闄�
//鍒ゆ柇瑙掕壊鏄惁鏈夋潈闄�
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");
+ " Where a.USERID='" + DsUser.Tables[0].Rows[0]["Czybm"].ToString().Trim() + "'", "gy_czygl");
if (DsJS == null)
{
HavRight = false;
@@ -2461,5 +2503,97 @@
}
return sb.ToString();
}
+
+ //鎷兼帴sql锛屾寜杞﹂棿锛屽伐浣滀腑蹇冩煡璇�
+ public static string SpliceSQL(string czymc,string ListName)
+ {
+ DataSet ds;
+ ClsSqlHelper oCN = new ClsSqlHelper();
+ string sql = "";
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈠垪琛ㄦ墍鏈変俊鎭潈闄�
+ if (!Security_Log("Xt_List_All", 1, false, czymc))
+ {
+ //鏃�
+ switch (ListName)
+ {
+ case "宸ヨ壓璺嚎鍒楄〃":
+ sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ break;
+ case "鐢熶骇璁㈠崟鍒楄〃":
+ sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ break;
+ case "宸ュ簭娲惧伐鍗曞垪琛�":
+ sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ break;
+ case "宸ュ簭娲惧伐鍗曟槑缁嗗垪琛�":
+ sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ break;
+ case "宸ュ簭姹囨姤鍗曞垪琛�":
+ sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ break;
+ case "鐢熶骇杞﹂棿宸ュ簭鎶ヨ〃":
+ sql = ",'" + czymc +"'";
+ break;
+ case "宸ュ簭鍦ㄥ埗鍝佹姤琛�":
+ sql = ",'" + czymc + "'";
+ break;
+ case "宸ュ簭姹囨姤鏃ユ姤琛�":
+ sql = ",'" + czymc + "'";
+ break;
+ case "璁′欢宸ヨ祫鎶ヨ〃":
+ sql = ",'" + czymc + "'";
+ break;
+ case "璁′欢宸ヨ祫姹囨�绘姤琛�":
+ sql = ",'" + czymc + "'";
+ break;
+ }
+ return sql;
+ }
+ else
+ {
+ //鏈�
+ return sql;
+ }
+
+ //ds = oCN.RunProcReturn("select * from gy_czygl where Czymc='" + czymc + "'", "gy_czygl");
+ ////鍒ゆ柇鏄惁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�
+ //if (ds != null || ds.Tables[0].Rows.Count != 0)
+ //{
+ // Int64 HManagerFlag = Convert.ToInt64(ds.Tables[0].Rows[0]["ManagerFlag"]);
+ // if (HManagerFlag == 1)//鏈夌鐞嗗憳鏉冮檺
+ // {
+ // return sql;
+ // }
+ // else //娌℃湁绠＄悊鍛樻潈闄�
+ // {
+ // switch (ListName)
+ // {
+ // case "宸ヨ壓璺嚎鍒楄〃":
+ // sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ // break;
+ // case "鐢熶骇璁㈠崟鍒楄〃":
+ // sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ // break;
+ // case "宸ュ簭娲惧伐鍗曞垪琛�":
+ // sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ // break;
+ // case "宸ュ簭娲惧伐鍗曟槑缁嗗垪琛�":
+ // sql = " and HDeptID in (select HDeptID from Gy_UserDeptRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ // break;
+ // case "宸ュ簭姹囨姤鍗曞垪琛�":
+ // sql = " and HCenterID in (select HWorkCenterID from Gy_UserWorkCenterRelation where HUserID = (select Czybm from gy_czygl where czymc = '" + czymc + "'))";
+ // break;
+ // }
+ // return sql;
+ // }
+ //}
+ //else
+ //{
+ // sql = "娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�";
+ // return sql;
+ //}
+ }
+
}
}
--
Gitblit v1.9.1