From 11d20b4fb7a3e97c88477f78f1f5393238e2f3a3 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期三, 20 一月 2021 13:53:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes
---
SCM/条码打印/Gy_BarCodeBill.cs | 5
SCM/单据资料/Sc_ICMOReportToBarCode.cs | 115 ++++++++++------------
SCM/单据资料/Gy_BarCodeDetailList.cs | 14 --
SCM/单据资料/Sc_ICMOReportToBarCode.designer.cs | 29 -----
SCM/单据资料/Sc_ICMOReportToBarCode.resx | 16 +-
SCM/生产管理/Gy_BadReasonList.resx | 4
SCM/单据资料/Gy_BarCodeMain.Designer.cs | 79 +++++----------
SCM/单据资料/Gy_BarCodeMain.cs | 5 -
8 files changed, 92 insertions(+), 175 deletions(-)
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeDetailList.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeDetailList.cs"
index 27217b6..5c923df 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeDetailList.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeDetailList.cs"
@@ -64,18 +64,8 @@
whereBuilder.Append(" and d.FNUMBER like ''%"+textBox1.Text+"%''");
if (!string.IsNullOrEmpty(textBox2.Text))
whereBuilder.Append(" and b.FLOT_TEXT like ''%"+textBox2.Text+"%''");
- if (comboBox1.Text != "鍏ㄩ儴")
- {
- if(comboBox1.Text=="鍚堟牸鍝�")
- {
- whereBuilder.Append(" and c.HProdLev=''''");
- }
- else
- {
- whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text + "''");
- }
-
- }
+ if(comboBox1.Text!="鍏ㄩ儴")
+ whereBuilder.Append(" and c.HProdLev=''" + comboBox1.Text+"''");
if (!string.IsNullOrEmpty(textBox4.Text))
whereBuilder.Append(" and g.HName like ''%"+textBox4.Text+"%''");
if (!string.IsNullOrEmpty(textBox5.Text))
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs"
index 95711ac..20afaf3 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs"
@@ -48,14 +48,12 @@
this.lbldj = new System.Windows.Forms.Label();
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
- this.yl = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
- this.comboBox1 = new System.Windows.Forms.ComboBox();
- this.label8 = new System.Windows.Forms.Label();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.groupBox1.SuspendLayout();
this.pPic.SuspendLayout();
@@ -71,7 +69,7 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(0, 232);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
@@ -82,8 +80,6 @@
// groupBox1
//
this.groupBox1.BackColor = System.Drawing.Color.Lavender;
- this.groupBox1.Controls.Add(this.comboBox1);
- this.groupBox1.Controls.Add(this.label8);
this.groupBox1.Controls.Add(this.dateTimePicker2);
this.groupBox1.Controls.Add(this.dateTimePicker1);
this.groupBox1.Controls.Add(this.label9);
@@ -96,9 +92,9 @@
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(0, 103);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(1277, 129);
this.groupBox1.TabIndex = 56;
this.groupBox1.TabStop = false;
@@ -146,7 +142,7 @@
// textBox2
//
this.textBox2.Location = new System.Drawing.Point(628, 75);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(172, 25);
this.textBox2.TabIndex = 16;
@@ -164,7 +160,7 @@
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(365, 75);
- this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(172, 25);
this.textBox1.TabIndex = 14;
@@ -182,7 +178,7 @@
// txtHBillNo
//
this.txtHBillNo.Location = new System.Drawing.Point(96, 76);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.Size = new System.Drawing.Size(172, 25);
this.txtHBillNo.TabIndex = 12;
@@ -206,7 +202,7 @@
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
this.pPic.Location = new System.Drawing.Point(0, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
this.pPic.Size = new System.Drawing.Size(1277, 41);
this.pPic.TabIndex = 55;
@@ -217,7 +213,7 @@
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(1096, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(181, 41);
this.panel1.TabIndex = 7;
@@ -276,25 +272,6 @@
this.Tool.TabIndex = 54;
this.Tool.Text = "toolStrip1";
//
- // yl
- //
- this.yl.AutoSize = false;
- this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
- this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.yl.Name = "yl";
- this.yl.Size = new System.Drawing.Size(35, 42);
- this.yl.Text = "寮曞嚭";
- this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.yl.Click += new System.EventHandler(this.yl_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
- //
// cx
//
this.cx.AutoSize = false;
@@ -334,28 +311,24 @@
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
- // comboBox1
+ // yl
//
- this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Items.AddRange(new object[] {
- "鍏ㄩ儴",
- "宸叉楠�",
- "鏈楠�"});
- this.comboBox1.Location = new System.Drawing.Point(907, 75);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(172, 23);
- this.comboBox1.TabIndex = 35;
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(35, 42);
+ this.yl.Text = "寮曞嚭";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.yl.Click += new System.EventHandler(this.yl_Click);
//
- // label8
+ // toolStripSeparator1
//
- this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(818, 80);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(82, 15);
- this.label8.TabIndex = 34;
- this.label8.Text = "妫�楠岀姸鍐碉細";
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// Gy_BarCodeMain
//
@@ -408,7 +381,5 @@
private System.Windows.Forms.Label label11;
private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ComboBox comboBox1;
- private System.Windows.Forms.Label label8;
}
}
\ No newline at end of file
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs"
index 955413d..9d397c0 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.cs"
@@ -16,7 +16,6 @@
InitializeComponent();
dateTimePicker1.Text = DateTime.Now.AddDays(-7).ToString();
dateTimePicker2.Text = DateTime.Now.ToString();
- comboBox1.SelectedItem = "鍏ㄩ儴";
oWeb.Url = SCM.ClsPub1.WEBSURL;
}
public frmBillQueryCondition_Base frmCondition;
@@ -50,10 +49,6 @@
whereBuilder.Append(" and e.FNUMBER like ''%"+textBox1.Text+"%''");
if (!string.IsNullOrEmpty(textBox2.Text))
whereBuilder.Append(" and c.HMaterName like ''%"+textBox2.Text+"%''");
- if (comboBox1.Text == "宸叉楠�")
- whereBuilder.Append(" and c.HMaterName is not null");
- else if(comboBox1.Text=="鏈楠�")
- whereBuilder.Append(" and c.HMaterName is null");
var execSql = "exec "+ViewName+" '"+whereBuilder+"'";
DataSet DSet = oWeb.getDataSetBySQL(execSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
index 8a5a5ce..ac2d277 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.cs"
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -68,7 +68,7 @@
oWeb.Url = SCM.ClsPub1.WEBSURL;
//
frmCondition = new frmBillQueryCondition_Base();
- this.Text = ModCaption;
+ this.Text = ModCaption;
oSumGrid.ogrdMain = grdSub; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
@@ -77,7 +77,7 @@
cmbFQMB.Items.Add(this.Text);
cmbFQMB.SelectedIndex = 0;
- if(DBUtility.ClsPub.CurUserName.ToLower()=="admin")
+ if (DBUtility.ClsPub.CurUserName.ToLower() == "admin")
{
txtHDQQty.ReadOnly = false;
txtHKSQty.ReadOnly = false;
@@ -114,7 +114,7 @@
//鏃堕棿鎺т欢
private void timer1_Tick(object sender, EventArgs e)
{
- timer1.Enabled=false;
+ timer1.Enabled = false;
Sub_ClearBill();
}
@@ -122,7 +122,7 @@
{
timer2.Enabled = false;
//
- if (ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini").Contains("娌℃湁鎵惧埌")==false)
+ if (ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini").Contains("娌℃湁鎵惧埌") == false)
{
txtPortName.Text = ClsIni.ReadIni("COMINFO", "txtPortName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
txtBaudRate.Text = ClsIni.ReadIni("COMINFO", "txtBaudRate", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
@@ -244,7 +244,7 @@
txtHSYQty.Text = oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
txtHKSQty.Text = lblHNowQty.Text;
txtHDQQty.Text = lblHNowQty.Text;
- if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text)>0)
+ if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text) > 0)
{
txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1);
}
@@ -255,7 +255,7 @@
DisplayMain();
//DisplaySub();
}
- catch(Exception e)
+ catch (Exception e)
{
MessageBox.Show("璇诲彇澶辫触锛�" + e.Message);
}
@@ -268,7 +268,7 @@
string sSql = "";
string sWhere = "";
//杩囨护鏉′欢
- sSql = " exec h_p_Sc_ICMOReportToBarCode_All '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();
+ sSql = " exec h_p_Sc_ICMOReportToBarCode_All '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();
//
DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_All", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
@@ -278,7 +278,7 @@
return;
}
//
- if (DSet.Tables[0].Rows.Count>0)
+ if (DSet.Tables[0].Rows.Count > 0)
{
grdMain.DataSource = DSet.Tables[0].DefaultView;
}
@@ -297,7 +297,7 @@
ClsPub1.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
/////////////////////////////
txtHRelationQty.Text = DBUtility.ClsPub.isDoule(DSet.Tables[2].Rows[0]["鍏宠仈鏁伴噺"], 1);
- if(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text)>=0)
+ if (DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text) >= 0)
{
txtHSYQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text), 1);
}
@@ -315,7 +315,7 @@
string sWhere = "";
//杩囨护鏉′欢
sSql = " exec h_p_Sc_ICMOReportToBarCode_Sub '" + HSourceBillTypeID + "'," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString();
-
+
//
DSet = oWeb.getDataSetBySQL(sSql, "h_p_Sc_ICMOReportToBarCode_Sub", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
@@ -347,12 +347,12 @@
//棰勮
int CurRows = 0;
-
-
-
-
+
+
+
+
#endregion
@@ -366,11 +366,11 @@
if (oDept.RefreshView(sWhere))
{
this.txtHDeptID.Text = oDept.oModel.HName;
- this.txtHDeptID.Tag = oDept.oModel.HItemID.ToString();
+ this.txtHDeptID.Tag = oDept.oModel.HItemID.ToString();
}
else
{
- this.txtHDeptID.Text = "";
+ this.txtHDeptID.Text = "";
}
}
@@ -517,19 +517,19 @@
// cmdHSaveBill.Enabled = true;
// return false;
//}
- if (DBUtility.ClsPub.isLong(txtHEmpID.Tag) == 0 || DBUtility.ClsPub.isLong(txtHEmpID2.Tag) == 0 )
+ if (DBUtility.ClsPub.isLong(txtHEmpID.Tag) == 0 || DBUtility.ClsPub.isLong(txtHEmpID2.Tag) == 0)
{
MessageBox.Show("鑱屽憳1鎴栬�呰亴鍛�2娌℃湁閫夋嫨锛�");
cmdHSaveBill.Enabled = true;
return false;
}
- if (DBUtility.ClsPub.isLong(txtHGroupID.Tag) == 0 )
+ if (DBUtility.ClsPub.isLong(txtHGroupID.Tag) == 0)
{
MessageBox.Show("鐝粍娌℃湁閫夋嫨锛�");
cmdHSaveBill.Enabled = true;
return false;
}
-
+
//鏍规嵁婧愬崟 鐢熸垚鏉″舰鐮� 骞朵繚瀛樺鏁版嵁搴�
HNumber = DBUtility.ClsPub.isStrNull(txtHMaterName.Tag);
@@ -552,12 +552,10 @@
else if (sType == "Sample")
{
sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text) + "B";
- txtHCheckerResult.Text = "";
}
else
{
sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
- txtHCheckerResult.Text = "";
}
//sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
@@ -682,11 +680,11 @@
+ ",'" + HPressModel + "','" + HCusModel + "','" + HMaterialModel + "','" + HColor + "','" + sDate + "'"
+ ",'" + HLogo + "','" + HPackageSize + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + ",'" + HCustomBatchNo + "'"
+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HBeginDate.ToShortDateString() + "','" + HSeOrderBillNo + "','" + HGBBarCode + "'"
- + ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag)
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + txtHReasonList.Text + "','"+ HRemark + "')";
+ + ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag)
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + txtHReasonList.Text + "','" + HRemark + "')";
oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);
-
+
//鍒锋柊鐣岄潰
DisplayMain();
//DisplaySub();
@@ -700,7 +698,7 @@
{
Report.Print(false);
}
-
+
Thread.Sleep(500);
if (HSourceBillType != "鐢熶骇姹囨姤鍗�")
@@ -733,7 +731,7 @@
private void Sub_SetReport(string sOpenTmp)
{
//鍒ゆ柇琛屾暟
-
+
Report = new GridppReport();
Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
@@ -774,7 +772,6 @@
Report.FieldByName("缁勫憳").AsString = ClsPub.isStrNull(txtHEmpID.Text) + ";" + ClsPub.isStrNull(txtHEmpID2.Text) + ";" + ClsPub.isStrNull(txtHEmpID3.Text);
Report.FieldByName("鏁伴噺").AsString = ClsPub.isStrNull(txtHSJQty.Text);
Report.FieldByName("鏃х墿鏂欑紪鐮�").AsString = ClsPub.isStrNull(txtHOldMaterNumber.Text);
- Report.FieldByName("涓嶈壇鍘熷洜").AsString = ClsPub.isStrNull(txtHCheckerResult.Text);
//Report.FieldByName("婧愬崟鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value);
//Report.FieldByName("閿�鍞鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value);
//Report.FieldByName("鐢熶骇杞﹂棿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HDeptName2Col].Value);
@@ -839,7 +836,7 @@
{
if (!ComDevice.IsOpen)
{
-
+
try
{
ComDevice.PortName = txtPortName.Text;
@@ -864,7 +861,7 @@
default:
break;
}
-
+
ComDevice.DataBits = int.Parse(txtDataBits.Text);
switch (cmbStopBits.SelectedItem.ToString())
{
@@ -883,14 +880,14 @@
default:
break;
}
-
- ComDevice.Open();
+
+ ComDevice.Open();
lblComStatus.Text = "涓插彛鐘舵�侊細寮�鍚�";
timer3.Enabled = true;
}
catch (Exception ex)
{
- MessageBox.Show("鎵撳紑涓插彛澶辫触锛�" + ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("鎵撳紑涓插彛澶辫触锛�" + ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
}
@@ -931,19 +928,19 @@
{
if (!ComDevice.IsOpen)
{
-
+
}
else
{
try
{
- ComDevice.Close();
+ ComDevice.Close();
lblComStatus.Text = "涓插彛鐘舵�侊細鍏抽棴";
timer3.Enabled = false;
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
}
@@ -952,7 +949,7 @@
//璁惧娓呴浂
private void cmdHSetZero_Click(object sender, EventArgs e)
{
- cmdHSetZero.Enabled=false;
+ cmdHSetZero.Enabled = false;
byte[] sendData = strToHexByte(txtHSend0.Text);
SendData(sendData);
txtHSJQty.Text = "0";
@@ -980,13 +977,13 @@
}
- /// <summary>
+ /// <summary>
/// 鍙戦�佹暟鎹�
/// </summary>
/// <param name="sender"></param>
/// <param name="data"></param>
public bool SendData(byte[] data)
- {
+ {
if (ComDevice.IsOpen)
{
try
@@ -996,7 +993,7 @@
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show(ex.Message, "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
finally
{
@@ -1005,7 +1002,7 @@
}
else
{
- MessageBox.Show("涓插彛鏈墦寮�", "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("涓插彛鏈墦寮�", "閿欒", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
return false;
}
@@ -1066,7 +1063,7 @@
// {
// newStr = strArr[4];
// }
-
+
// }
// if (string.IsNullOrEmpty(newStr))
// {
@@ -1137,7 +1134,7 @@
if (strArr[4] != "00")
{
char[] bw = strArr[4].ToCharArray();
- if(bw[0]=='0')
+ if (bw[0] == '0')
{
newStr = bw[1].ToString();
}
@@ -1145,7 +1142,7 @@
{
newStr = strArr[4];
}
-
+
}
if (string.IsNullOrEmpty(newStr))
{
@@ -1163,12 +1160,12 @@
{
newStr += strArr[5];
}
- if (strArr[6] != "00"&&newStr=="00")
+ if (strArr[6] != "00" && newStr == "00")
{
//newStr = $"0.{strArr[6]}";
newStr = "0." + strArr[6];
}
- if(strArr[6]!="00"&&newStr!="00")
+ if (strArr[6] != "00" && newStr != "00")
{
//newStr += $".{strArr[6]}";
newStr = newStr + "." + strArr[6];
@@ -1181,7 +1178,7 @@
//灏嗗綋鍓嶆暟 鍘樼背 杞寲涓� 绫�
- double NewQty = DBUtility.ClsPub.isDoule(newStr) ;
+ double NewQty = DBUtility.ClsPub.isDoule(newStr);
if (NewQty <= 0)
{
newStr = "0";
@@ -1199,12 +1196,12 @@
lblHRelQty.Text = txtHSJQty.Text;
}
else
- {
+ {
txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 1); //瀹為檯绫虫暟= 褰撳墠绫虫暟-寮�濮嬬背鏁�
- lblHRelQty.Text = txtHSJQty.Text;
+ lblHRelQty.Text = txtHSJQty.Text;
}
}
-
+
//鍒犻櫎閫変腑鐨勮鏁�
private void btnFQSH_Click(object sender, EventArgs e)
{
@@ -1233,10 +1230,10 @@
if (lngBillKey == 0)
return;
try
- {
+ {
oWeb.getRunProc("Delete from Gy_BarCodeBill where HItemID=" + lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
oWeb.getRunProc("insert into System_log values(GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.CurUserName + "','鍒犻櫎鏉＄爜锛�" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉″舰鐮�")].Value) + "' ,'WMS绯荤粺','','鍒犻櫎')", ref DBUtility.ClsPub.sExeReturnInfo);
-
+
}
catch (Exception e)
{
@@ -1257,7 +1254,7 @@
}
private void cmdHSaveInfo_Click(object sender, EventArgs e)
- {
+ {
ClsIni.WriteIni("COMINFO", "txtPortName", DBUtility.ClsPub.isStrNull(txtPortName.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
ClsIni.WriteIni("COMINFO", "txtBaudRate", DBUtility.ClsPub.isStrNull(txtBaudRate.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
ClsIni.WriteIni("COMINFO", "cmbParity", DBUtility.ClsPub.isStrNull(cmbParity.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
@@ -1266,7 +1263,7 @@
ClsIni.WriteIni("COMINFO", "txtHSend0", DBUtility.ClsPub.isStrNull(txtHSend0.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
ClsIni.WriteIni("COMINFO", "txtHSend", DBUtility.ClsPub.isStrNull(txtHSend.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
ClsIni.WriteIni("COMINFO", "txtHSourceID", DBUtility.ClsPub.isStrNull(txtHSourceID.Text), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
- ClsIni.WriteIni("COMINFO", "txtHSourceIDTag", DBUtility.ClsPub.isStrNull(txtHSourceID.Tag), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
+ ClsIni.WriteIni("COMINFO", "txtHSourceIDTag", DBUtility.ClsPub.isStrNull(txtHSourceID.Tag), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
}
private void btnBLHB_Click(object sender, EventArgs e)
@@ -1277,8 +1274,6 @@
{
txtHReasonList.Text = "";
txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;
- txtHCheckerResult.Text = "";
- txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;
if (SaveBadReasonBill())
{
MessageBox.Show("淇濆瓨涓嶈壇鍘熷洜鎴愬姛锛�");
@@ -1381,7 +1376,7 @@
txtHReasonList.Text = "";
return false;
}
- catch(Exception e1)
+ catch (Exception e1)
{
MessageBox.Show(e1.Message);
return false;
@@ -1411,8 +1406,6 @@
{
txtHReasonList.Text = "";
txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;
- txtHCheckerResult.Text = "";
- txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;
oGy_BadReasonList = null;
if (SaveBill("SaveDown"))
{
@@ -1428,12 +1421,12 @@
MessageBox.Show("淇濆瓨涓嶈壇鍘熷洜澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo);
}
}
-
+
}
private void cmdHGroupID_Click(object sender, EventArgs e)
{
- SCM.ClsIF_Group_View oGroup= new SCM.ClsIF_Group_View();
+ SCM.ClsIF_Group_View oGroup = new SCM.ClsIF_Group_View();
string sWhere = "";
if (oGroup.RefreshView(sWhere))
{
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs"
index c191fd3..099a8f1 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.designer.cs"
@@ -155,8 +155,6 @@
this.label12 = new System.Windows.Forms.Label();
this.button4 = new System.Windows.Forms.Button();
this.timer3 = new System.Windows.Forms.Timer(this.components);
- this.txtHCheckerResult = new System.Windows.Forms.TextBox();
- this.label33 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
@@ -168,7 +166,6 @@
((System.ComponentModel.ISupportInitialize)(this.grdEmp)).BeginInit();
this.groupBox4.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -893,8 +890,6 @@
// tabPage4
//
this.tabPage4.BackColor = System.Drawing.Color.Lavender;
- this.tabPage4.Controls.Add(this.label33);
- this.tabPage4.Controls.Add(this.txtHCheckerResult);
this.tabPage4.Controls.Add(this.label15);
this.tabPage4.Controls.Add(this.cmbHOrgID);
this.tabPage4.Controls.Add(this.label3);
@@ -1667,27 +1662,6 @@
this.timer3.Interval = 300;
this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
//
- // txtHCheckerResult
- //
- this.txtHCheckerResult.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtHCheckerResult.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCheckerResult.Location = new System.Drawing.Point(795, 96);
- this.txtHCheckerResult.Name = "txtHCheckerResult";
- this.txtHCheckerResult.ReadOnly = true;
- this.txtHCheckerResult.Size = new System.Drawing.Size(166, 30);
- this.txtHCheckerResult.TabIndex = 151;
- //
- // label33
- //
- this.label33.AutoSize = true;
- this.label33.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label33.ForeColor = System.Drawing.Color.Black;
- this.label33.Location = new System.Drawing.Point(714, 102);
- this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(72, 16);
- this.label33.TabIndex = 152;
- this.label33.Text = "涓嶈壇娓呭崟";
- //
// Sc_ICMOReportToBarCode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1724,7 +1698,6 @@
this.panel1.ResumeLayout(false);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
@@ -1869,7 +1842,5 @@
private System.Windows.Forms.TextBox txtHEmpID3;
private System.Windows.Forms.Button cmdZero;
private System.Windows.Forms.Button cmdSaveAndDown2;
- private System.Windows.Forms.Label label33;
- private System.Windows.Forms.TextBox txtHCheckerResult;
}
}
\ No newline at end of file
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx"
index 3702151..3a1c07f 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Sc_ICMOReportToBarCode.resx"
@@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.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/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -387,10 +387,10 @@
AAAASUVORK5CYII=
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>102, 16</value>
</metadata>
- <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>191, 16</value>
</metadata>
<data name="cmdHEmp3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -718,10 +718,10 @@
FIYcEAA7
</value>
</data>
- <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>292, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>39</value>
</metadata>
</root>
\ No newline at end of file
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 404b65b..09f8d62 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"
@@ -92,7 +92,6 @@
public const Int16 HJiaYeLXCol = 71;
public const Int16 HJiaYeLCol = 72;
public const Int16 POOrderBillNoCol = 73;
- public const Int16 HMaker = 74;
public Int16 HSelectCol = 0;
public Int16 HSno2Col = 1;
@@ -1538,7 +1537,7 @@
{
grdMain.RowCount = 0;
grdSub.RowCount = 0;
- grdMain.ColumnCount = 75; //鎬诲垪鏁�
+ grdMain.ColumnCount = 74; //鎬诲垪鏁�
ClsPub1.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1606,7 +1605,6 @@
grdMain.Columns[HJiaYeLXCol].HeaderText = "鍒跺喎娑茬被鍨�";
grdMain.Columns[HJiaYeLCol].HeaderText = "鍔犳恫閲�";
grdMain.Columns[POOrderBillNoCol].HeaderText = "閲囪喘璁㈠崟鍙�";
- grdMain.Columns[HMaker].HeaderText = "鍒跺崟浜�";
////
//鏍煎紡鍖� 闅愯棌鍒�
grdMain.Columns[HTagCol].Visible = false;
@@ -2617,7 +2615,6 @@
grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
- grdMain.Rows[i].Cells[HMaker].Value = ClsPub.CurUserName;
if (CampanyName == "鍦ｉ緳") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
{
diff --git "a/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx" "b/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx"
index d58980a..19dc0dd 100644
--- "a/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx"
+++ "b/SCM/\347\224\237\344\272\247\347\256\241\347\220\206/Gy_BadReasonList.resx"
@@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
--
Gitblit v1.9.1