From b27cc0c7af4cb9f5b404c95f90c63be22668d0a6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 08 十月 2022 08:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/Sc_ProcessExchangeBillList.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
index b1514a5..f57b907 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
@@ -27,6 +27,7 @@
public const string ModRightNameDelete = ModRightName + "_Delete";
public const string ModRightNameMoney = ModRightName + "_Money";
public const string ModRightNameQty = ModRightName + "_Qty";
+ public const string ModRightNameCF = ModRightName + "_CF";
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
public Sc_ProcessExchangeBill oFrm;
public string sDlgWhere = ""; //澶栫獥浣撻�掑叆
@@ -53,11 +54,11 @@
//杩囨护鏉′欢
if (frmCondition.SqlStr.Trim().Length == 0)
{
- sSql = "Select * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
+ sSql = "Select * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by 鍗曟嵁鍙� desc,hsubid ";
}
else
{
- sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
+ sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by 鍗曟嵁鍙� desc,hsubid ";
}
//
@@ -858,6 +859,7 @@
// MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
// return;
//}
+ sFastSQL = sFastSQL + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + "";
sDlgWhere = sFastSQL;
Display();
sDlgWhere = "";
@@ -865,6 +867,12 @@
private void cf_Click(object sender, EventArgs e)
{
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCF, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+
Int64 lngBillKey = 0;
if (grdMain.CurrentRow == null)
return;
--
Gitblit v1.9.1