From cb920f768593ea2d5c0483d4b1d7c73e5e2de0c0 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 19 一月 2022 17:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/报表分析/Kf_BarCodeOutInReport.resx | 28
LMES/ClsShowMod.cs | 7
WarM/报表分析/Kf_ICInventory_BarCode.designer.cs | 220 +-----
WarM/报表分析/WMS_BarCodeStatusQueryReport.cs | 2
WarM/报表分析/Kf_ICInventory_BarCode.cs | 768 ++++++-----------------
WarM/报表分析/Kf_ICInventory_BarCode.resx | 116 --
WarM/报表分析/Kf_BarCodeOutInReport.designer.cs | 484 ++++++++------
WarM/报表分析/Kf_BarCodeOutInReport.cs | 289 ++++----
8 files changed, 736 insertions(+), 1,178 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 7cfba28..9c1c509 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3879,6 +3879,13 @@
oKf_MateOutRequestBill.ShowDialog();
break;
//===================================报表分析
+ case "kf_icinventory_barcode":
+ Kf_ICInventory_BarCode oKf_ICInventory_BarCode = new Kf_ICInventory_BarCode();
+ oKf_ICInventory_BarCode.MdiParent = oMain;
+ oKf_ICInventory_BarCode.ModCaption = gnmc;
+ oKf_ICInventory_BarCode.Show();
+ oMainForm.AddTabPage(oKf_ICInventory_BarCode);
+ break;
case "wms_barcodestatusqueryreport":
WMS_BarCodeStatusQueryReport oWMS_BarCodeStatusQueryReport = new WMS_BarCodeStatusQueryReport();
oWMS_BarCodeStatusQueryReport.MdiParent = oMain;
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
index 8fb2595..e2effff 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
@@ -24,33 +24,38 @@
Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
- #region 鍥哄畾浠ｇ爜
+ #region 鍥哄畾浠ｇ爜
- private void initGrid()
+ private void Kf_BarCodeOutInReport_Load(object sender, EventArgs e)
{
- DBUtility.Xt_BaseBillFun.initGridRpt(grdMain, this.Name);
- }
-
- //寰楀埌瀵瑰簲鍒�
- private Int32 Fun_GetCol(string sCol)
- {
- return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ SetFormCaption();
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ //oSumGrid.oGridsum = grdSum;
+ dtpHBDate.Value = DateTime.Today;
+ dtpHEDate.Value = DateTime.Today;
+ //鍔犺浇鍗曟嵁绫诲瀷淇℃伅
+ Sub_AddBillTypeList();
}
- private void tc_Click(object sender, EventArgs e)
+ //鍔犺浇鍗曟嵁绫诲瀷淇℃伅
+ private void Sub_AddBillTypeList()
{
- this.Close();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeReport_BillType ", "h_p_WMS_BarCodeReport_BillType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇鍗曟嵁绫诲瀷澶辫触");
+ return;
+ }
+ cmbBillType.Items.Clear();
+ cmbBillType.Items.Add("鍏ㄩ儴");
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ cmbBillType.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBillTypeName"]));
+ }
+ cmbBillType.Text = "鍏ㄩ儴";
}
- //Kf_BarCodeOutInReportDlg oDlg = new Kf_BarCodeOutInReportDlg();
- private void cx_Click(object sender, EventArgs e)
- {
- //oDlg.ShowDialog();
- //if (oDlg.IsOk == 1)
- //{
- timer1.Enabled = true;
- //}
- }
//璁剧疆鎶ヨ〃鍚嶇О
private void SetFormCaption()
{
@@ -61,16 +66,16 @@
cmbBillType.SelectedIndex = 0;
}
-
- private void Frm_EasyReport_Load(object sender, EventArgs e)
+ private void initGrid()
{
- SetFormCaption();
- oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
- //oSumGrid.oGridsum = grdSum;
- dtpHBDate.Value = DateTime.Today;
- dtpHEDate.Value = DateTime.Today;
+ DBUtility.Xt_BaseBillFun.initGridRpt(grdMain, this.Name);
}
+ //鍒濆鍖栬〃澶存樉绀�
+ private void initHeadCaption()
+ {
+
+ }
private void timer1_Tick(object sender, EventArgs e)
{
@@ -88,45 +93,10 @@
}
}
- private void Xs_SellOutPriceReport_KeyUp(object sender, KeyEventArgs e)
+ private void timer2_Tick(object sender, EventArgs e)
{
- if (e.KeyValue == 13)
- timer1.Enabled = true;
- }
-
- private void mrlk_Click(object sender, EventArgs e)
- {
-
- DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
- }
-
- private void bclk_Click(object sender, EventArgs e)
- {
- //淇濆瓨鍒楀
- DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
- }
-
-
- //鎵撳嵃
- private void dy_Click(object sender, EventArgs e)
- {
- Sub_SetReport();
- Report.Print(true);
- }
- //棰勮
- private void view_Click(object sender, EventArgs e)
- {
- Sub_SetReport();
- Report.PrintPreview(true);
- }
-
- #endregion
-
- #region 鐣岄潰澶勭悊
- //鍒濆鍖栬〃澶存樉绀�
- private void initHeadCaption()
- {
-
+ timer2.Enabled = false;
+ timer1.Enabled = true;
}
private bool Fun_AllowQuery()//瀹℃牳鏌ヨ鏉′欢
@@ -139,43 +109,87 @@
return true;
}
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+
+ //寰楀埌瀵瑰簲鍒�
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ private void Xs_SellOutPriceReport_KeyUp(object sender, KeyEventArgs e)
+ {
+ if (e.KeyValue == 13)
+ timer1.Enabled = true;
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+
+ #endregion
+
+ #region 鏌ヨ鍔熻兘
+
+ private void cx_Click(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
private void Display()
{
ClsCN SubCn = new ClsCN();
DataSet DSet = new DataSet();
- //鏄剧ず鎶ヨ〃澶� 鏍囬
-
- //鏄剧ず杩囨护鏉′欢
-
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHMater.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHWHName.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHBatchNo.Text + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHBarCode.Text + "'";
sDlgWhere = sDlgWhere + ",'" + cmbBillType.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHBillNo.Text + "'";
- //sDlgWhere = sDlgWhere + ",'" + oDlg.cmbHSumType.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHBarCode.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMater.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHBatchNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHWHName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHSourceBillNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaker.Text + "'";
if (sDlgWhere.Trim().Length > 0)
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
}
- //杩囨护鏉′欢
- //string sWhere = "";
- //sWhere = sWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
- //sWhere = sWhere + "," + ClsPub.isLong(txtHCusID.Tag) + "";
- //sWhere = sWhere + ",3";
- //if (sWhere.Trim().Length > 0)
- //{
- // sWhere = sWhere.Substring(1, sWhere.Length - 1);
- //}
- //
- DSet = SubCn.RunProcReturn("exec h_p_Kf_BarCodeOutInReport " + sDlgWhere, "h_p_Kf_BarCodeOutInReport");
+
+ DSet = SubCn.RunProcReturn("exec h_p_Kf_BarCodeOutInReport_New " + sDlgWhere, "h_p_Kf_BarCodeOutInReport_New");
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -199,36 +213,9 @@
#endregion
- #region 鎵撳嵃璁剧疆
+ #region 瀵煎嚭鍔熻兘
- //鎵撳嵃璁剧疆
- GridppReport Report;
- //璁剧疆鎵撳嵃妯＄増璺緞
- private void Sub_SetReport()
- {
- Report = new GridppReport();
- Report.LoadFromFile(ClsPub.AppPath + @"\Report\搴旀敹娆炬槑缁嗚〃.grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- }
- //濉叆鍗曟嵁琛ㄥご淇℃伅
- private void ReportBeforePostRecord()//your report?kao
- {
- //Report.FieldByName("HDateItemID").AsString = lblHDateItemID.Text;
- //Report.FieldByName("CusNumber").AsString = lblHCusNumber.Text;
- //Report.FieldByName("CusName").AsString = lblHCusName.Text;
- //Report.FieldByName("BeginBalance").AsString = lblHBeginBalance.Text;
- }
- //濉叆鍗曟嵁鏄庣粏淇℃伅
- private void ReportFetchRecordByDataTable()
- {
- //BLL.Utility.FillRecordToReport(Report, grdMain, false);
- }
- #endregion
-
- #region 鏁版嵁瀵煎嚭
-
-
+ //寮曞嚭
private void yc_Click(object sender, EventArgs e)
{
//BLL.ClsPub_BLL.DataGridViewToExcel2(grdMain, this.Text);
@@ -321,46 +308,72 @@
}
}
+ //瀵煎嚭
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
#endregion
-
+ #region 閫�鍑哄姛鑳�
- private void timer2_Tick(object sender, EventArgs e)
+ private void tc_Click(object sender, EventArgs e)
{
- timer2.Enabled = false;
- //oDlg.ShowDialog();
- //if (oDlg.IsOk == 1)
- //{
- timer1.Enabled = true;
- //}
+ this.Close();
}
- private void Total()
+ #endregion
+
+ #region 鎵撳嵃鍔熻兘
+
+ //鎵撳嵃璁剧疆
+ GridppReport Report;
+
+ //棰勮
+ private void view_Click(object sender, EventArgs e)
{
- if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
- {
- oSumGrid.SetGridsum();
- oSumGrid.Total();
- }
+ Sub_SetReport();
+ Report.PrintPreview(true);
}
- private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ //鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
{
- Total();
+ Sub_SetReport();
+ Report.Print(true);
}
- private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ //璁剧疆鎵撳嵃妯＄増璺緞
+ private void Sub_SetReport()
{
- Total();
-
+ Report = new GridppReport();
+ Report.LoadFromFile(ClsPub.AppPath + @"\Report\搴旀敹娆炬槑缁嗚〃.grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
}
- private void grdMain_Paint(object sender, PaintEventArgs e)
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//your report?kao
{
- DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ //Report.FieldByName("HDateItemID").AsString = lblHDateItemID.Text;
+ //Report.FieldByName("CusNumber").AsString = lblHCusNumber.Text;
+ //Report.FieldByName("CusName").AsString = lblHCusName.Text;
+ //Report.FieldByName("BeginBalance").AsString = lblHBeginBalance.Text;
}
-
+ //濉叆鍗曟嵁鏄庣粏淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ //BLL.Utility.FillRecordToReport(Report, grdMain, false);
+ }
+
+ #endregion
+
+
+
+
+
+
}
}
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
index 2c8a4db..8c70245 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.designer.cs"
@@ -32,6 +32,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_BarCodeOutInReport));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.dc = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.dy = new System.Windows.Forms.ToolStripButton();
@@ -47,30 +48,36 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
- this.cmbBillType = new System.Windows.Forms.ComboBox();
- this.label10 = new System.Windows.Forms.Label();
- this.dtpHBDate = new System.Windows.Forms.DateTimePicker();
- this.dtpHEDate = new System.Windows.Forms.DateTimePicker();
- this.label5 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.txtHSPName = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.txtHWHName = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.txtHMater = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.txtHBatchNo = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.txtHBarCode = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
this.lblCaption = new System.Windows.Forms.Label();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.dtpHBDate = new System.Windows.Forms.DateTimePicker();
+ this.cmbBillType = new System.Windows.Forms.ComboBox();
+ this.txtHBarCode = new System.Windows.Forms.TextBox();
+ this.txtHBatchNo = new System.Windows.Forms.TextBox();
+ this.dtpHEDate = new System.Windows.Forms.DateTimePicker();
+ this.txtHMater = new System.Windows.Forms.TextBox();
+ this.txtHSPName = new System.Windows.Forms.TextBox();
+ this.txtHWHName = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// timer1
@@ -85,6 +92,7 @@
this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dc,
this.yl,
this.toolStripSeparator4,
this.dy,
@@ -106,6 +114,21 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(35, 42);
+ this.dc.Text = "瀵煎嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.ToolTipText = "瀵煎嚭";
+ this.dc.Click += new System.EventHandler(this.dc_Click);
//
// yl
//
@@ -251,181 +274,12 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.pPic.Controls.Add(this.txtHBillNo);
- this.pPic.Controls.Add(this.label8);
- this.pPic.Controls.Add(this.cmbBillType);
- this.pPic.Controls.Add(this.label10);
- this.pPic.Controls.Add(this.dtpHBDate);
- this.pPic.Controls.Add(this.dtpHEDate);
- this.pPic.Controls.Add(this.label5);
- this.pPic.Controls.Add(this.label6);
- this.pPic.Controls.Add(this.txtHSPName);
- this.pPic.Controls.Add(this.label3);
- this.pPic.Controls.Add(this.txtHWHName);
- this.pPic.Controls.Add(this.label2);
- this.pPic.Controls.Add(this.txtHMater);
- this.pPic.Controls.Add(this.label4);
- this.pPic.Controls.Add(this.txtHBatchNo);
- this.pPic.Controls.Add(this.label1);
- this.pPic.Controls.Add(this.txtHBarCode);
- this.pPic.Controls.Add(this.label7);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
this.pPic.Location = new System.Drawing.Point(0, 47);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1138, 53);
+ this.pPic.Size = new System.Drawing.Size(1138, 41);
this.pPic.TabIndex = 17;
- //
- // cmbBillType
- //
- this.cmbBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbBillType.FormattingEnabled = true;
- this.cmbBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.cmbBillType.Items.AddRange(new object[] {
- "鍏ㄩ儴",
- "澶栬喘鍏ュ簱",
- "浜у搧鍏ュ簱",
- "鐢熶骇棰嗘枡鍗�",
- "璋冩嫧鍗�",
- "鍏朵粬鍏ュ簱",
- "鍏朵粬鍑哄簱鍗�",
- "濮斿鍔犲伐鍏ュ簱鍗�",
- "濮斿鍔犲伐鍑哄簱鍗�"});
- this.cmbBillType.Location = new System.Drawing.Point(964, 2);
- this.cmbBillType.Name = "cmbBillType";
- this.cmbBillType.Size = new System.Drawing.Size(130, 20);
- this.cmbBillType.TabIndex = 62;
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(907, 6);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(53, 12);
- this.label10.TabIndex = 63;
- this.label10.Text = "鍗曟嵁绫诲瀷";
- //
- // dtpHBDate
- //
- this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(241, 2);
- this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(122, 21);
- this.dtpHBDate.TabIndex = 59;
- //
- // dtpHEDate
- //
- this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(241, 28);
- this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(122, 21);
- this.dtpHEDate.TabIndex = 61;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(179, 6);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(65, 12);
- this.label5.TabIndex = 58;
- this.label5.Text = "寮�濮嬫棩鏈燂細";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.BackColor = System.Drawing.Color.Transparent;
- this.label6.Location = new System.Drawing.Point(179, 32);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(65, 12);
- this.label6.TabIndex = 60;
- this.label6.Text = "缁撴潫鏃ユ湡锛�";
- //
- // txtHSPName
- //
- this.txtHSPName.Location = new System.Drawing.Point(588, 28);
- this.txtHSPName.Name = "txtHSPName";
- this.txtHSPName.Size = new System.Drawing.Size(130, 21);
- this.txtHSPName.TabIndex = 57;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(545, 32);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(47, 12);
- this.label3.TabIndex = 56;
- this.label3.Text = "浠� 浣嶏細";
- //
- // txtHWHName
- //
- this.txtHWHName.Location = new System.Drawing.Point(588, 2);
- this.txtHWHName.Name = "txtHWHName";
- this.txtHWHName.Size = new System.Drawing.Size(130, 21);
- this.txtHWHName.TabIndex = 55;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(545, 6);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(47, 12);
- this.label2.TabIndex = 54;
- this.label2.Text = "浠� 搴擄細";
- //
- // txtHMater
- //
- this.txtHMater.Location = new System.Drawing.Point(409, 2);
- this.txtHMater.Name = "txtHMater";
- this.txtHMater.Size = new System.Drawing.Size(130, 21);
- this.txtHMater.TabIndex = 53;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(367, 6);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(47, 12);
- this.label4.TabIndex = 52;
- this.label4.Text = "鐗� 鏂欙細";
- //
- // txtHBatchNo
- //
- this.txtHBatchNo.Location = new System.Drawing.Point(409, 28);
- this.txtHBatchNo.Name = "txtHBatchNo";
- this.txtHBatchNo.Size = new System.Drawing.Size(130, 21);
- this.txtHBatchNo.TabIndex = 51;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(367, 32);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(47, 12);
- this.label1.TabIndex = 50;
- this.label1.Text = "鎵� 鍙凤細";
- //
- // txtHBarCode
- //
- this.txtHBarCode.Location = new System.Drawing.Point(772, 28);
- this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(130, 21);
- this.txtHBarCode.TabIndex = 49;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.BackColor = System.Drawing.Color.Transparent;
- this.label7.Location = new System.Drawing.Point(724, 32);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 12);
- this.label7.TabIndex = 48;
- this.label7.Text = "鏉″舰鐮侊細";
//
// lblCaption
//
@@ -451,29 +305,238 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 100);
+ this.grdMain.Location = new System.Drawing.Point(0, 153);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1138, 353);
+ this.grdMain.Size = new System.Drawing.Size(1138, 300);
this.grdMain.TabIndex = 69;
+ //
+ // groupBox1
+ //
+ this.groupBox1.BackColor = System.Drawing.Color.Lavender;
+ this.groupBox1.Controls.Add(this.txtHSourceBillNo);
+ this.groupBox1.Controls.Add(this.txtHMaker);
+ this.groupBox1.Controls.Add(this.txtHBillNo);
+ this.groupBox1.Controls.Add(this.dtpHBDate);
+ this.groupBox1.Controls.Add(this.cmbBillType);
+ this.groupBox1.Controls.Add(this.txtHBarCode);
+ this.groupBox1.Controls.Add(this.txtHBatchNo);
+ this.groupBox1.Controls.Add(this.dtpHEDate);
+ this.groupBox1.Controls.Add(this.txtHMater);
+ this.groupBox1.Controls.Add(this.txtHSPName);
+ this.groupBox1.Controls.Add(this.txtHWHName);
+ this.groupBox1.Controls.Add(this.label9);
+ this.groupBox1.Controls.Add(this.label11);
+ this.groupBox1.Controls.Add(this.label8);
+ this.groupBox1.Controls.Add(this.label7);
+ this.groupBox1.Controls.Add(this.label10);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.label5);
+ this.groupBox1.Controls.Add(this.label6);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.groupBox1.Location = new System.Drawing.Point(0, 88);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(1138, 65);
+ this.groupBox1.TabIndex = 71;
+ this.groupBox1.TabStop = false;
+ //
+ // txtHSourceBillNo
+ //
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(623, 40);
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(122, 21);
+ this.txtHSourceBillNo.TabIndex = 69;
//
// txtHBillNo
//
- this.txtHBillNo.Location = new System.Drawing.Point(772, 2);
+ this.txtHBillNo.Location = new System.Drawing.Point(804, 14);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(130, 21);
+ this.txtHBillNo.Size = new System.Drawing.Size(122, 21);
this.txtHBillNo.TabIndex = 65;
+ //
+ // dtpHBDate
+ //
+ this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHBDate.Location = new System.Drawing.Point(79, 14);
+ this.dtpHBDate.Name = "dtpHBDate";
+ this.dtpHBDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHBDate.TabIndex = 59;
+ //
+ // cmbBillType
+ //
+ this.cmbBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbBillType.FormattingEnabled = true;
+ this.cmbBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbBillType.Items.AddRange(new object[] {
+ "鍏ㄩ儴"});
+ this.cmbBillType.Location = new System.Drawing.Point(993, 14);
+ this.cmbBillType.Name = "cmbBillType";
+ this.cmbBillType.Size = new System.Drawing.Size(122, 20);
+ this.cmbBillType.TabIndex = 62;
+ //
+ // txtHBarCode
+ //
+ this.txtHBarCode.Location = new System.Drawing.Point(623, 14);
+ this.txtHBarCode.Name = "txtHBarCode";
+ this.txtHBarCode.Size = new System.Drawing.Size(122, 21);
+ this.txtHBarCode.TabIndex = 49;
+ //
+ // txtHBatchNo
+ //
+ this.txtHBatchNo.Location = new System.Drawing.Point(253, 40);
+ this.txtHBatchNo.Name = "txtHBatchNo";
+ this.txtHBatchNo.Size = new System.Drawing.Size(122, 21);
+ this.txtHBatchNo.TabIndex = 51;
+ //
+ // dtpHEDate
+ //
+ this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHEDate.Location = new System.Drawing.Point(79, 40);
+ this.dtpHEDate.Name = "dtpHEDate";
+ this.dtpHEDate.Size = new System.Drawing.Size(122, 21);
+ this.dtpHEDate.TabIndex = 61;
+ //
+ // txtHMater
+ //
+ this.txtHMater.Location = new System.Drawing.Point(253, 14);
+ this.txtHMater.Name = "txtHMater";
+ this.txtHMater.Size = new System.Drawing.Size(122, 21);
+ this.txtHMater.TabIndex = 53;
+ //
+ // txtHSPName
+ //
+ this.txtHSPName.Location = new System.Drawing.Point(429, 40);
+ this.txtHSPName.Name = "txtHSPName";
+ this.txtHSPName.Size = new System.Drawing.Size(122, 21);
+ this.txtHSPName.TabIndex = 57;
+ //
+ // txtHWHName
+ //
+ this.txtHWHName.Location = new System.Drawing.Point(429, 14);
+ this.txtHWHName.Name = "txtHWHName";
+ this.txtHWHName.Size = new System.Drawing.Size(122, 21);
+ this.txtHWHName.TabIndex = 55;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.BackColor = System.Drawing.Color.Transparent;
+ this.label9.Location = new System.Drawing.Point(559, 44);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(65, 12);
+ this.label9.TabIndex = 68;
+ this.label9.Text = "婧愬崟鍗曞彿锛�";
//
// label8
//
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(724, 6);
+ this.label8.Location = new System.Drawing.Point(752, 18);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(53, 12);
this.label8.TabIndex = 64;
this.label8.Text = "鍗曟嵁鍙凤細";
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
+ this.label7.Location = new System.Drawing.Point(559, 18);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(65, 12);
+ this.label7.TabIndex = 48;
+ this.label7.Text = "鏉＄爜缂栧彿锛�";
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(931, 18);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(65, 12);
+ this.label10.TabIndex = 63;
+ this.label10.Text = "鍗曟嵁绫诲瀷锛�";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.BackColor = System.Drawing.Color.Transparent;
+ this.label1.Location = new System.Drawing.Point(209, 44);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(47, 12);
+ this.label1.TabIndex = 50;
+ this.label1.Text = "鎵� 鍙凤細";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(209, 18);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(47, 12);
+ this.label4.TabIndex = 52;
+ this.label4.Text = "鐗� 鏂欙細";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Location = new System.Drawing.Point(17, 18);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.TabIndex = 58;
+ this.label5.Text = "寮�濮嬫棩鏈燂細";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.BackColor = System.Drawing.Color.Transparent;
+ this.label6.Location = new System.Drawing.Point(17, 44);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(65, 12);
+ this.label6.TabIndex = 60;
+ this.label6.Text = "缁撴潫鏃ユ湡锛�";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.BackColor = System.Drawing.Color.Transparent;
+ this.label2.Location = new System.Drawing.Point(383, 18);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(47, 12);
+ this.label2.TabIndex = 54;
+ this.label2.Text = "浠� 搴擄細";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.BackColor = System.Drawing.Color.Transparent;
+ this.label3.Location = new System.Drawing.Point(383, 44);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(47, 12);
+ this.label3.TabIndex = 56;
+ this.label3.Text = "浠� 浣嶏細";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
+ this.label11.Location = new System.Drawing.Point(752, 44);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.TabIndex = 66;
+ this.label11.Text = "鍒跺崟浜猴細";
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.Location = new System.Drawing.Point(804, 40);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(122, 21);
+ this.txtHMaker.TabIndex = 67;
//
// Kf_BarCodeOutInReport
//
@@ -481,19 +544,22 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1138, 453);
this.Controls.Add(this.grdMain);
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
this.Name = "Kf_BarCodeOutInReport";
this.Text = "ReportTemplet";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- this.Load += new System.EventHandler(this.Frm_EasyReport_Load);
+ this.Load += new System.EventHandler(this.Kf_BarCodeOutInReport_Load);
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Xs_SellOutPriceReport_KeyUp);
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
this.pPic.ResumeLayout(false);
this.pPic.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -519,24 +585,30 @@
private System.Windows.Forms.Panel pPic;
private System.Windows.Forms.Label lblCaption;
private System.Windows.Forms.Timer timer2;
- public System.Windows.Forms.TextBox txtHBarCode;
- private System.Windows.Forms.Label label7;
private System.Windows.Forms.DataGridView grdMain;
- private System.Windows.Forms.TextBox txtHSPName;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.TextBox txtHWHName;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox txtHMater;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.TextBox txtHBatchNo;
- private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ public System.Windows.Forms.TextBox txtHSourceBillNo;
+ public System.Windows.Forms.TextBox txtHBillNo;
private System.Windows.Forms.DateTimePicker dtpHBDate;
+ private System.Windows.Forms.ComboBox cmbBillType;
+ public System.Windows.Forms.TextBox txtHBarCode;
+ private System.Windows.Forms.TextBox txtHBatchNo;
private System.Windows.Forms.DateTimePicker dtpHEDate;
+ private System.Windows.Forms.TextBox txtHMater;
+ private System.Windows.Forms.TextBox txtHSPName;
+ private System.Windows.Forms.TextBox txtHWHName;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
- private System.Windows.Forms.ComboBox cmbBillType;
- private System.Windows.Forms.Label label10;
- public System.Windows.Forms.TextBox txtHBillNo;
- private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ToolStripButton dc;
+ public System.Windows.Forms.TextBox txtHMaker;
+ private System.Windows.Forms.Label label11;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx"
index aa2e908..1f3411a 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.resx"
@@ -112,18 +112,18 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>98, 21</value>
</metadata>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>188, 21</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -251,6 +251,20 @@
p6K5iiiwHT0VzFKaLAdNRXMUUWA6eiuYoosB09FcxRRYDp6K5iiiwHT0VzFFFgOnormKKLAdPRXMUUWA
6eiuYoosB09FcxRRYDp6K5igUWA6eiuYoosB09FcxRRYDp6K5mkosB09FcxRRYDp6K5iiiwHT0VzFFFg
OnormKKLAf/Z
+</value>
+ </data>
+ <data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3902,10 +3916,10 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>266, 21</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>42</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs"
index 9ffb714..55b3f29 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.cs"
@@ -23,25 +23,140 @@
public string ViewName = "h_v_KF_ICInventoryList_WMS";
public string ModCaption = "鏉＄爜搴撳瓨鏌ヨ";
public const string ModName = "3302";
- public const string ModRightName = "Gy_BarCodeBillList";
- //public const string ModRightNameEdit = ModRightName + "_Edit";
- //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;
public string sDlgWhere = ""; //澶栫獥浣撻�掑叆
public int selectRow = 0;
Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
- //
+
+
+ #region 鍥哄畾浠ｇ爜
+
+ private void Kf_ICInventory_BarCode_Load(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
+ oSumGrid.oGridsum = grdSum;
+ lblCaption.Text = ModCaption;
+ initGrid();
+ }
+
private void initGrid()
{
- DBUtility.Xt_BaseBillFun.initGridList(grdMain,this.Name);
-
+ DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
grdMain.ReadOnly = false;
}
- //
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ initGrid();
+ }
+
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ timer2.Enabled = false;
+ if (sDlgWhere == "")
+ {
+ }
+ else
+ {
+ timer1.Enabled = true;
+ }
+ }
+
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ //鍚堣 new
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ Total();
+ }
+
+ //鍚堣 new
+ private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+ {
+ Total();
+ }
+
+ //鍚堣 new
+ private void Total()
+ {
+ if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
+ {
+ oSumGrid.SetGridsum();
+ oSumGrid.Total();
+ }
+ }
+
+ private void GraphLine()
+ {
+ //int MainIDCol = Fun_GetCol("hmainid");
+ //int SubIDCol = Fun_GetCol("hsubid");
+ //string s = frmCondition.cmbHComplete.Text;
+ //long n=0;
+ //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+ ////鏄剧ず
+ //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+ //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+ {
+ int sHQtyCol = Fun_GetCol("鏁伴噺");
+ int i = grdMain.CurrentCell.ColumnIndex;
+ if (i != sHQtyCol)
+ {
+ e.Cancel = true;
+ }
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ }
+
+ #endregion
+
+ #region 鏌ヨ鍔熻兘
+
+ //鏌ヨ
+ private void cx_Click(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ SetCondition(frmCondition, ViewName, this.Name);
+ frmCondition.ShowDialog();
+ if (frmCondition.Tag.ToString() == "OK")
+ {
+ Display();
+ }
+ }
+
+ public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+ {
+ frmCondition.Tag = "";
+ frmCondition.ViewName = ViewName;
+ frmCondition.ModName = Name;
+ }
private void Display()
{
@@ -79,551 +194,26 @@
//鍐荤粨
int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
string s = frmCondition.cmbHComplete.Text;
- DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
//鐢荤嚎
GraphLine();
-
Total();
- //
- }
- //
- private void timer1_Tick(object sender, EventArgs e)
- {
- timer1.Enabled = false;
- initGrid();
- //Sub_FastQuery();
- }
-
- private void tc_Click(object sender, EventArgs e)
- {
- this.Close();
- }
-
- private void sx_Click(object sender, EventArgs e)
- {
- timer1.Enabled = true;
- }
-
- private void dj_Click(object sender, EventArgs e)
- {
- Sub_ShowBill();
- }
- //鏄剧ず鍗曟嵁
- private void Sub_ShowBill()
- {
- //Int64 lngBillKey = 0;
- //if (grdMain.CurrentRow == null)
- // return;
- //lngBillKey =DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- //if (lngBillKey == 0)
- // return;
- //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- //{
- // oFrm = new Gy_ICBomBill();
- // oFrm.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
- // oFrm.BillOld = oBill;
- // oFrm.ShowDialog();
- // if (oFrm.BillChange)
- // {
- // if (MessageBox.Show("鍗曟嵁鍒楄〃宸茬粡鍙戠敓鍙樺寲,鏄惁鍒锋柊", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
- // {
- // timer1.Enabled = true;
- // }
- // }
- //}
- //else
- //{
- // MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
- //}
- //oBill = null;
- }
- //
- private Int32 Fun_GetCol(string sCol)
- {
- return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
- }
- //
- private void Kf_ICInventory_BarCode_Load(object sender, EventArgs e)
- {
- //
- frmCondition = new frmBillQueryCondition_New();
- this.Text = ModCaption;
- oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
- oSumGrid.oGridsum = grdSum;
- lblCaption.Text = ModCaption;
- initGrid();
- //鍒濆鍖栧揩閫熻繃婊�
- //dtpHBDate.Checked = false;
- //dtpHEDate.Checked = false;
- cmbHStatus.SelectedIndex = 0;
- }
-
- private void grdMain_DblClick(object sender, EventArgs e)
- {
- Sub_ShowBill();
- }
-
- private void cx_Click(object sender, EventArgs e)
- {
- frmCondition = new frmBillQueryCondition_New();
- SetCondition(frmCondition, ViewName, this.Name);
- frmCondition.ShowDialog();
- if (frmCondition.Tag.ToString() == "OK")
- {
- Display();
- //Sub_FastQuery();
- }
- }
-
- public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
- {
- frmCondition.Tag = "";
- frmCondition.ViewName = ViewName;
- frmCondition.ModName = Name;
- }
-
- private void xz_Click(object sender, EventArgs e)
- {
- //
- //oFrm = new Gy_ICBomBill();
- //oFrm.ShowDialog();
- }
-
- private void sc_Click(object sender, EventArgs e)
- {
- Sub_DeleteBill();
- }
- //鍒犻櫎
- private void Sub_DeleteBill()
- {
- // //缂栬緫鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true,DBUtility.ClsPub.CurUserName))
- // {
- // return;
- // }
- // //
- // Int64 lngBillKey = 0;
- // if (grdMain.CurrentRow == null)
- // return;
- // lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- // if (lngBillKey == 0)
- // return;
- // DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel)==DialogResult.OK)
- // {
- // if (oBill.omodel.HChecker != "")
- // {
- // MessageBox.Show("鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�", "鎻愮ず");
- // return;
- // }
- // if (!oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- // return;
- // }
- // else
- // {
- // Display();
- // }
-
- // }
- // }
- // else
- // {
- // MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
- // }
- }
-
- private void timer2_Tick(object sender, EventArgs e)
- {
- timer2.Enabled = false;
- if (sDlgWhere == "")
- {
- //frmCondition = new frmBillQueryCondition_New();
- //SetCondition(frmCondition, ViewName, this.Name);
- //frmCondition.ShowDialog();
- //if (frmCondition.Tag.ToString() == "OK")
- //{
- // timer1.Enabled = true;
- //}
- //Sub_FastQuery();
- }
- else
- {
- timer1.Enabled = true;
- }
- }
-
-
-
- private void bclk_Click(object sender, EventArgs e)
- {
- //淇濆瓨鍒楀
- DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
- }
-
- private void mrlk_Click(object sender, EventArgs e)
- {
- DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
- }
- //
- private void GraphLine()
- {
- //int MainIDCol = Fun_GetCol("hmainid");
- //int SubIDCol = Fun_GetCol("hsubid");
- //string s = frmCondition.cmbHComplete.Text;
- //long n=0;
- //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
- ////鏄剧ず
- //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
- //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
- }
- //瀹℃牳
- private void sh_Click(object sender, EventArgs e)
- {
- ////this.Sub_CheckBill();
- //if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //if (grdMain.CurrentRow == null)
- // return;
- //DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- //if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- //{
- // return;
- //}
- //for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- //{
- // if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- // {
- // if (!oBar.UnCancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- // {
- // MessageBox.Show("鍙嶄綔搴熷け璐ワ紒", "鎻愮ず");
- // return;
- // }
- // }
- //}
- //MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
- //Sub_FastQuery();
- }
-
- //瀹℃牳鍗曟嵁
- private void Sub_CheckBill()
- {
- //瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //
- Int64 lngBillKey = 0;
- if (grdMain.CurrentRow == null)
- return;
- lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- if (lngBillKey == 0)
- return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HChecker.Trim() != "")
- {
- MessageBox.Show("鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳", "鎻愮ず");
- return;
- }
- }
- else
- {
- MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //瀹℃牳
- if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("瀹℃牳鎴愬姛!", "鎻愮ず");
- return;
- }
- else
- {
- MessageBox.Show("瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- }
- //鍙嶅鍗曟嵁
- private void Sub_AbandonCheck()
- {
- //瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //
- Int64 lngBillKey = 0;
- if (grdMain.CurrentRow == null)
- return;
- lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
- if (lngBillKey == 0)
- return;
- DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
- //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HChecker.Trim() == "")
- {
- MessageBox.Show("鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!", "鎻愮ず");
- return;
- }
- }
- else
- {
- MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- //鍙嶅鏍�
- if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- MessageBox.Show("鍙嶅鏍告垚鍔�!", "鎻愮ず");
- return;
- }
- else
- {
- MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
- return;
- }
- }
- //浣滃簾
- private void qsh_Click(object sender, EventArgs e)
- {
- ////Sub_AbandonCheck();
- //if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // return;
- //}
- //if (grdMain.CurrentRow == null)
- // return;
- //DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
- //if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
- //{
- // return;
- //}
- //for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- //{
- // if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
- // {
- // if (!oBar.Cancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value)))
- // {
- // MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
- // return;
- // }
- // }
- //}
- //MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
- //Sub_FastQuery();
- }
-
- private void GraphicsGrid()
- {
- DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
- }
-
- #region //鎵撳嵃璁剧疆
-
- GridppReport Report;
- //棰勮
- private void yl_Click(object sender, EventArgs e)
- {
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("鎵撳嵃娆℃暟")].Value) > 0)
- {
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(ModRightNamePrint, 1, false, DBUtility.ClsPub.CurUserName))
- {
- MessageBox.Show("鎵�閫夋潯鐮佸凡缁忔墦鍗帮紝鎮ㄦ病鏈夋潈闄愶紝涓嶈兘閲嶅鎵撳嵃锛�");
- return;
- }
- }
- }
- //閫夋嫨鎵撳嵃妯℃澘
- string sErr = "";
- 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)
- {
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- selectRow = i;
- Sub_SetReport(oFrm.sOpenTmp);
- Report.PrintPreview(false);
- //oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- //
- }
- }
- }
-
- private void Sub_SetReport(string sOpenTmp)
- {
- //鍒ゆ柇琛屾暟
- //
- Report = new GridppReport();
- Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- }
-
- //濉叆鍗曟嵁琛ㄥご淇℃伅
- private void ReportBeforePostRecord()//your report?kao
- {
- Report.FieldByName("鏉＄爜缂栧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
- Report.FieldByName("鏁伴噺").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏁伴噺")].Value);
- Report.FieldByName("鍗曚綅").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁￠噺鍗曚綅")].Value);
- Report.FieldByName("鍏ュ簱鏃ユ湡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏃ユ湡")].Value);
- //鎴愬搧
- Report.FieldByName("瀹㈡埛鍚嶇О").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("寰�鏉ュ崟浣�")].Value);
- Report.FieldByName("浜у搧浠ｇ爜").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
- Report.FieldByName("浜у搧鍥惧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
- Report.FieldByName("浜у搧鍚嶇О").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
- Report.FieldByName("鍖呰鏂瑰紡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍖呰鏂瑰紡")].Value);
- Report.FieldByName("鐢熶骇璁″垝").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("婧愬崟鍗曞彿")].Value);
- Report.FieldByName("鎴愬搧鎵规").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎵瑰彿")].Value);
- Report.FieldByName("鐢熶骇杞﹂棿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐢熶骇杞﹂棿")].Value);
- Report.FieldByName("鐢熶骇鍛ㄦ湡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐢熶骇鍛ㄦ湡")].Value);
- //鍘熸枡
- Report.FieldByName("渚涘簲鍟嗗悕绉�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("寰�鏉ュ崟浣�")].Value);
- Report.FieldByName("鐗╂枡浠ｇ爜").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value);
- Report.FieldByName("鐗屽彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
- Report.FieldByName("鍨嬪彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
- Report.FieldByName("鐐夊彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐐夊彿")].Value);
- Report.FieldByName("鐗╂枡鎵规").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎵瑰彿")].Value);
- if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("灏炬暟")].Value) == "灏炬暟")
- {
- Report.FieldByName("灏炬暟").AsString = "/////////////////////////";
- }
- else
- {
- Report.FieldByName("灏炬暟").AsString = "";
- }
- }
-
- private void ReportFetchRecordByDataTable()
- {
- BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("鏉＄爜缂栧彿"));
}
#endregion
- //
- private void grdMain_Paint(object sender, PaintEventArgs e)
- {
- GraphicsGrid();
- }
- //鍚堣 new
- private void Total()
- {
- if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
- {
- oSumGrid.SetGridsum();
- oSumGrid.Total();
- }
- }
- //鍚堣 new
- private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
- {
- Total();
- }
- //鍚堣 new
- private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
- {
- Total();
- }
-
- private void dy_Click(object sender, EventArgs e)
- {
- //閫夋嫨鎵撳嵃妯℃澘
- 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)
- {
- //
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- selectRow = i;
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(false);
- oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- }
- }
- }
-
- private void dy2_Click(object sender, EventArgs e)
- {
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("鎵撳嵃娆℃暟")].Value) > 0)
- {
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(ModRightNamePrint, 1, false, DBUtility.ClsPub.CurUserName))
- {
- MessageBox.Show("鎵�閫夋潯鐮佸凡缁忔墦鍗帮紝鎮ㄦ病鏈夋潈闄愶紝涓嶈兘閲嶅鎵撳嵃锛�");
- 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)
- {
- //
- for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
- {
- selectRow = i;
- Sub_SetReport(oFrm.sOpenTmp);
- Report.Print(false);
- oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value));
- //
- //Thread.Sleep(300);
- }
- }
- }
-
- private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
- {
- int sHQtyCol = Fun_GetCol("鏁伴噺");
- int i = grdMain.CurrentCell.ColumnIndex;
- if (i != sHQtyCol)
- {
- e.Cancel = true;
- }
- }
+ #region 蹇�熸煡璇�
//蹇�熻繃婊�
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ Sub_FastQuery();
+ }
+
private void Sub_FastQuery()
{
string sFastSQL = "";
- //鐗╂枡
- //if (cmbHStatus.Text.Trim() == "姝ｅ父")
- //{
- // sFastSQL = sFastSQL + " and hstopflag=0 ";
- //}
- //else
- //{
- // sFastSQL = sFastSQL + " and hstopflag=1 ";
- //}
//鐗╂枡
if (txtHMater.Text.Trim() != "")
{
@@ -659,11 +249,11 @@
sDlgWhere = "";
}
- private void btnOK_Click(object sender, EventArgs e)
- {
- Sub_FastQuery();
- }
+ #endregion
+ #region 瀵煎嚭鍔熻兘
+
+ //寮曞嚭
private void yc_Click(object sender, EventArgs e)
{
//BLL.ClsPub_BLL.DataGridViewToExcel2(grdMain, this.Text);
@@ -756,6 +346,88 @@
}
}
+ //瀵煎嚭
+ private void dc_Click(object sender, EventArgs e)
+ {
+ DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+ }
+
+ #endregion
+
+ #region 閫�鍑哄姛鑳�
+
+ //閫�鍑哄姛鑳�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ #endregion
+
+ #region 鎵撳嵃鍔熻兘
+
+ GridppReport Report;
+
+ //棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ 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)
+ {
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ selectRow = i;
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ }
+ }
+ }
+
+ //鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ 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)
+ {
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ selectRow = i;
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(false);
+ }
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()
+ {
+ //Report.FieldByName("鏉＄爜缂栧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+
+ private void ReportFetchRecordByDataTable()
+ {
+ BLL.Utility.FillRecordToReport(Report, grdMain, grdPrint, Fun_GetCol("鏉＄爜缂栧彿"));
+ }
+
+ #endregion
+
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
index 4a9e1f9..55716a2 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.designer.cs"
@@ -37,19 +37,10 @@
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
- this.dy2 = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.yc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
- this.sx = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.xz = new System.Windows.Forms.ToolStripButton();
- this.dj = new System.Windows.Forms.ToolStripButton();
- this.sc = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.sh = new System.Windows.Forms.ToolStripButton();
- this.qsh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -63,8 +54,6 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.cmbHStatus = new System.Windows.Forms.ComboBox();
- this.label5 = new System.Windows.Forms.Label();
this.txtHSPName = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtHWHName = new System.Windows.Forms.TextBox();
@@ -77,6 +66,8 @@
this.label1 = new System.Windows.Forms.Label();
this.btnOK = new System.Windows.Forms.Button();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.dc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -91,8 +82,6 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.pPic.Controls.Add(this.cmbHStatus);
- this.pPic.Controls.Add(this.label5);
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
@@ -149,19 +138,12 @@
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dy,
- this.dy2,
this.yl,
+ this.toolStripSeparator1,
+ this.dc,
this.yc,
this.toolStripSeparator2,
this.cx,
- this.sx,
- this.toolStripSeparator1,
- this.xz,
- this.dj,
- this.sc,
- this.toolStripSeparator5,
- this.sh,
- this.qsh,
this.toolStripSeparator4,
this.tc,
this.toolStripSeparator3,
@@ -192,21 +174,6 @@
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Visible = false;
this.dy.Click += new System.EventHandler(this.dy_Click);
- //
- // dy2
- //
- this.dy2.AutoSize = false;
- this.dy2.Image = ((System.Drawing.Image)(resources.GetObject("dy2.Image")));
- this.dy2.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dy2.ImageTransparentColor = System.Drawing.Color.White;
- this.dy2.Name = "dy2";
- this.dy2.Size = new System.Drawing.Size(36, 47);
- this.dy2.Text = "杩炴墦";
- this.dy2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dy2.Visible = false;
- this.dy2.Click += new System.EventHandler(this.dy2_Click);
//
// yl
//
@@ -256,111 +223,10 @@
this.cx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.cx.Click += new System.EventHandler(this.cx_Click);
//
- // sx
- //
- this.sx.AutoSize = false;
- this.sx.Image = ((System.Drawing.Image)(resources.GetObject("sx.Image")));
- this.sx.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sx.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sx.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sx.Name = "sx";
- this.sx.Size = new System.Drawing.Size(36, 47);
- this.sx.Text = "鍒锋柊";
- this.sx.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sx.Click += new System.EventHandler(this.sx_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator1.Visible = false;
- //
- // xz
- //
- this.xz.AutoSize = false;
- this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
- this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.xz.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.xz.Name = "xz";
- this.xz.Size = new System.Drawing.Size(36, 47);
- this.xz.Text = "鏂板";
- this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.xz.Visible = false;
- this.xz.Click += new System.EventHandler(this.xz_Click);
- //
- // dj
- //
- this.dj.AutoSize = false;
- this.dj.Image = ((System.Drawing.Image)(resources.GetObject("dj.Image")));
- this.dj.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dj.ImageTransparentColor = System.Drawing.Color.White;
- this.dj.Name = "dj";
- this.dj.Size = new System.Drawing.Size(36, 47);
- this.dj.Text = "鍗曟嵁";
- this.dj.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dj.Visible = false;
- this.dj.Click += new System.EventHandler(this.dj_Click);
- //
- // sc
- //
- this.sc.AutoSize = false;
- this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
- this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sc.Name = "sc";
- this.sc.Size = new System.Drawing.Size(36, 47);
- this.sc.Text = "鍒犻櫎";
- this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sc.Visible = false;
- this.sc.Click += new System.EventHandler(this.sc_Click);
- //
- // toolStripSeparator5
- //
- this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
- //
- // sh
- //
- this.sh.AutoSize = false;
- this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
- this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sh.Name = "sh";
- this.sh.Size = new System.Drawing.Size(40, 47);
- this.sh.Text = "鍙嶄綔搴�";
- this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sh.Visible = false;
- this.sh.Click += new System.EventHandler(this.sh_Click);
- //
- // qsh
- //
- this.qsh.AutoSize = false;
- this.qsh.Image = ((System.Drawing.Image)(resources.GetObject("qsh.Image")));
- this.qsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.qsh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.qsh.Name = "qsh";
- this.qsh.Size = new System.Drawing.Size(36, 47);
- this.qsh.Text = "浣滃簾";
- this.qsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.qsh.Visible = false;
- this.qsh.Click += new System.EventHandler(this.qsh_Click);
- //
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator4.Visible = false;
//
// tc
//
@@ -449,11 +315,10 @@
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(1011, 382);
this.grdMain.TabIndex = 19;
- this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
// grdPrint
//
@@ -486,32 +351,9 @@
this.groupBox1.TabIndex = 51;
this.groupBox1.TabStop = false;
//
- // cmbHStatus
- //
- this.cmbHStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbHStatus.FormattingEnabled = true;
- this.cmbHStatus.Items.AddRange(new object[] {
- "姝ｅ父",
- "浣滃簾"});
- this.cmbHStatus.Location = new System.Drawing.Point(265, 7);
- this.cmbHStatus.Name = "cmbHStatus";
- this.cmbHStatus.Size = new System.Drawing.Size(68, 20);
- this.cmbHStatus.TabIndex = 20;
- this.cmbHStatus.Visible = false;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(230, 11);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(41, 12);
- this.label5.TabIndex = 19;
- this.label5.Text = "鐘舵�侊細";
- this.label5.Visible = false;
- //
// txtHSPName
//
- this.txtHSPName.Location = new System.Drawing.Point(745, 13);
+ this.txtHSPName.Location = new System.Drawing.Point(743, 14);
this.txtHSPName.Name = "txtHSPName";
this.txtHSPName.Size = new System.Drawing.Size(130, 21);
this.txtHSPName.TabIndex = 18;
@@ -527,7 +369,7 @@
//
// txtHWHName
//
- this.txtHWHName.Location = new System.Drawing.Point(572, 13);
+ this.txtHWHName.Location = new System.Drawing.Point(571, 14);
this.txtHWHName.Name = "txtHWHName";
this.txtHWHName.Size = new System.Drawing.Size(130, 21);
this.txtHWHName.TabIndex = 16;
@@ -535,7 +377,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(530, 18);
+ this.label2.Location = new System.Drawing.Point(531, 18);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(47, 12);
this.label2.TabIndex = 15;
@@ -551,7 +393,7 @@
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(357, 19);
+ this.label6.Location = new System.Drawing.Point(359, 18);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 12);
this.label6.TabIndex = 13;
@@ -567,7 +409,7 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(13, 19);
+ this.label4.Location = new System.Drawing.Point(15, 18);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(47, 12);
this.label4.TabIndex = 11;
@@ -575,7 +417,7 @@
//
// txtHBatchNo
//
- this.txtHBatchNo.Location = new System.Drawing.Point(227, 13);
+ this.txtHBatchNo.Location = new System.Drawing.Point(227, 14);
this.txtHBatchNo.Name = "txtHBatchNo";
this.txtHBatchNo.Size = new System.Drawing.Size(130, 21);
this.txtHBatchNo.TabIndex = 1;
@@ -583,7 +425,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(187, 19);
+ this.label1.Location = new System.Drawing.Point(187, 18);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(47, 12);
this.label1.TabIndex = 0;
@@ -591,7 +433,7 @@
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(877, 13);
+ this.btnOK.Location = new System.Drawing.Point(880, 13);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(73, 24);
this.btnOK.TabIndex = 6;
@@ -613,6 +455,27 @@
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
this.grdSum.Size = new System.Drawing.Size(1011, 19);
this.grdSum.TabIndex = 52;
+ //
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(36, 47);
+ this.dc.Text = "瀵煎嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.ToolTipText = "瀵煎嚭";
+ this.dc.Click += new System.EventHandler(this.dc_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Visible = false;
//
// Kf_ICInventory_BarCode
//
@@ -652,14 +515,9 @@
private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripButton cx;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton tc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
public System.Windows.Forms.Timer timer1;
- private System.Windows.Forms.ToolStripButton sx;
- private System.Windows.Forms.ToolStripButton dj;
- private System.Windows.Forms.ToolStripButton xz;
- private System.Windows.Forms.ToolStripButton sc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
@@ -667,16 +525,12 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
- private System.Windows.Forms.ToolStripButton sh;
- private System.Windows.Forms.ToolStripButton qsh;
private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbljl;
private System.Windows.Forms.Label lbldj;
private System.Windows.Forms.DataGridView grdPrint;
private System.Windows.Forms.ToolStripButton dy;
- private System.Windows.Forms.ToolStripButton dy2;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.TextBox txtHBatchNo;
@@ -689,9 +543,9 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtHWHName;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.ComboBox cmbHStatus;
- private System.Windows.Forms.Label label5;
private System.Windows.Forms.ToolStripButton yc;
private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.ToolStripButton dc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx"
index 3eca290..47bfc22 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ICInventory_BarCode.resx"
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Qk22QAMAAAAAADYAAAAoAAAAFQMAAFoAAAABABgAAAAAAAAAAADDDgAAww4AAAAAAAAAAAAA////////
@@ -3675,7 +3675,7 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3924,16 +3924,6 @@
u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
</data>
- <data name="dy2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
- jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
- grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
- FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
- u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
-</value>
- </data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -3945,6 +3935,20 @@
NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3971,84 +3975,6 @@
oXs9qiieYFzuPSiSvmMYkef5B9h5hyvM1NoFGlmIXFPo6IWcJv9h5clA7oepFQ4HHLTFi7svsPoMG2+Q
UtDPT4GC2XgTpCe5X/YktlNs733486C5AJ9FHdrrRaLxARuoscFuuEjwX1RQNqzRzWXDfhTy670qMY7z
BdYeeKA8svstAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
- ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
- e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
- 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
- zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
- RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
- /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
- uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
- GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
- ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
- BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
- WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
- U5njFPWGMF5qmIOIl3UlCAOTbm5E4yrKv0jTLfPWrcw1hZyXAELfmMAbHzEFJRupxj0QBc4gm681xAr/
- nRXgGp7hgffIJ4aj2VI005zvvMoyg2icvXqTe9AzOMXFq2RcUsSSYlwekee6+dVMQHf/BBfP4Ri+fFgi
- Vhzwt5no6h3lh8e3KD69yyy6dYIC8KI5x3x0cmb9SB3OId68f5Hw/jXCItisPSCqVxzy/c3kSduNgB4z
- 4CeZgPY6YH2HPGk7QGOLA8trG7C8xhJRVlVvhqTZ3t0z+8YseUw3wBfmDAtHelBh/AAAAABJRU5ErkJg
- gg==
-</value>
- </data>
- <data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
- BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
- CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
- tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
- cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
- iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
- wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
- GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
- gwcDBhOOzp0wW+zoGpmG0bxBE1U2tAX/ocWVjQRY27JDenzClUtC39g8Dk4dcFzf0RuXw+nC+uZOMKCg
- vI4avgPupUfg4wPWaEb2yVeLOGN5JVX08B3ARcFt+SBbAfnVBMgprKDmUIBOJgeaIr4sgr6avxEgK7+U
- mkOuIIsgxeEBVsJcGblF1PgTgMZODQuwMj5XenYBNa5a9+CWAZe3bvTo5uhO2Zn/xgmLOwWSKSbg8r4D
- 954XXNxIVNP4IszPVAtIwBrJKWmIjE1AlCoR0aokxMQnYWLGqEAoKIv3+mrGGPsEfOpdAqh7YNYAAAAA
- SUVORK5CYII=
-</value>
- </data>
- <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
- d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
- hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
- M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
- cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
- gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
- SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
- 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
- C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
- TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
- 4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
- RjjfEubPT+xYiFFjlN6zugecWJq08TevKzWQkoPwiYMgbkzu2dzeO4ztwzNENPYgx3bJSI2IfwA9+QbK
- GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
- XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
- PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
</value>
</data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4091,13 +4017,13 @@
AAAASUVORK5CYII=
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>102, 16</value>
</metadata>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>37</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs"
index 4cf7951..3d1325f 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/WMS_BarCodeStatusQueryReport.cs"
@@ -77,7 +77,7 @@
private void Sub_AddBillTypeList()
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeStatusQuery_BillType ", "h_p_WMS_BarCodeStatusQuery_BillType");
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeReport_BillType ", "h_p_WMS_BarCodeReport_BillType");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鑾峰彇鍗曟嵁绫诲瀷澶辫触");
--
Gitblit v1.9.1