From a905b3df0d0c9ae045b51d1299fbb2f2dcbc2e2d Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 21 二月 2022 10:14:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/Sc_ProcessExchangeBillQuery.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
index c963755..e8d7492 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
@@ -56,11 +56,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 ";
}
//
DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -605,17 +605,22 @@
Report.FieldByName("娴佽浆鍗℃暟閲�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("娴佽浆鍗℃暟閲�")].Value);
Report.FieldByName("浜у搧浠ｇ爜").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧浠ｇ爜")].Value);
Report.FieldByName("浜у搧鍚嶇О").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧鍚嶇О")].Value);
- Report.FieldByName("浜у搧瑙勬牸").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+ Report.FieldByName("浜у搧瑙勬牸").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧瑙勬牸")].Value);
Report.FieldByName("璁″垝寮�宸ユ棩鏈�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁″垝寮�宸ユ棩鏈�")].Value);
Report.FieldByName("璁″垝瀹屽伐鏃ユ湡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁″垝瀹屽伐鏃ユ湡")].Value);
Report.FieldByName("璁㈠崟璺熻釜鍙�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁㈠崟璺熻釜鍙�")].Value);
Report.FieldByName("鍘熸枡鎵规").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍘熸枡鎵规")].Value);
Report.FieldByName("妯″叿璁惧").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("妯″叿璁惧")].Value);
Report.FieldByName("椤圭洰鍙�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("椤圭洰鍙�")].Value);
+ Report.FieldByName("鍥惧彿鐗堟湰").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍥惧彿鐗堟湰")].Value);
+ Report.FieldByName("鎬昏鍥惧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎬昏鍥惧彿")].Value);
+ Report.FieldByName("鏉愯川").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏉愯川")].Value);
+ Report.FieldByName("鎴愬搧缂栧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎴愬搧缂栧彿")].Value);
+ Report.FieldByName("鐗堟湰").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗堟湰")].Value);
}
catch (Exception e)
{
- MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[浜у搧瑙勬牸],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规]锛孾妯″叿璁惧]." + e.Message);
+ MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[浜у搧瑙勬牸],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规]锛孾妯″叿璁惧]锛孾鍥惧彿鐗堟湰]锛孾鎬昏鍥惧彿]锛孾鏉愯川]锛孾鎴愬搧缂栧彿]锛孾鐗堟湰]." + e.Message);
}
}
@@ -1163,6 +1168,10 @@
private void cf_Click(object sender, EventArgs e)
{
+ //鏅鸿鐗瑰埆鎺у埗
+ MessageBox.Show("鍗曟嵁鎷嗗垎鍔熻兘宸叉帶鍒讹紝璇蜂笌绠＄悊鍛樿仈绯�", "鎻愮ず");
+ return;
+ //
Int64 lngBillKey = 0;
if (grdMain.CurrentRow == null)
return;
--
Gitblit v1.9.1