From bfea42f84de6f6988cfc4231e455fdbd894f40f1 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 17 五月 2022 10:49:49 +0800
Subject: [PATCH] nothing
---
WorkM/流转卡管理/MES_StationOutBillList.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
index 35b3353..2bb87a6 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
@@ -47,6 +47,11 @@
string sSql = "";
string sWhere = "";
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
+
if (frmCondition.SqlStr.Trim().Length == 0)
{
sSql = "Select top 5000 * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by hmainid desc ";
@@ -153,6 +158,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
@@ -216,6 +222,18 @@
MessageBox.Show("鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒", "鎻愮ず");
return;
}
+
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(oBill.omodel.HDate), ref sYear, ref sPeriod, ref s) == false)
+ {
+ MessageBox.Show(s, "鎻愮ず");
+ return;
+ }
+
+
string c = "";
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
--
Gitblit v1.9.1