From 3697b0dda739b38c33406d6e164714167e9ad5b5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 22 十一月 2024 15:31:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationInBill.cs | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
index 9277223..e30106e 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
@@ -17,6 +17,7 @@
{
InitializeComponent();
}
+ public DBUtility.frmBillQueryCondition_New frmCondition;
public string ModName = "3790";
public string ModCaption = "杩涚珯鎺ユ敹鍗�";
public const string ModRightName = "MES_StationInBill";
@@ -138,6 +139,7 @@
//鍙栨秷鎸夐挳
private void cmdCancel_Click(object sender, EventArgs e)
{
+ ClsPub.SaveGridView(grdSub, Name+"grdSub", ClsPub.AppPath);//璁剧疆鍒楀
this.Close();
}
//鎺т欢浣嶇疆
@@ -151,6 +153,7 @@
//绐椾綋鍔犺浇
private void Sc_StationInBill_Load(object sender, EventArgs e)
{
+ frmCondition = new DBUtility.frmBillQueryCondition_New();
//鎵撳嵃鍒濆鍖�
this.Text = ModCaption;
this.lblCaption.Text = ModCaption;
@@ -178,7 +181,7 @@
private void Sc_StationInBill_FormClosing(object sender, FormClosingEventArgs e)
{
BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
- //DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ //DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name);
DBUtility.Xt_BaseBillFun.SaveGrid(grdCardList, this.Name + "grdCardList");
}
//鏂板鍗曟嵁
@@ -1522,6 +1525,9 @@
}
else
{
+ //閲婃斁鍐荤粨
+ DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdSub);
+ //
grdSub.DataSource = Dsplay.Tables[0].DefaultView;
//璁剧疆鍚堣鍒�
//string sTotalCol = "";
@@ -1531,15 +1537,29 @@
//oSumGrid.BuildTotalCols(sT);
//
//鍐荤粨
- int FrCol = 0;
- string s = "鏄�";
- DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
+ int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+ string s = frmCondition.cmbHComplete.Text;
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name, s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ //鍐荤粨
+ //int FrCol = 0;
+ //string s = "鏄�";
+ //DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
}
}
catch (Exception e)
{
MessageBox.Show(e.Message + "DisplaySub");
}
+ }
+ private void GraphLine()
+ {
+ int MainIDCol = 0;
+ int SubIDCol = 0;
+ string s = frmCondition.cmbHComplete.Text;
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdSub, MainIDCol, SubIDCol, s, ref n);
}
private void cmdDelLine_Click(object sender, EventArgs e)
@@ -1561,5 +1581,16 @@
}
}
+
+ private void cmdHbclk_Click(object sender, EventArgs e)
+ {
+ //淇濆瓨鍒楀
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name);
+ }
+
+ private void cmdHmrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1