From caf31525f29e659cca49dd6e35b5f13e8e0496d7 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 28 三月 2022 17:20:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 15 +
WarM/条码打印/Gy_BarCodeBillList.cs | 151 ++++++++--
WarM/条码打印/Gy_BarCodeBill.designer.cs | 289 ++++++++------------
WarM/条码打印/Gy_BarCodeBill.resx | 32 +-
DAL/WMS/ClsGy_BarCodeBill_Ctl.cs | 88 ++++++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 5
WarM/条码打印/Gy_BarCodeBill.cs | 232 ++++++++++-----
7 files changed, 509 insertions(+), 303 deletions(-)
diff --git a/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs b/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
index 9cfa797..260ac0b 100644
--- a/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
+++ b/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
@@ -321,7 +321,95 @@
+ //鏉＄爜鐢熸垚妯″潡璋冪敤 鏉＄爜鎵撳嵃鍓嶏紝鏉＄爜鎵撳嵃娆℃暟鎺у埗锛堟槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟锛�
+ public bool Set_CheckPrintQty_SD(Int64 HInterID, long PrintQty, ref string sReturn)
+ {
+ DataSet DS;
+ string sBarCode = "";
+ DS = oCn.RunProcReturn("select stuff((select ','+HBarCode from Gy_BarCodeBill with(nolock) where HPrintQty >=" + PrintQty + " and HBarCodeType = '鍞竴鏉＄爜' and HInterID = " + HInterID + " for xml path('')),1,1,'')", "Gy_BarCodeBill");
+ if (DS == null || DS.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "姝ｅ父锛�";
+ return false;
+ }
+ else
+ {
+ sBarCode = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]);
+ if (sBarCode == "")
+ {
+ sReturn = "姝ｅ父锛�";
+ return false;
+ }
+ else
+ {
+ sReturn = "鏉＄爜缂栧彿锛�" + DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) + "锛屽凡鎵撳嵃" + PrintQty + " 娆★紝涓嶅厑璁稿啀娆￠瑙堟墦鍗帮紒";
+ return true;
+ }
+ }
+ }
+ //鏉＄爜妗ｆ鍒楄〃妯″潡璋冪敤 鏉＄爜鎵撳嵃鍓嶏紝鏉＄爜鎵撳嵃娆℃暟鎺у埗锛堟槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟锛�
+ public bool Set_CheckPrintQty(string sBarCodeItemID,long PrintQty, ref string sReturn)
+ {
+ DataSet DS;
+ string sBarCode = "";
+ DS = oCn.RunProcReturn("select stuff((select ','+HBarCode from Gy_BarCodeBill with(nolock) where HPrintQty >=" + PrintQty + " and HBarCodeType = '鍞竴鏉＄爜' and HItemID in (" + sBarCodeItemID + ") for xml path('')),1,1,'')", "Gy_BarCodeBill");
+ if (DS == null || DS.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "姝ｅ父锛�";
+ return false;
+ }
+ else
+ {
+ sBarCode = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]);
+ if (sBarCode == "")
+ {
+ sReturn = "姝ｅ父锛�";
+ return false;
+ }
+ else
+ {
+ sReturn = "鏉＄爜缂栧彿锛�" + DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) + "锛屽凡鎵撳嵃" + PrintQty + " 娆★紝涓嶅厑璁稿啀娆￠瑙堟墦鍗帮紒";
+ return true;
+ }
+ }
+ }
+
+ //鏉＄爜鐢熸垚妯″潡璋冪敤 鏉＄爜鎵撳嵃鍚庯紝鏇存柊鏉＄爜鎵撳嵃娆℃暟
+ public bool Set_UpdatePrintQty_SD(Int64 HInterID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊 鏉＄爜鎵撳嵃娆℃暟
+ oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID = " + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏉＄爜妗ｆ鍒楄〃妯″潡璋冪敤 鏉＄爜鎵撳嵃鍚庯紝鏇存柊鏉＄爜鎵撳嵃娆℃暟
+ public bool Set_UpdatePrintQty(string sBarCodeItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊 鏉＄爜鎵撳嵃娆℃暟
+ oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HItemID in (" + sBarCodeItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 70246ba..53e96b7 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -612,6 +612,21 @@
{
omodel.BarCode_SourceQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //允许条码打印次数（1、2、3.....）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_PrintQty")
+ {
+ omodel.BarCode_PrintQty = ClsPub.isLong(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //条码打印次数控制（是否只允许打印一次控制，Y 只允许打印一次）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_PrintQtyCtl")
+ {
+ omodel.BarCode_PrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //条码打印次数更新(打印条码时，是否更新条码打印次数，Y 更新)
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_UpdatePrintQtyCtl")
+ {
+ omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//-======进站单
//先进先出
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 7ced917..c7e69f1 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -163,7 +163,10 @@
public string WMS_MouldManagerCtl; //是否启用器具管理(Y,N)
//桌面条码模块
- public string BarCode_SourceQtyCtl;//有源单生成条码，生成条码数量可否超源单数量控制
+ public string BarCode_SourceQtyCtl; //有源单生成条码，生成条码数量可否超源单数量控制
+ public long BarCode_PrintQty; //允许条码打印次数（1、2、3.....）
+ public string BarCode_PrintQtyCtl; //条码打印次数控制（是否只允许打印一次控制，Y 只允许打印一次）
+ public string BarCode_UpdatePrintQtyCtl;//条码打印次数更新(打印条码时，是否更新条码打印次数，Y 更新)
//进站单
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index bf698e8..ac71f5a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -165,7 +165,10 @@
public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
- //-------------------------------------------------------------------------
+ public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ //-------------------------------------------------------------------------
#region 鍥哄畾浠ｇ爜
//娓呯┖鐣岄潰
@@ -405,6 +408,9 @@
ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
CampanyName = oSystemParameter.omodel.WMS_CampanyName;
SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
+ PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
+ PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
+ UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
}
cmbHWorksNumber.Items.Clear();
@@ -2707,9 +2713,10 @@
#region //鎵撳嵃璁剧疆
GridppReport Report;
+ int CurRows = 0;
+ string sBarCodeItemID = ""; //鏉＄爜鑷鍒�
//棰勮
- int CurRows = 0;
private void yl_Click(object sender, EventArgs e)
{
//鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
@@ -2738,32 +2745,68 @@
}
}
- //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ //鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //寰幆閫変腑琛�
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ ////鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ //private bool ReportPrintBegin()
+ //{
+ // string sRelQty = "";
+
+ // if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
+ // {
+ // MessageBox.Show("鏉＄爜宸茬粡鎵撳嵃杩囷紝涓嶅彲閲嶅鎵撳嵃锛�");
+ // return true;
+ // }
+ // else
+ // {
+ // return false;
+ // }
+ //}
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
private bool ReportPrintBegin()
{
- string sRelQty = "";
-
- if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
+ string sHRemark = "";
+ if (PrintQtyCtl == "Y")
{
- MessageBox.Show("鏉＄爜宸茬粡鎵撳嵃杩囷紝涓嶅彲閲嶅鎵撳嵃锛�");
- return true;
+ if (oBar.Set_CheckPrintQty_SD(HInterID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
}
else
{
return false;
- }
- }
-
- //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
- private void ReportPrintEnd()
- {
- try
- {
- oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- }
- catch (Exception e)
- {
- MessageBox.Show("鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
}
}
@@ -2773,26 +2816,6 @@
for (int i = 0; i < grdList.Rows.Count; i++)
{
grdList.Rows[i].Cells[0].Value = "*";
- }
- //
- Report = new GridppReport();
- Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
- }
-
-
- private void Sub_SetReportView(string sOpenTmp)
- {
- //鍒ゆ柇琛屾暟
- for (int i = 0; i < grdList.Rows.Count; i++)
- {
- grdList.Rows[i].Cells[0].Value = "";
- }
- for (int i = 0; i < grdList.SelectedRows.Count; i++)
- {
- grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
}
//
Report = new GridppReport();
@@ -2824,11 +2847,7 @@
}
}
- private Int32 Fun_GetCol(string sCol)
- {
- return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
- }
-
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
private void ReportFetchRecordByDataTable()
{
try
@@ -2842,17 +2861,40 @@
}
}
- private void dy_Click(object sender, EventArgs e)
+ ////鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ //private void ReportPrintEnd()
+ //{
+ // try
+ // {
+ // oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // }
+ // catch (Exception e)
+ // {
+ // MessageBox.Show("鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
+ // }
+ //}
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty_SD(HInterID);
+ }
+ }
+
+ //璇曟墦鍗�
+ private void sdy_Click(object sender, EventArgs e)
{
//鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
{
- MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
return;
}
//鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
- if (ReportPrintBegin())
+ if (ReportPrintBegin_SDY())
{
return;
}
@@ -2864,12 +2906,71 @@
oFrm.ShowDialog();
if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
{
- //寰幆閫変腑琛�
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(true);
+ Sub_SetReportView(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
Thread.Sleep(1000);
}
}
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin_SDY()
+ {
+ string sHRemark = "";
+ sBarCodeItemID = "";
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdList.Rows[grdList.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+ }
+ sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
+
+ if (PrintQtyCtl == "Y")
+ {
+ if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ private void Sub_SetReportView(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList.Rows.Count; i++)
+ {
+ grdList.Rows[i].Cells[0].Value = "";
+ }
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_SDY);
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd_SDY()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty(sBarCodeItemID);
+ }
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+ }
+
#endregion
@@ -3200,33 +3301,6 @@
}
}
- private void sdy_Click(object sender, EventArgs e)
- {
- //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
- if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
- {
- MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
- return;
- }
-
- //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
- if (ReportPrintBegin())
- {
- return;
- }
-
- //閫夋嫨鎵撳嵃妯℃澘
- BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
- oFrm.sBillName = ModName;
- oFrm.sBillModel = ModCaption;
- oFrm.ShowDialog();
- if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
- {
- Sub_SetReportView(oFrm.sOpenTmp);
- Report.PrintPreview(false);
- Thread.Sleep(1000);
- }
- }
//鐢熸垚澶栫鐮�
private void wxm_Click(object sender, EventArgs e)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index c5abf71..bdb5a0f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -164,7 +164,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1356, 62);
+ this.Tool.Size = new System.Drawing.Size(1017, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -214,7 +214,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// AddRow
//
@@ -262,7 +262,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// bc
//
@@ -281,7 +281,7 @@
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// wxm
//
@@ -300,7 +300,7 @@
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// cz
//
@@ -319,7 +319,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// kc
//
@@ -338,13 +338,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -354,7 +354,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -364,7 +364,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -374,7 +374,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -384,7 +384,7 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
//
// tb
//
@@ -404,7 +404,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// gl
//
@@ -423,7 +423,7 @@
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// BatchNo
//
@@ -442,7 +442,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -462,10 +462,9 @@
//
this.lblCaption.AutoSize = true;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(668, 15);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(501, 12);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(110, 24);
+ this.lblCaption.Size = new System.Drawing.Size(89, 19);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
//
@@ -476,18 +475,16 @@
this.P1.Controls.Add(this.lblCaption);
this.P1.Controls.Add(this.gbUp);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
- this.P1.Location = new System.Drawing.Point(55, 62);
- this.P1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.P1.Location = new System.Drawing.Point(41, 50);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1249, 171);
+ this.P1.Size = new System.Drawing.Size(937, 137);
this.P1.TabIndex = 31;
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(417, 4);
- this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pic1.Location = new System.Drawing.Point(313, 3);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(104, 51);
+ this.pic1.Size = new System.Drawing.Size(78, 41);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -510,11 +507,9 @@
this.gbUp.Controls.Add(this.label14);
this.gbUp.Controls.Add(this.cmbSourceBillType);
this.gbUp.Controls.Add(this.label10);
- this.gbUp.Location = new System.Drawing.Point(19, 49);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Location = new System.Drawing.Point(14, 39);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gbUp.Size = new System.Drawing.Size(1189, 100);
+ this.gbUp.Size = new System.Drawing.Size(892, 80);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
@@ -522,38 +517,37 @@
//
this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHWorksNumber.FormattingEnabled = true;
- this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
- this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHWorksNumber.Location = new System.Drawing.Point(394, 17);
this.cmbHWorksNumber.Name = "cmbHWorksNumber";
- this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
+ this.cmbHWorksNumber.Size = new System.Drawing.Size(188, 20);
this.cmbHWorksNumber.TabIndex = 98;
//
// label4
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(436, 26);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(327, 21);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 97;
this.label4.Text = "宸ュ巶浠ｇ爜";
//
// dtpHDate
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(901, 21);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dtpHDate.Location = new System.Drawing.Point(676, 17);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(249, 25);
+ this.dtpHDate.Size = new System.Drawing.Size(188, 21);
this.dtpHDate.TabIndex = 96;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(812, 26);
+ this.label2.Location = new System.Drawing.Point(609, 21);
+ this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(69, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 95;
this.label2.Text = "鏃� 鏈�";
//
@@ -561,20 +555,18 @@
//
this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrgID.FormattingEnabled = true;
- this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
- this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
+ this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
this.cmbHOrgID.TabIndex = 85;
//
// label3
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(47, 26);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(35, 21);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(69, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 84;
this.label3.Text = "缁� 缁�";
//
@@ -582,20 +574,18 @@
//
this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHBarCodeType.FormattingEnabled = true;
- this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 58);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(676, 46);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(188, 20);
this.cmbHBarCodeType.TabIndex = 81;
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(812, 62);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(609, 50);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 80;
this.label1.Text = "鏉＄爜绫诲瀷";
//
@@ -604,10 +594,9 @@
this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHEmpID.Location = new System.Drawing.Point(1189, -9);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHEmpID.Location = new System.Drawing.Point(892, -7);
this.cmdHEmpID.Name = "cmdHEmpID";
- this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
this.cmdHEmpID.TabIndex = 79;
this.cmdHEmpID.UseVisualStyleBackColor = false;
this.cmdHEmpID.Visible = false;
@@ -616,10 +605,9 @@
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 56);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
this.cmdSourceBillNo.TabIndex = 42;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -627,10 +615,9 @@
// txtHSourceBillNo
//
this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 58);
- this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
- this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
this.txtHSourceBillNo.TabIndex = 41;
this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
//
@@ -638,10 +625,9 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(436, 62);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(327, 50);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(68, 15);
+ this.label14.Size = new System.Drawing.Size(53, 12);
this.label14.TabIndex = 40;
this.label14.Text = "閫� 鍗� 鍙�";
//
@@ -650,20 +636,18 @@
this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSourceBillType.FormattingEnabled = true;
this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbSourceBillType.Location = new System.Drawing.Point(135, 58);
- this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbSourceBillType.Location = new System.Drawing.Point(101, 46);
this.cmbSourceBillType.Name = "cmbSourceBillType";
- this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
+ this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
this.cmbSourceBillType.TabIndex = 36;
//
// label10
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(47, 62);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(35, 50);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(67, 15);
+ this.label10.Size = new System.Drawing.Size(53, 12);
this.label10.TabIndex = 35;
this.label10.Text = "婧愬崟绫诲瀷";
//
@@ -691,20 +675,18 @@
this.panel2.Controls.Add(this.txtHMaker);
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(55, 633);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel2.Location = new System.Drawing.Point(41, 506);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1249, 116);
+ this.panel2.Size = new System.Drawing.Size(937, 93);
this.panel2.TabIndex = 32;
//
// txtHDeleteDate
//
this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
- this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -712,10 +694,9 @@
this.label25.AutoSize = true;
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label25.Location = new System.Drawing.Point(888, 62);
- this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Location = new System.Drawing.Point(666, 50);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(67, 15);
+ this.label25.Size = new System.Drawing.Size(53, 12);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -723,10 +704,9 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
- this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -734,10 +714,9 @@
this.label27.AutoSize = true;
this.label27.BackColor = System.Drawing.Color.Transparent;
this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label27.Location = new System.Drawing.Point(888, 15);
- this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label27.Location = new System.Drawing.Point(666, 12);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(52, 15);
+ this.label27.Size = new System.Drawing.Size(41, 12);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -745,10 +724,9 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
- this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -756,10 +734,9 @@
this.label23.AutoSize = true;
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label23.Location = new System.Drawing.Point(671, 59);
- this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Location = new System.Drawing.Point(503, 47);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(67, 15);
+ this.label23.Size = new System.Drawing.Size(53, 12);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -767,10 +744,9 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
- this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -778,10 +754,9 @@
this.label21.AutoSize = true;
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label21.Location = new System.Drawing.Point(671, 15);
- this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Location = new System.Drawing.Point(503, 12);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(52, 15);
+ this.label21.Size = new System.Drawing.Size(41, 12);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -789,10 +764,9 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
- this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -800,10 +774,9 @@
this.label19.AutoSize = true;
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label19.Location = new System.Drawing.Point(451, 62);
- this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Location = new System.Drawing.Point(338, 50);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(67, 15);
+ this.label19.Size = new System.Drawing.Size(53, 12);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -811,10 +784,9 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
- this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -822,10 +794,9 @@
this.label17.AutoSize = true;
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label17.Location = new System.Drawing.Point(451, 20);
- this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Location = new System.Drawing.Point(338, 16);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(52, 15);
+ this.label17.Size = new System.Drawing.Size(41, 12);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -833,10 +804,9 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
- this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -844,10 +814,9 @@
this.label15.AutoSize = true;
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label15.Location = new System.Drawing.Point(233, 62);
- this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Location = new System.Drawing.Point(175, 50);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(67, 15);
+ this.label15.Size = new System.Drawing.Size(53, 12);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -855,10 +824,9 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(312, 16);
- this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHChecker.Location = new System.Drawing.Point(234, 13);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(131, 19);
+ this.txtHChecker.Size = new System.Drawing.Size(98, 15);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -866,10 +834,9 @@
this.label13.AutoSize = true;
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label13.Location = new System.Drawing.Point(233, 20);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(175, 16);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(52, 15);
+ this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -877,10 +844,9 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
- this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -888,10 +854,9 @@
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label11.Location = new System.Drawing.Point(16, 62);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(12, 50);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(67, 15);
+ this.label11.Size = new System.Drawing.Size(53, 12);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -899,10 +864,9 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(95, 16);
- this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMaker.Location = new System.Drawing.Point(71, 13);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(131, 19);
+ this.txtHMaker.Size = new System.Drawing.Size(98, 15);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -910,10 +874,9 @@
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(16, 20);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(12, 16);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(52, 15);
+ this.label8.Size = new System.Drawing.Size(41, 12);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -925,19 +888,17 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 62);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Location = new System.Drawing.Point(0, 50);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(55, 687);
+ this.panel1.Size = new System.Drawing.Size(41, 549);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(1304, 62);
- this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel3.Location = new System.Drawing.Point(978, 50);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(52, 687);
+ this.panel3.Size = new System.Drawing.Size(39, 549);
this.panel3.TabIndex = 34;
//
// grdMain
@@ -949,13 +910,12 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain.Location = new System.Drawing.Point(4, 4);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1233, 339);
+ this.grdMain.Size = new System.Drawing.Size(923, 268);
this.grdMain.TabIndex = 44;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -972,25 +932,23 @@
this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(55, 609);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdSum.Location = new System.Drawing.Point(41, 487);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1249, 24);
+ this.grdSum.Size = new System.Drawing.Size(937, 19);
this.grdSum.TabIndex = 45;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1079, 679);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdPrint.Location = new System.Drawing.Point(809, 543);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
@@ -1000,21 +958,19 @@
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(55, 233);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabControl1.Location = new System.Drawing.Point(41, 187);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1249, 376);
+ this.tabControl1.Size = new System.Drawing.Size(937, 300);
this.tabControl1.TabIndex = 47;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabPage1.Size = new System.Drawing.Size(1241, 347);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(929, 274);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1022,11 +978,10 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.grdSub);
- this.tabPage2.Location = new System.Drawing.Point(4, 25);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabPage2.Size = new System.Drawing.Size(1241, 347);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(929, 274);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -1040,13 +995,12 @@
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdSub.Location = new System.Drawing.Point(4, 4);
- this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdSub.Location = new System.Drawing.Point(3, 3);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 30;
this.grdSub.RowTemplate.Height = 23;
- this.grdSub.Size = new System.Drawing.Size(1233, 339);
+ this.grdSub.Size = new System.Drawing.Size(923, 268);
this.grdSub.TabIndex = 45;
this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
@@ -1055,10 +1009,9 @@
// tabPage3
//
this.tabPage3.Controls.Add(this.grdList);
- this.tabPage3.Location = new System.Drawing.Point(4, 25);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1242, 348);
+ this.tabPage3.Size = new System.Drawing.Size(929, 274);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1073,20 +1026,19 @@
this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdList.Location = new System.Drawing.Point(0, 0);
- this.grdList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1242, 348);
+ this.grdList.Size = new System.Drawing.Size(929, 274);
this.grdList.TabIndex = 46;
//
// Gy_BarCodeBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1356, 749);
+ this.ClientSize = new System.Drawing.Size(1017, 599);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.panel2);
@@ -1097,7 +1049,6 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_BarCodeBill";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
index 804bb7a..a1799cb 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
@@ -360,7 +360,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
<data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -396,7 +396,7 @@
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -407,7 +407,7 @@
<data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -418,7 +418,7 @@
<data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -428,7 +428,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -443,7 +443,7 @@
<data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -458,7 +458,7 @@
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -467,7 +467,7 @@
<data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -478,7 +478,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -493,7 +493,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -508,7 +508,7 @@
<data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -523,7 +523,7 @@
<data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -537,7 +537,7 @@
<data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -547,7 +547,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
index e3fd2c9..f9f460f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
@@ -10,6 +10,7 @@
using DBUtility;
using System.Threading;
using System.IO;
+using Pub_Class;
namespace WarM
{
@@ -28,10 +29,15 @@
public const string ModRightNameCheck = ModRightName + "_Check";
public const string ModRightNameClose = ModRightName + "_Close";
public const string ModRightNameDelete = ModRightName + "_Delete";
+ public const string ModRightNamePrint = ModRightName + "_Print"; //鎵撳嵃
//DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
//public Gy_ICBomBill oFrm;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public int selectRow = 0;
public int selectRow2 = 0;
+ public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
//
private void initGrid()
{
@@ -135,6 +141,25 @@
this.Text = ModCaption;
lblCaption.Text = ModCaption;
initGrid();
+ Sub_GetSystemParameter();
+ }
+
+ //鑾峰彇绯荤粺鍙傛暟淇℃伅
+ private void Sub_GetSystemParameter()
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
+ PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
+ UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
+ }
}
private void grdMain_DblClick(object sender, EventArgs e)
@@ -390,11 +415,23 @@
#region //鎵撳嵃璁剧疆
GridppReport Report;
+ int CurRows = 0;
+ string sBarCodeItemID = ""; //鏉＄爜鑷鍒�
//棰勮
- int CurRows = 0;
private void yl_Click(object sender, EventArgs e)
{
+ //鎵撳嵃棰勮鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNamePrint, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
//閫夋嫨鎵撳嵃妯℃澘
BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
oFrm.sBillName = ModName;
@@ -405,6 +442,60 @@
Sub_SetReport(oFrm.sOpenTmp);
Report.PrintPreview(false);
Thread.Sleep(1000);
+ }
+ }
+
+ //鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //鎵撳嵃棰勮鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNamePrint, 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ return;
+ }
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin()
+ {
+ DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+ string sHRemark = "";
+ sBarCodeItemID = "";
+ for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+ {
+ sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+ }
+ sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
+
+ if (PrintQtyCtl=="Y")
+ {
+ if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
}
}
@@ -424,6 +515,7 @@
Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
}
//濉叆鍗曟嵁琛ㄥご淇℃伅
@@ -453,6 +545,8 @@
}
//CurRows = CurRows + 1;
}
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
private void ReportFetchRecordByDataTable()
{
try
@@ -466,47 +560,19 @@
}
}
- #endregion
- //
- private void grdMain_Paint(object sender, PaintEventArgs e)
- {
- GraphicsGrid();
- }
-
- private void dy_Click(object sender, EventArgs e)
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
{
DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
- string sBarCode = "";
- string sRelQty = "";
- for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+ if (UpdatePrintQtyCtl == "Y")
{
- sBarCode = sBarCode + "," + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ oBar.Set_UpdatePrintQty(sBarCodeItemID);
}
- //if (oBar.Set_BPrintQty(sBarCode.Substring(1), ref sRelQty))
- //{
- // MessageBox.Show(sRelQty);
- // return;
- //}
-
- //閫夋嫨鎵撳嵃妯℃澘
- BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
- //DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- oFrm.sBillName = ModName;
- oFrm.sBillModel = ModCaption;
- oFrm.ShowDialog();
- if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
- {
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(false);
- //oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.Rows[CurRows].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- Thread.Sleep(1000);
- }
-
- //鎵归噺鏇存柊鏉＄爜鎵撳嵃娆℃暟
- oBar.Set_EPrintQty(sBarCode.Substring(1));
}
+
+
+ //杩炴墦
private void dy2_Click(object sender, EventArgs e)
{
//閫夋嫨鎵撳嵃妯℃澘
@@ -537,6 +603,15 @@
i++;
}
}
+ }
+
+ #endregion
+
+
+ //
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
}
private void yc_Click(object sender, EventArgs e)
@@ -633,7 +708,7 @@
private void zf_Click(object sender, EventArgs e)
{
//Sub_AbandonCheck();
- if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
}
@@ -661,7 +736,7 @@
private void fzf_Click(object sender, EventArgs e)
{
//this.Sub_CheckBill();
- if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
{
return;
}
--
Gitblit v1.9.1