From cfd2e46c3beb94ff705091b4b53ace96c8851a0d Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期五, 29 七月 2022 18:14:50 +0800
Subject: [PATCH] 34进制
---
SCM/条码打印/Gy_BarCodeBill.cs | 5 +
SCM/Gy_BarCodeBill_Cus.cs | 141 +++++++++++++++------------
SCM/条码打印/Gy_BarCodeBill.resx | 9 +
SCM/条码打印/Gy_BarCodeBill.designer.cs | 111 +++++++++++++--------
4 files changed, 160 insertions(+), 106 deletions(-)
diff --git a/SCM/Gy_BarCodeBill_Cus.cs b/SCM/Gy_BarCodeBill_Cus.cs
index 7fba90d..0def462 100644
--- a/SCM/Gy_BarCodeBill_Cus.cs
+++ b/SCM/Gy_BarCodeBill_Cus.cs
@@ -25,43 +25,43 @@
public const Int16 HBillNoCol = 4;
public const Int16 HBillTypeCol = 5;
public const Int16 HCusModelCol = 6;
- public const Int16 HCode1Col = 7;
- public const Int16 HSupNumberCol = 8;
- public const Int16 HCode2Col = 9;
- public const Int16 HWorkLineNameCol = 10;
- public const Int16 HBarCodeDateCol = 11;
- public const Int16 HCode3Col = 12;
- public const Int16 HBackDataFlagCol = 13;
- public const Int16 HQtyCol = 14;
- public const Int16 HMinQtyCol = 15;
- public const Int16 HBQtyCol = 16;
- public const Int16 HDateCol = 17;
- public const Int16 HSourceInterIDCol = 18;
- public const Int16 HSourceEntryIDCol = 19;
- public const Int16 HSourceBillNoCol = 20;
- public const Int16 HSourceBillTypeCol = 21;
- public const Int16 HinitQtyCol = 22;
- public const Int16 HRemarkCol = 23;
+ public const Int16 HCusModelNameCol = 7;
+ public const Int16 HCode1Col = 8;
+ public const Int16 HSupNumberCol = 9;
+ public const Int16 HSupNameCol = 10;
+ public const Int16 HCode2Col = 11;
+ public const Int16 HWorkLineNameCol = 12;
+ public const Int16 HBarCodeDateCol = 13;
+ public const Int16 HCode3Col = 14;
+ public const Int16 HBackDataFlagCol = 15;
+ public const Int16 HQtyCol = 16;
+ public const Int16 HMinQtyCol = 17;
+ public const Int16 HBQtyCol = 18;
+ public const Int16 HDateCol = 19;
+ public const Int16 HinitQtyCol = 20;
+ public const Int16 HRemarkCol = 21;
public Int16 HSelectCol = 0;
public Int16 HSno2Col = 1;
public Int16 HTMCol = 2;
public Int16 HBarCodeType2Col = 3;
public Int16 HCusModel2Col = 4;
- public Int16 HCode1_SecCol = 5;
- public Int16 HSupNumber2Col = 6;
- public Int16 HCode2_SecCol = 7;
- public Int16 HWorkLineName2Col = 8;
- public Int16 HBarCodeDate2Col = 9;
- public Int16 HCode3_SecCol = 10;
- public Int16 HBackDataFlag2Col = 11;
- public Int16 HQty2Col = 12;
- public Int16 HWeiCol = 13;
- public Int16 HPrintCol = 14;
- public Int16 HDate2Col = 15;
- public Int16 HBeginDate2Col = 16;
- public Int16 HEndDate2Col = 17;
- public Int16 HRemark2Col = 18;
+ public Int16 HCusModelName2Col = 5;
+ public Int16 HCode1_SecCol = 6;
+ public Int16 HSupNumber2Col = 7;
+ public Int16 HSupName2Col = 8;
+ public Int16 HCode2_SecCol = 9;
+ public Int16 HWorkLineName2Col = 10;
+ public Int16 HBarCodeDate2Col = 11;
+ public Int16 HCode3_SecCol = 12;
+ public Int16 HBackDataFlag2Col = 13;
+ public Int16 HQty2Col = 14;
+ public Int16 HWeiCol = 15;
+ public Int16 HPrintCol = 16;
+ public Int16 HDate2Col = 17;
+ public Int16 HBeginDate2Col = 18;
+ public Int16 HEndDate2Col = 19;
+ public Int16 HRemark2Col = 20;
//
public string ModName = "85";
public string ModCaption = "鏉＄爜鐢熸垚";
@@ -343,7 +343,7 @@
{
this.Sub_AddBill();
}
- DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
}
//绐椾綋鍗歌浇
@@ -528,13 +528,26 @@
SaveBarCode();
return true;
}
+ const string X34 = "0123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
//34杩涘埗
private string set_SNoBy10To34Type(int iSno)
- {
- string s34Code = "";
- s34Code = iSno.ToString();
- return s34Code;
+ {
+ var a = X34.Length;
+ //if(iSno==35)
+ //{
+ // iSno = iSno;
+ //}
+ string Result = "";
+ while (iSno >= 34)
+ {
+ Result = X34[(iSno % 34) == 0 ? 0 : (iSno % 34) ] + Result;
+ iSno /= 34;
+ }
+ if (iSno >= 0)
+ Result = X34[iSno] + Result;
+
+ return Result;
}
//鐢熸垚鏉＄爜
@@ -600,7 +613,7 @@
//鏉＄爜鍓嶇紑 = 闆朵欢鍙�17 + 鎵╁睍浣�1 2 + 渚涘簲鍟嗙紪鐮�7 + 鎵╁睍浣�2 3+ 浜х嚎1 + 骞�00 + 鏈�00 + 鏃�00 + 鎵╁睍浣�3 4 + 杩芥函鏍囪瘑
sTMNumber = sCusModel + sCode1 + sSupNumber + sCode2 + sLineNumber + sYear + sPeriod + sDay ;
sTMNumber_b = sCode3 + sBackDataFlag;
- Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo '" + sTMNumber + sTMNumber_b + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰彇鏈�澶ф祦姘村彿
+ Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo_Cus '" + sTMNumber + sTMNumber_b + "'", "h_p_WMS_GetMaxNo_Cus", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰彇鏈�澶ф祦姘村彿
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
HBQty = HBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
@@ -657,8 +670,10 @@
grdSub.Rows[i].Cells[HTMCol].Value = TM;
grdSub.Rows[i].Cells[HQty2Col].Value = HMinQty;
grdSub.Rows[i].Cells[HCusModel2Col].Value = grdMain.Rows[j].Cells[HCusModelCol].Value;
+ grdSub.Rows[i].Cells[HCusModelName2Col].Value = grdMain.Rows[j].Cells[HCusModelNameCol].Value;
grdSub.Rows[i].Cells[HCode1_SecCol].Value = grdMain.Rows[j].Cells[HCode1Col].Value;
grdSub.Rows[i].Cells[HSupNumber2Col].Value = grdMain.Rows[j].Cells[HSupNumberCol].Value;
+ grdSub.Rows[i].Cells[HSupName2Col].Value = grdMain.Rows[j].Cells[HSupNameCol].Value;
grdSub.Rows[i].Cells[HCode2_SecCol].Value = grdMain.Rows[j].Cells[HCode2Col].Value;
grdSub.Rows[i].Cells[HWorkLineName2Col].Value = grdMain.Rows[j].Cells[HWorkLineNameCol].Value;
grdSub.Rows[i].Cells[HCode3_SecCol].Value = grdMain.Rows[j].Cells[HCode3Col].Value;
@@ -670,9 +685,8 @@
grdSub.Rows[i].Cells[HDate2Col].Value = grdMain.Rows[j].Cells[HDateCol].Value;
grdSub.Rows[i].Cells[HCusModel2Col].Value = grdMain.Rows[j].Cells[HCusModelCol].Value;
k = k + 1;
- n = n + 1;
- //oWeb.getRunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
- sSQLNoMul[nn] = " exec h_p_WMS_SetMaxNo '" + sTMNumber + sTMNumber_b + "' ";
+ n = n + 1;
+ sSQLNoMul[nn] = " exec h_p_WMS_SetMaxNo_Cus '" + sTMNumber + sTMNumber_b + "' ";
nn = nn + 1;
}
//鍚庡彴鎵归噺鎵ц璇彞
@@ -735,7 +749,9 @@
string HCode2 = "";
string HBarCodeDate = "";
string HCode3 = "";
- string HBackDataFlag = "";
+ string HBackDataFlag = "";
+ string HCusModelName = "";
+ string HSupName = "";
long HCustomQty1 = 0;
string[] sSQLMul = new string[grdSub.Rows.Count];
@@ -750,9 +766,11 @@
if (ClsPub.isStrNull(grdSub.Rows[i].Cells[HCusModel2Col].Value) != "")
{
HCusModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCusModel2Col].Value);
+ HCusModelName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCusModelName2Col].Value);
HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HWorkLineName2Col].Value);
HCode1 = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCode1_SecCol].Value);
HSupNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSupNumber2Col].Value);
+ HSupName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSupName2Col].Value);
HCode2 = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCode2Col].Value);
HBarCodeDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HBarCodeDate2Col].Value);
HCode3 = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCode3_SecCol].Value);
@@ -772,18 +790,15 @@
sSQLMul[mm] = "insert into Gy_BarCodeBill_Cus (HBarCode,HBarCodeType,HCusModel,HWorkLineName,HQty" +
",HCode1,HSupNumber,HCode2,HMaker,HMakeDate,HPrintQty" +
",HBarCodeDate,HCode3,HBackDataFlag,HRemark " +
- ",HInterID " +
+ ",HInterID,HCusModelName,HSupName " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "','" + HCusModel.ToString() + "','" + HWorkLineName.ToString() + "'," + HQty2.ToString()
+ ",'" + HCode1 + "','" + HSupNumber.ToString() + "','" + HCode2.ToString() + "','" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString()
+ ", '" + HBarCodeDate.ToString() + "','" + HCode3.ToString() + "','" + HBackDataFlag + "', '" + HRemark + "'"
- + "," + HInterID.ToString() + ")";
+ + "," + HInterID.ToString() + " ,'" + HCusModelName + "'" + " ,'" + HSupName + "'" + ")";
//oCn.RunProc("exec setLSH '" + ClsPub.GetServerDate(0) + "'");
mm = mm + 1;
- Application.DoEvents();
- ////oWeb.getRunProc("exec setLSH '" + sTMNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
- //sSQLMul[mm] = "exec h_p_WMS_SetMaxNo '" + sTMNumber + "'";
- //mm = mm + 1;
+ Application.DoEvents();
Application.DoEvents();
}
}
@@ -845,7 +860,7 @@
{
grdMain.RowCount = 0;
grdSub.RowCount = 0;
- grdMain.ColumnCount = 76; //鎬诲垪鏁�
+ grdMain.ColumnCount = 22; //鎬诲垪鏁�
ClsPub1.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -862,9 +877,11 @@
grdMain.Columns[HBackDataFlagCol].HeaderText = "杩芥函鏍囪瘑";
grdMain.Columns[HWorkLineNameCol].HeaderText = "浜х嚎";
grdMain.Columns[HSupNumberCol].HeaderText = "渚涘簲鍟嗙紪鐮�";
+ grdMain.Columns[HSupNameCol].HeaderText = "渚涘簲鍟嗗悕绉�";
grdMain.Columns[HDateCol].HeaderText = "杩涙枡鏃ユ湡";
grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
grdMain.Columns[HCusModelCol].HeaderText = "瀹㈡埛闆朵欢鍙�";
+ grdMain.Columns[HCusModelNameCol].HeaderText = "瀹㈡埛闆朵欢鍚嶇О";
////
//鏍煎紡鍖� 闅愯棌鍒�
grdMain.Columns[HTagCol].Visible = false;
@@ -874,11 +891,7 @@
//grdMain.Columns[HBatchNoCol].Visible = false;
//grdMain.Columns[HCusModelCol].Visible = false;
grdMain.Columns[HDateCol].Visible = false;
- //grdMain.Columns[HSupNumberCol].Visible = false;
- grdMain.Columns[HSourceInterIDCol].Visible = false;
- grdMain.Columns[HSourceEntryIDCol].Visible = false;
- grdMain.Columns[HSourceBillNoCol].Visible = false;
- grdMain.Columns[HSourceBillTypeCol].Visible = false;
+ //grdMain.Columns[HSupNumberCol].Visible = false;
grdMain.Columns[HinitQtyCol].Visible = false;
@@ -888,8 +901,10 @@
string sAllowCol;
sAllowCol = HQtyCol.ToString() +
"," + HCusModelCol.ToString() +
+ "," + HCusModelNameCol.ToString() +
"," + HWorkLineNameCol.ToString() +
"," + HSupNumberCol.ToString() +
+ "," + HSupNameCol.ToString() +
"," + HCode1Col.ToString() +
"," + HCode2Col.ToString() +
"," + HCode3Col.ToString() +
@@ -903,7 +918,7 @@
ClsPub1.initGridLast(sAllowCol, sTotalCol, oSumGrid);
//----------------------------
- grdSub.ColumnCount = 74; //鎬诲垪鏁�
+ grdSub.ColumnCount = 21; //鎬诲垪鏁�
ClsPub1.initGridFst(grdSub, this.Name);
grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨";
grdSub.Columns[HCusModel2Col].HeaderText = "瀹㈡埛闆朵欢鍙�";
@@ -919,12 +934,14 @@
grdSub.Columns[HQty2Col].HeaderText = "鏁伴噺";
grdSub.Columns[HWeiCol].HeaderText = "灏炬暟";
grdSub.Columns[HPrintCol].HeaderText = "鎵撳嵃娆℃暟";
- grdSub.Columns[HSupNumber2Col].HeaderText = "渚涘簲鍟嗙紪鐮�";
+ grdSub.Columns[HSupNumber2Col].HeaderText = "渚涘簲鍟嗙紪鐮�";
+ grdSub.Columns[HSupName2Col].HeaderText = "渚涘簲鍟嗙紪鐮�";
grdSub.Columns[HDate2Col].HeaderText = "杩涙枡鏃ユ湡";
grdSub.Columns[HRemark2Col].HeaderText = "澶囨敞";
grdSub.Columns[HBeginDate2Col].HeaderText = "璁″垝寮�宸ユ棩鏈�";
grdSub.Columns[HEndDate2Col].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
- grdSub.Columns[HCusModel2Col].HeaderText = "瀹㈡埛鍨嬪彿";
+ grdSub.Columns[HCusModel2Col].HeaderText = "瀹㈡埛鍨嬪彿";
+ grdSub.Columns[HCusModelName2Col].HeaderText = "瀹㈡埛鍨嬪彿鍚嶇О";
//鏍煎紡鍖� 闅愯棌鍒�
grdSub.Columns[HBarCodeType2Col].Visible = false;
@@ -1340,9 +1357,7 @@
// HDate = SetDateStr(dtpHDate.Value);
// //绠卞彿鍓嶇紑 = 鐝粍ID + 鎵规 + 鏃ユ湡 + 鐗╂枡浠ｇ爜 + 杈呭姪灞炴��
- // sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;
- // Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo '" + sCaseNoNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰彇鏈�澶ф祦姘村彿
- // txtHCaseNo.Text = (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) + 1).ToString();
+ // sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;
// txtHCaseNo.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]).ToString();
// }
// }
@@ -1634,7 +1649,7 @@
//缃戞牸缂栬緫鍚庡鐞�
private void grdMain_CellEndEdit(object sender, DataGridViewCellEventArgs e)
{
- DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
if (e.ColumnIndex == HMinQtyCol)
{
RowCount(e.RowIndex, 0); //
@@ -1694,12 +1709,12 @@
}
private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
{
- DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
}
private void grdMain_Scroll(object sender, ScrollEventArgs e)
{
- DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
oSumGrid.DisplayCurRow();
}
@@ -1881,7 +1896,7 @@
private void grdSub_CellEndEdit(object sender, DataGridViewCellEventArgs e)
{
- DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
RowCount(e.RowIndex, 0); //璁＄畻 閲戦 鍗曚环
//
if (this.EditingControl != null) //閲婃斁浜嬩欢
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 4082b9e..f45ac67 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -3852,5 +3852,10 @@
MessageBox.Show("娓呯悊鏁版嵁搴撳牭濉炲け璐ワ紒" + sExeReturnInfo.Message);
}
}
+
+ private void back_Click(object sender, EventArgs e)
+ {
+ bc.Enabled = false;
+ }
}
}
\ No newline at end of file
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index 4f2c780..4de050c 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -44,6 +44,7 @@
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.kc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.clear = new System.Windows.Forms.ToolStripButton();
this.tb = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
@@ -110,7 +111,8 @@
this.grdSub = new System.Windows.Forms.DataGridView();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
- this.clear = new System.Windows.Forms.ToolStripButton();
+ this.back = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -149,6 +151,8 @@
this.toolStripSeparator3,
this.clear,
this.tb,
+ this.toolStripSeparator7,
+ this.back,
this.toolStripSeparator5,
this.tc,
this.toolStripSeparator12,
@@ -303,6 +307,21 @@
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
+ // clear
+ //
+ this.clear.AutoSize = false;
+ this.clear.Image = ((System.Drawing.Image)(resources.GetObject("clear.Image")));
+ this.clear.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.clear.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.clear.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.clear.Name = "clear";
+ this.clear.Size = new System.Drawing.Size(80, 47);
+ this.clear.Text = "娓呯悊鍫靛";
+ this.clear.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.clear.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.clear.ToolTipText = "娓呯悊鍫靛";
+ this.clear.Click += new System.EventHandler(this.clear_Click);
+ //
// tb
//
this.tb.AutoSize = false;
@@ -403,7 +422,7 @@
this.P1.Controls.Add(this.pb1);
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.Margin = new System.Windows.Forms.Padding(4);
this.P1.Name = "P1";
this.P1.Size = new System.Drawing.Size(1249, 200);
this.P1.TabIndex = 31;
@@ -411,7 +430,7 @@
// pic1
//
this.pic1.Location = new System.Drawing.Point(417, 4);
- this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4);
this.pic1.Name = "pic1";
this.pic1.Size = new System.Drawing.Size(104, 51);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -443,9 +462,9 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
this.gbUp.Size = new System.Drawing.Size(1189, 131);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
@@ -475,7 +494,7 @@
this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
this.cmdHGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
this.cmdHGroupID.Location = new System.Drawing.Point(356, 95);
- this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
this.cmdHGroupID.Name = "cmdHGroupID";
this.cmdHGroupID.Size = new System.Drawing.Size(29, 28);
this.cmdHGroupID.TabIndex = 105;
@@ -498,7 +517,7 @@
// txtHGroupID
//
this.txtHGroupID.Location = new System.Drawing.Point(135, 96);
- this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
this.txtHGroupID.Name = "txtHGroupID";
this.txtHGroupID.ReadOnly = true;
this.txtHGroupID.Size = new System.Drawing.Size(220, 25);
@@ -523,7 +542,7 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.cmbHWorksNumber.Name = "cmbHWorksNumber";
this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
this.cmbHWorksNumber.TabIndex = 100;
@@ -562,7 +581,7 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.cmbHOrgID.Name = "cmbHOrgID";
this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
this.cmbHOrgID.TabIndex = 85;
@@ -583,7 +602,7 @@
this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 59);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
this.cmbHBarCodeType.TabIndex = 81;
@@ -605,7 +624,7 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.cmdHEmpID.Name = "cmdHEmpID";
this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
this.cmdHEmpID.TabIndex = 79;
@@ -617,7 +636,7 @@
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, 58);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
this.cmdSourceBillNo.TabIndex = 42;
@@ -628,7 +647,7 @@
//
this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 59);
- this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
this.txtHSourceBillNo.TabIndex = 41;
@@ -651,7 +670,7 @@
this.cmbSourceBillType.FormattingEnabled = true;
this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.cmbSourceBillType.Location = new System.Drawing.Point(135, 59);
- this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
this.cmbSourceBillType.Name = "cmbSourceBillType";
this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
this.cmbSourceBillType.TabIndex = 36;
@@ -670,7 +689,7 @@
// pb1
//
this.pb1.Location = new System.Drawing.Point(829, 15);
- this.pb1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pb1.Margin = new System.Windows.Forms.Padding(4);
this.pb1.Name = "pb1";
this.pb1.Size = new System.Drawing.Size(341, 29);
this.pb1.TabIndex = 92;
@@ -700,7 +719,7 @@
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(55, 634);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1249, 116);
this.panel2.TabIndex = 32;
@@ -934,7 +953,7 @@
//
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.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(55, 688);
this.panel1.TabIndex = 33;
@@ -943,7 +962,7 @@
//
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.Margin = new System.Windows.Forms.Padding(4);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(52, 688);
this.panel3.TabIndex = 34;
@@ -958,7 +977,7 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
@@ -981,7 +1000,7 @@
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
this.grdSum.Location = new System.Drawing.Point(55, 610);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
@@ -994,7 +1013,7 @@
//
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.Margin = new System.Windows.Forms.Padding(4);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
@@ -1009,7 +1028,7 @@
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(55, 262);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1249, 348);
@@ -1019,9 +1038,9 @@
//
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.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
this.tabPage1.Size = new System.Drawing.Size(1241, 319);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
@@ -1031,9 +1050,9 @@
//
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.Margin = new System.Windows.Forms.Padding(4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
this.tabPage2.Size = new System.Drawing.Size(1241, 319);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
@@ -1049,7 +1068,7 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 30;
@@ -1063,7 +1082,7 @@
//
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.Margin = new System.Windows.Forms.Padding(4);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1241, 319);
this.tabPage3.TabIndex = 2;
@@ -1080,7 +1099,7 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
@@ -1088,20 +1107,24 @@
this.grdList.Size = new System.Drawing.Size(1241, 319);
this.grdList.TabIndex = 46;
//
- // clear
+ // back
//
- this.clear.AutoSize = false;
- this.clear.Image = ((System.Drawing.Image)(resources.GetObject("clear.Image")));
- this.clear.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.clear.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.clear.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.clear.Name = "clear";
- this.clear.Size = new System.Drawing.Size(80, 47);
- this.clear.Text = "娓呯悊鍫靛";
- this.clear.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.clear.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.clear.ToolTipText = "娓呯悊鍫靛";
- this.clear.Click += new System.EventHandler(this.clear_Click);
+ this.back.AutoSize = false;
+ this.back.Image = ((System.Drawing.Image)(resources.GetObject("back.Image")));
+ this.back.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.back.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.back.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.back.Name = "back";
+ this.back.Size = new System.Drawing.Size(35, 47);
+ this.back.Text = "鎭㈠";
+ this.back.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.back.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.back.Click += new System.EventHandler(this.back_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// Gy_BarCodeBill
//
@@ -1119,7 +1142,7 @@
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.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Gy_BarCodeBill";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1232,5 +1255,7 @@
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtHGroupID;
private System.Windows.Forms.ToolStripButton clear;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripButton back;
}
}
\ No newline at end of file
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
index 150696f..fd171cb 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
@@ -477,6 +477,15 @@
YII=
</value>
</data>
+ <data name="back.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+ </data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
--
Gitblit v1.9.1