From d15ca20186d19b7b572b25d337a772edc11eaf81 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 25 七月 2023 14:25:06 +0800
Subject: [PATCH] 称重入库模块修改:扫流转卡时带出客户物料名称,写入条码档案;生成条码时增加界面输入克重与物料维护克重对比预警

---
 WarM/条码打印/Kf_WeighToBarCode.designer.cs |  253 ++++++++++++++++++++++++++++++--------------------
 WarM/条码打印/Kf_WeighToBarCode.cs          |   41 +++++++-
 2 files changed, 188 insertions(+), 106 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
index 5c18417..1a57d9c 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
@@ -38,6 +38,7 @@
         public Int64 ProcessExchangeInterID = 0;
         public Int64 HSupID = 0;
         public double HSourceQty = 0;
+        public double HMaterWeight = 0;         //鐗╂枡鍏嬮噸
         public string HMaker = DBUtility.ClsPub.CurUserName;
         public Int64 HStockOrgID = DBUtility.ClsPub.HOrgID;
         public DateTime HDate = DateTime.Today;
@@ -313,8 +314,8 @@
             bool b = false;
             for (int i = 0; i < grdMain.RowCount; i++)
             {
-                    b = true;
-                    break;
+                b = true;
+                break;
             }
             if (b == false)
             {
@@ -337,7 +338,16 @@
                 oCn.BeginTran();
                 //鐢熸垚鍑哄叆搴撳崟鎹�
                 //鎻掑叆瀛愯〃
-                oCn.RunProc("EXEC h_p_Kf_ProductInBillSub_Insert_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HSourceBillType + "'");
+                DataSet ds = oCn.RunProcReturn("EXEC h_p_Kf_ProductInBillSub_Insert_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HSourceBillType + "'", "h_p_Kf_ProductInBillSub_Insert_New");
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                }
+                else if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) != "OK")
+                {
+                    oCn.RollBack();
+                    MessageBox.Show("鐢熸垚鍏ュ簱鍗曞け璐ワ紝褰撳墠绉伴噸璁板綍鍒楄〃鏃犳暟鎹紝涓嶅厑璁告崲鐝敓鎴愬崟鎹紒", "鎻愮ず");
+                    return false;
+                }
                 //鎻掑叆涓昏〃
                 oCn.RunProc("Insert Into Kf_ICStockBillMain " +
                     "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
@@ -541,6 +551,18 @@
                 MessageBox.Show("鐗╂枡榛樿浠撳簱鍚敤浜嗕粨浣嶏紝浣嗘湭璁剧疆浠撲綅锛岃幏鍙栦粨浣嶄俊鎭け璐ワ紝璇峰厛璁剧疆鐗╂枡榛樿浠撲綅锛�", "鎻愮ず");
                 return false;
             }
+            //瀹為檯鍏嬮噸瓒呭嚭鐧惧垎涔嬩簩鍗佹垨鑰呬笉瓒冲師鏈殑鐧惧垎涔嬪叓鍗侊紝璇锋鏌ヨ緭鍏ョ殑鏁版嵁鏄惁鐪熺‘
+            else if (DBUtility.ClsPub.isDoule(txtHWeightQyt.Text)> HMaterWeight*1.2 || DBUtility.ClsPub.isDoule(txtHWeightQyt.Text) < HMaterWeight * 0.8)
+            {
+                if (MessageBox.Show("鐗╂枡缁存姢鍏嬮噸涓猴細"+HMaterWeight.ToString()+ "锛屽疄闄呰緭鍏ュ厠閲嶄负锛�" + DBUtility.ClsPub.isStrNull(txtHWeightQyt.Text) + "锛屾墍杈撳叆瀹為檯鍏嬮噸瓒呭嚭鐗╂枡缁存姢鍏嬮噸鐨勭櫨鍒嗕箣浜屽崄鎴栦笉瓒崇墿鏂欑淮鎶ゅ厠閲嶇殑鐧惧垎涔嬪叓鍗侊紝璇锋鏌ヨ緭鍏ョ殑鏁版嵁鏄惁姝g‘锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
             return true;
         }
 
@@ -610,6 +632,8 @@
             string ProcessExchangeBillNo = "";
             Int64 HBarcodeNo = 0;       //鍖呮暟
             Int64 HBadReasonID = 0;     //涓嶈壇鍘熷洜ID
+            string HCusMaterName = "";  //瀹㈡埛鐗╂枡鍚嶇О
+            string HCusModel = "";      //瀹㈡埛瑙勬牸鍨嬪彿
 
             HBarCode = TM;
             HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text);
@@ -623,11 +647,13 @@
             ProcessExchangeBillNo = DBUtility.ClsPub.isStrNull(txtHBillNo.Text);
             HBarcodeNo = DBUtility.ClsPub.isLong(txtHBarcodeNo.Text);
             HBadReasonID = DBUtility.ClsPub.isLong(txtHRemark.Tag);
+            HCusMaterName = DBUtility.ClsPub.isStrNull(txtHCusMaterName.Text);
+            HCusModel = DBUtility.ClsPub.isStrNull(txtHCusModel.Text);
 
             try
             {
                 oCn.BeginTran();
-                //鍐欏叆鏉$爜妗f
+                //鍐欏叆鏉$爜妗f    (瀹㈡埛鐗╂枡鍚嶇ОHCusMaterName瀛樺叆HMaterialModel瀛楁锛屽鎴疯鏍煎瀷鍙稨CusModel瀛樺叆HCusModel瀛楁
                 oCn.RunProc("Insert into Gy_BarCodeBill " +
                 "(HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                 ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
@@ -635,7 +661,7 @@
                 ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                 ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty " +
                 ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag " +
-                ",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1 " +
+                ",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
                 ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
                 ") Values ("
                 + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
@@ -644,7 +670,7 @@
                 + ", 1," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                 + ", 0,'',getdate(),'','" + sDate + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString()
                 + ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0"
-                + ", " + ProcessExchangeInterID.ToString() + ",0,'" + ProcessExchangeBillNo + "'," + HBadReasonID.ToString()
+                + ", " + ProcessExchangeInterID.ToString() + ",0,'" + ProcessExchangeBillNo + "'," + HBadReasonID.ToString() + ",'" + HCusMaterName + "','" + HCusModel + "'"
                 + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','')");
 
                 //鍥炲~鏈�澶ф祦姘村彿
@@ -695,6 +721,8 @@
             txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鐗╂枡鍚嶇О")].Value);
             txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("瑙勬牸鍨嬪彿")].Value);
             txtHBatchNo.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鎵瑰彿")].Value);
+            txtHCusMaterName.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HCusMaterName")].Value);
+            txtHCusModel.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HCusModel")].Value);
             HAuxPropID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HAuxPropID")].Value);
             HUnitID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HUnitID")].Value);
             HWhID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HWhID")].Value);
@@ -707,6 +735,7 @@
             HSourceQty = DBUtility.ClsPub.isDoule(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鏁伴噺")].Value);
             ProcessExchangeInterID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("ProcessExchangeInterID")].Value);
             HSupID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSupID")].Value);
+            HMaterWeight = DBUtility.ClsPub.isDoule(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterWeight")].Value);
         }
 
         //杩斿洖婧愬崟鍒楄〃淇℃伅
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
index 5094230..df54f15 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
@@ -30,8 +30,8 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.Tool = new System.Windows.Forms.ToolStrip();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             this.mrlk = new System.Windows.Forms.ToolStripButton();
@@ -55,6 +55,14 @@
             this.label4 = new System.Windows.Forms.Label();
             this.txtHMaterNumber = new System.Windows.Forms.TextBox();
             this.gbUp = new System.Windows.Forms.GroupBox();
+            this.label15 = new System.Windows.Forms.Label();
+            this.txtHCusModel = new System.Windows.Forms.TextBox();
+            this.label16 = new System.Windows.Forms.Label();
+            this.txtHCusMaterName = new System.Windows.Forms.TextBox();
+            this.label13 = new System.Windows.Forms.Label();
+            this.txtHBarcodeNo = new System.Windows.Forms.TextBox();
+            this.cmdHBadReasonID = new System.Windows.Forms.Button();
+            this.chkHDYFlag = new System.Windows.Forms.CheckBox();
             this.cmdFZF = new System.Windows.Forms.Button();
             this.cmdZF = new System.Windows.Forms.Button();
             this.txtHDeptName = new System.Windows.Forms.TextBox();
@@ -90,10 +98,6 @@
             this.涓棿 = new System.Windows.Forms.Panel();
             this.搴曢儴 = new System.Windows.Forms.Panel();
             this.鍙充晶 = new System.Windows.Forms.Panel();
-            this.chkHDYFlag = new System.Windows.Forms.CheckBox();
-            this.cmdHBadReasonID = new System.Windows.Forms.Button();
-            this.label13 = new System.Windows.Forms.Label();
-            this.txtHBarcodeNo = new System.Windows.Forms.TextBox();
             this.Tool.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
             this.gbUp.SuspendLayout();
@@ -266,14 +270,14 @@
             this.grdMain.AllowUserToDeleteRows = false;
             this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
             this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.grdMain.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;
             this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.grdMain.Location = new System.Drawing.Point(3, 3);
             this.grdMain.Margin = new System.Windows.Forms.Padding(0);
@@ -281,7 +285,7 @@
             this.grdMain.ReadOnly = true;
             this.grdMain.RowHeadersWidth = 51;
             this.grdMain.RowTemplate.Height = 23;
-            this.grdMain.Size = new System.Drawing.Size(1091, 409);
+            this.grdMain.Size = new System.Drawing.Size(1091, 377);
             this.grdMain.TabIndex = 19;
             this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
             // 
@@ -290,7 +294,7 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(437, 60);
+            this.label2.Location = new System.Drawing.Point(442, 60);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 49;
@@ -300,7 +304,7 @@
             // 
             this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMaterModel.Location = new System.Drawing.Point(492, 56);
+            this.txtHMaterModel.Location = new System.Drawing.Point(498, 56);
             this.txtHMaterModel.Name = "txtHMaterModel";
             this.txtHMaterModel.ReadOnly = true;
             this.txtHMaterModel.Size = new System.Drawing.Size(128, 21);
@@ -311,7 +315,7 @@
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(47, 116);
+            this.label3.Location = new System.Drawing.Point(63, 148);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(29, 12);
             this.label3.TabIndex = 52;
@@ -321,10 +325,9 @@
             // 
             this.txtHRemark.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHRemark.Location = new System.Drawing.Point(102, 112);
+            this.txtHRemark.Location = new System.Drawing.Point(95, 144);
             this.txtHRemark.Name = "txtHRemark";
-            this.txtHRemark.ReadOnly = true;
-            this.txtHRemark.Size = new System.Drawing.Size(691, 21);
+            this.txtHRemark.Size = new System.Drawing.Size(705, 21);
             this.txtHRemark.TabIndex = 53;
             // 
             // label4
@@ -332,7 +335,7 @@
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(47, 60);
+            this.label4.Location = new System.Drawing.Point(39, 60);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(53, 12);
             this.label4.TabIndex = 55;
@@ -342,7 +345,7 @@
             // 
             this.txtHMaterNumber.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMaterNumber.Location = new System.Drawing.Point(102, 56);
+            this.txtHMaterNumber.Location = new System.Drawing.Point(95, 56);
             this.txtHMaterNumber.Name = "txtHMaterNumber";
             this.txtHMaterNumber.ReadOnly = true;
             this.txtHMaterNumber.Size = new System.Drawing.Size(128, 21);
@@ -351,6 +354,10 @@
             // gbUp
             // 
             this.gbUp.BackColor = System.Drawing.Color.Transparent;
+            this.gbUp.Controls.Add(this.label15);
+            this.gbUp.Controls.Add(this.txtHCusModel);
+            this.gbUp.Controls.Add(this.label16);
+            this.gbUp.Controls.Add(this.txtHCusMaterName);
             this.gbUp.Controls.Add(this.label13);
             this.gbUp.Controls.Add(this.txtHBarcodeNo);
             this.gbUp.Controls.Add(this.cmdHBadReasonID);
@@ -386,15 +393,100 @@
             this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
             this.gbUp.Location = new System.Drawing.Point(0, 0);
             this.gbUp.Name = "gbUp";
-            this.gbUp.Size = new System.Drawing.Size(1105, 186);
+            this.gbUp.Size = new System.Drawing.Size(1105, 218);
             this.gbUp.TabIndex = 58;
             this.gbUp.TabStop = false;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label15.ForeColor = System.Drawing.Color.Black;
+            this.label15.Location = new System.Drawing.Point(224, 116);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(77, 12);
+            this.label15.TabIndex = 322;
+            this.label15.Text = "瀹㈡埛瑙勬牸鍨嬪彿";
+            // 
+            // txtHCusModel
+            // 
+            this.txtHCusModel.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtHCusModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.txtHCusModel.Location = new System.Drawing.Point(303, 112);
+            this.txtHCusModel.Name = "txtHCusModel";
+            this.txtHCusModel.ReadOnly = true;
+            this.txtHCusModel.Size = new System.Drawing.Size(128, 21);
+            this.txtHCusModel.TabIndex = 323;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label16.ForeColor = System.Drawing.Color.Black;
+            this.label16.Location = new System.Drawing.Point(15, 116);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(77, 12);
+            this.label16.TabIndex = 320;
+            this.label16.Text = "瀹㈡埛鐗╂枡鍚嶇О";
+            // 
+            // txtHCusMaterName
+            // 
+            this.txtHCusMaterName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtHCusMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.txtHCusMaterName.Location = new System.Drawing.Point(95, 112);
+            this.txtHCusMaterName.Name = "txtHCusMaterName";
+            this.txtHCusMaterName.ReadOnly = true;
+            this.txtHCusMaterName.Size = new System.Drawing.Size(128, 21);
+            this.txtHCusMaterName.TabIndex = 321;
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label13.ForeColor = System.Drawing.Color.Black;
+            this.label13.Location = new System.Drawing.Point(662, 88);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(29, 12);
+            this.label13.TabIndex = 318;
+            this.label13.Text = "鍖呭彿";
+            // 
+            // txtHBarcodeNo
+            // 
+            this.txtHBarcodeNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtHBarcodeNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.txtHBarcodeNo.Location = new System.Drawing.Point(693, 84);
+            this.txtHBarcodeNo.Name = "txtHBarcodeNo";
+            this.txtHBarcodeNo.Size = new System.Drawing.Size(128, 21);
+            this.txtHBarcodeNo.TabIndex = 319;
+            // 
+            // cmdHBadReasonID
+            // 
+            this.cmdHBadReasonID.BackColor = System.Drawing.Color.Transparent;
+            this.cmdHBadReasonID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadReasonID.Image")));
+            this.cmdHBadReasonID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+            this.cmdHBadReasonID.Location = new System.Drawing.Point(799, 143);
+            this.cmdHBadReasonID.Name = "cmdHBadReasonID";
+            this.cmdHBadReasonID.Size = new System.Drawing.Size(22, 22);
+            this.cmdHBadReasonID.TabIndex = 317;
+            this.cmdHBadReasonID.UseVisualStyleBackColor = false;
+            this.cmdHBadReasonID.Click += new System.EventHandler(this.cmdHBadReasonID_Click);
+            // 
+            // chkHDYFlag
+            // 
+            this.chkHDYFlag.AutoSize = true;
+            this.chkHDYFlag.Location = new System.Drawing.Point(558, 188);
+            this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
+            this.chkHDYFlag.Name = "chkHDYFlag";
+            this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
+            this.chkHDYFlag.TabIndex = 316;
+            this.chkHDYFlag.Text = "鑷姩鎵撳嵃";
+            this.chkHDYFlag.UseVisualStyleBackColor = true;
             // 
             // cmdFZF
             // 
             this.cmdFZF.BackColor = System.Drawing.Color.White;
             this.cmdFZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmdFZF.Location = new System.Drawing.Point(729, 142);
+            this.cmdFZF.Location = new System.Drawing.Point(729, 174);
             this.cmdFZF.Margin = new System.Windows.Forms.Padding(2);
             this.cmdFZF.Name = "cmdFZF";
             this.cmdFZF.Size = new System.Drawing.Size(86, 32);
@@ -407,7 +499,7 @@
             // 
             this.cmdZF.BackColor = System.Drawing.Color.White;
             this.cmdZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmdZF.Location = new System.Drawing.Point(635, 142);
+            this.cmdZF.Location = new System.Drawing.Point(635, 174);
             this.cmdZF.Margin = new System.Windows.Forms.Padding(2);
             this.cmdZF.Name = "cmdZF";
             this.cmdZF.Size = new System.Drawing.Size(86, 32);
@@ -420,7 +512,7 @@
             // 
             this.txtHDeptName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHDeptName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHDeptName.Location = new System.Drawing.Point(492, 28);
+            this.txtHDeptName.Location = new System.Drawing.Point(498, 28);
             this.txtHDeptName.Name = "txtHDeptName";
             this.txtHDeptName.ReadOnly = true;
             this.txtHDeptName.Size = new System.Drawing.Size(128, 21);
@@ -431,7 +523,7 @@
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label12.ForeColor = System.Drawing.Color.Black;
-            this.label12.Location = new System.Drawing.Point(437, 32);
+            this.label12.Location = new System.Drawing.Point(466, 32);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(29, 12);
             this.label12.TabIndex = 154;
@@ -441,7 +533,7 @@
             // 
             this.txtHBatchNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHBatchNo.Location = new System.Drawing.Point(687, 56);
+            this.txtHBatchNo.Location = new System.Drawing.Point(693, 56);
             this.txtHBatchNo.Name = "txtHBatchNo";
             this.txtHBatchNo.ReadOnly = true;
             this.txtHBatchNo.Size = new System.Drawing.Size(128, 21);
@@ -452,7 +544,7 @@
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(633, 60);
+            this.label11.Location = new System.Drawing.Point(662, 60);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(29, 12);
             this.label11.TabIndex = 152;
@@ -463,7 +555,7 @@
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label10.ForeColor = System.Drawing.Color.Black;
-            this.label10.Location = new System.Drawing.Point(437, 88);
+            this.label10.Location = new System.Drawing.Point(454, 88);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(41, 12);
             this.label10.TabIndex = 150;
@@ -473,7 +565,7 @@
             // 
             this.txtHKDQty.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHKDQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHKDQty.Location = new System.Drawing.Point(492, 84);
+            this.txtHKDQty.Location = new System.Drawing.Point(498, 84);
             this.txtHKDQty.Name = "txtHKDQty";
             this.txtHKDQty.Size = new System.Drawing.Size(128, 21);
             this.txtHKDQty.TabIndex = 151;
@@ -483,7 +575,7 @@
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label9.ForeColor = System.Drawing.Color.Black;
-            this.label9.Location = new System.Drawing.Point(242, 88);
+            this.label9.Location = new System.Drawing.Point(272, 88);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(29, 12);
             this.label9.TabIndex = 148;
@@ -493,7 +585,7 @@
             // 
             this.txtHWeightQyt.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHWeightQyt.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHWeightQyt.Location = new System.Drawing.Point(297, 84);
+            this.txtHWeightQyt.Location = new System.Drawing.Point(303, 84);
             this.txtHWeightQyt.Name = "txtHWeightQyt";
             this.txtHWeightQyt.Size = new System.Drawing.Size(128, 21);
             this.txtHWeightQyt.TabIndex = 149;
@@ -503,7 +595,7 @@
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(47, 88);
+            this.label7.Location = new System.Drawing.Point(63, 88);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(29, 12);
             this.label7.TabIndex = 146;
@@ -513,7 +605,7 @@
             // 
             this.txtHQty.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHQty.Location = new System.Drawing.Point(102, 84);
+            this.txtHQty.Location = new System.Drawing.Point(95, 84);
             this.txtHQty.Name = "txtHQty";
             this.txtHQty.Size = new System.Drawing.Size(128, 21);
             this.txtHQty.TabIndex = 147;
@@ -523,7 +615,7 @@
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label14.ForeColor = System.Drawing.Color.Black;
-            this.label14.Location = new System.Drawing.Point(242, 60);
+            this.label14.Location = new System.Drawing.Point(248, 60);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(53, 12);
             this.label14.TabIndex = 144;
@@ -533,7 +625,7 @@
             // 
             this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMaterName.Location = new System.Drawing.Point(297, 56);
+            this.txtHMaterName.Location = new System.Drawing.Point(303, 56);
             this.txtHMaterName.Name = "txtHMaterName";
             this.txtHMaterName.ReadOnly = true;
             this.txtHMaterName.Size = new System.Drawing.Size(128, 21);
@@ -543,7 +635,7 @@
             // 
             this.cmdSave.BackColor = System.Drawing.Color.White;
             this.cmdSave.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmdSave.Location = new System.Drawing.Point(209, 142);
+            this.cmdSave.Location = new System.Drawing.Point(209, 174);
             this.cmdSave.Margin = new System.Windows.Forms.Padding(2);
             this.cmdSave.Name = "cmdSave";
             this.cmdSave.Size = new System.Drawing.Size(86, 32);
@@ -557,7 +649,7 @@
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(47, 32);
+            this.label5.Location = new System.Drawing.Point(51, 32);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(41, 12);
             this.label5.TabIndex = 142;
@@ -567,7 +659,7 @@
             // 
             this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
             this.cmdSourceBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 142);
+            this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 174);
             this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2);
             this.cmdSourceBillNo.Name = "cmdSourceBillNo";
             this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
@@ -580,7 +672,7 @@
             // 
             this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHBillNo.Location = new System.Drawing.Point(102, 28);
+            this.txtHBillNo.Location = new System.Drawing.Point(95, 28);
             this.txtHBillNo.Name = "txtHBillNo";
             this.txtHBillNo.ReadOnly = true;
             this.txtHBillNo.Size = new System.Drawing.Size(128, 21);
@@ -592,7 +684,7 @@
             this.cmbHBarCodeType.FormattingEnabled = true;
             this.cmbHBarCodeType.Items.AddRange(new object[] {
             "鍞竴鏉$爜"});
-            this.cmbHBarCodeType.Location = new System.Drawing.Point(687, 28);
+            this.cmbHBarCodeType.Location = new System.Drawing.Point(693, 28);
             this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
             this.cmbHBarCodeType.Name = "cmbHBarCodeType";
             this.cmbHBarCodeType.Size = new System.Drawing.Size(128, 20);
@@ -603,7 +695,7 @@
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(633, 32);
+            this.label8.Location = new System.Drawing.Point(638, 32);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(53, 12);
             this.label8.TabIndex = 138;
@@ -613,7 +705,7 @@
             // 
             this.dtpHDate.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpHDate.Location = new System.Drawing.Point(297, 28);
+            this.dtpHDate.Location = new System.Drawing.Point(303, 28);
             this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
             this.dtpHDate.Name = "dtpHDate";
             this.dtpHDate.Size = new System.Drawing.Size(128, 21);
@@ -624,7 +716,7 @@
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(242, 32);
+            this.label6.Location = new System.Drawing.Point(272, 32);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(29, 12);
             this.label6.TabIndex = 99;
@@ -636,14 +728,14 @@
             this.grdSub.AllowUserToDeleteRows = false;
             this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
             this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.grdSub.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;
             this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
             this.grdSub.Location = new System.Drawing.Point(0, 73);
             this.grdSub.Margin = new System.Windows.Forms.Padding(0);
@@ -659,10 +751,10 @@
             // 
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 186);
+            this.tabControl1.Location = new System.Drawing.Point(0, 218);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1105, 441);
+            this.tabControl1.Size = new System.Drawing.Size(1105, 409);
             this.tabControl1.TabIndex = 149;
             // 
             // tabPage1
@@ -671,7 +763,7 @@
             this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1097, 415);
+            this.tabPage1.Size = new System.Drawing.Size(1097, 383);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "绉伴噸璁板綍";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -775,49 +867,6 @@
             this.鍙充晶.Size = new System.Drawing.Size(12, 627);
             this.鍙充晶.TabIndex = 64;
             // 
-            // chkHDYFlag
-            // 
-            this.chkHDYFlag.AutoSize = true;
-            this.chkHDYFlag.Location = new System.Drawing.Point(558, 156);
-            this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
-            this.chkHDYFlag.Name = "chkHDYFlag";
-            this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
-            this.chkHDYFlag.TabIndex = 316;
-            this.chkHDYFlag.Text = "鑷姩鎵撳嵃";
-            this.chkHDYFlag.UseVisualStyleBackColor = true;
-            // 
-            // cmdHBadReasonID
-            // 
-            this.cmdHBadReasonID.BackColor = System.Drawing.Color.Transparent;
-            this.cmdHBadReasonID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadReasonID.Image")));
-            this.cmdHBadReasonID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdHBadReasonID.Location = new System.Drawing.Point(793, 111);
-            this.cmdHBadReasonID.Name = "cmdHBadReasonID";
-            this.cmdHBadReasonID.Size = new System.Drawing.Size(22, 22);
-            this.cmdHBadReasonID.TabIndex = 317;
-            this.cmdHBadReasonID.UseVisualStyleBackColor = false;
-            this.cmdHBadReasonID.Click += new System.EventHandler(this.cmdHBadReasonID_Click);
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(633, 88);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(29, 12);
-            this.label13.TabIndex = 318;
-            this.label13.Text = "鍖呭彿";
-            // 
-            // txtHBarcodeNo
-            // 
-            this.txtHBarcodeNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtHBarcodeNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHBarcodeNo.Location = new System.Drawing.Point(687, 84);
-            this.txtHBarcodeNo.Name = "txtHBarcodeNo";
-            this.txtHBarcodeNo.Size = new System.Drawing.Size(128, 21);
-            this.txtHBarcodeNo.TabIndex = 319;
-            // 
             // Kf_WeighToBarCode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -915,5 +964,9 @@
         private System.Windows.Forms.Button cmdHBadReasonID;
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.TextBox txtHBarcodeNo;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.TextBox txtHCusModel;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.TextBox txtHCusMaterName;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1