From 055b64bfcdcb83aafa2986566df3fba49ed2eb98 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 21 四月 2022 14:02:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationOutBillList_Bad.cs | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
index 1756635..5effe0d 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
@@ -47,6 +47,7 @@
string sSql = "";
string sWhere = "";
+ bzd.Enabled = true;
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -614,6 +615,8 @@
private void bzd_Click(object sender, EventArgs e)
{
+ //鐐瑰嚮鍚庡叆搴撴寜閽彉鐏�
+ bzd.Enabled = false;
//鏍规嵁閫変腑鐨勬暟鎹敓鎴愬寘瑁呭崟
int MainIDCol = Fun_GetCol("hmainid");
int SubIDCol = Fun_GetCol("hsubid");
@@ -629,6 +632,7 @@
if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
{
MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + DBUtility.ClsPub.sExeReturnInfo);
+ bzd.Enabled = true;
return;
}
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
@@ -638,6 +642,7 @@
if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Today, ref sYear, ref sPeriod, ref s) == false)
{
MessageBox.Show("浼氳鏈熼棿鏈夐敊璇紒 " + DBUtility.ClsPub.sExeReturnInfo);
+ bzd.Enabled = true;
return;
}
string sHInterID = "";
@@ -648,6 +653,7 @@
if (sHInterID=="")
{
MessageBox.Show("娌℃湁閫変腑鐨勫崟鎹槑缁嗚锛岃鍏堥�夋嫨瑕佸叆搴撶殑鍗曟嵁锛�", "鎻愮ず");
+ bzd.Enabled = true;
return;
}
else
@@ -656,6 +662,7 @@
if (DS == null || DS.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鍏ュ簱鍓嶅垽鏂け璐ワ紒", "鎻愮ず");
+ bzd.Enabled = true;
return;
}
else
@@ -663,6 +670,7 @@
if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
{
MessageBox.Show(DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]));
+ bzd.Enabled = true;
return;
}
}
@@ -707,6 +715,7 @@
System.Threading.Thread.Sleep(2000);
//
}
+ bzd.Enabled = true;
//
if (n > 0)
{
--
Gitblit v1.9.1