Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

ouyangqing

2021-01-27 c2a0693fb9c718f29a62e3add2fac4c722cb314a

Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

 SCM/¹«ÓÃÀà/ClsPub1.cs

@@ -12,7 +12,7 @@
    public class ClsPub1
    {
        //public static string WEBSURL = "http://124.70.129.242/WEBS-WMS/WebService1.asmx";    //雅琪诺
        public static string WEBSURL = "http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx";    //雅琪诺
        public static string WEBSURL = "http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx";    //雅琪诺测试
        //public static string WEBSURL = "http://192.168.1.29/WEBS-WMS/WebService1.asmx";   //圣龙    å†…网
        //public static string WEBSURL = "http://122.227.138.236/WEBS-WMS/WebService1.asmx";   //圣龙
        //public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx";         //四维尔    å¤–网

 SCM/µ¥¾Ý×ÊÁÏ/Sc_PackUnionBill.cs

@@ -437,6 +437,13 @@
            try
            {
                Report.FieldByName("条码编号").AsString = ClsPub.isStrNull(txHBarCode_Pack.Text);
                Report.FieldByName("总重量").AsString = ClsPub.isStrNull(txtHWeight.Text);
                Report.FieldByName("客户").AsString = ClsPub.isStrNull(txtHCusName.Text);
                Report.FieldByName("源单单号").AsString = ClsPub.isStrNull(txtHSourceBillNo.Text);
                Report.FieldByName("联系方式").AsString = ClsPub.isStrNull(txtHLinkMan.Text)+ "-" +  ClsPub.isStrNull(txtHLinkPhone.Text);
                Report.FieldByName("地址").AsString = ClsPub.isStrNull(txtHAddress.Text);
                Report.FieldByName("物流方式").AsString = ClsPub.isStrNull(txtHConveyCompName.Text);
                //Report.FieldByName("总重量").AsString = ClsPub.isStrNull(txtHWeight.Text);
            }
            catch (Exception e)
            {
@@ -520,7 +527,11 @@

            if (DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0][0]) == 0)
            {
                //加载源单信息
                txtHSourceBillNo.Text = HSourceBillNo;
                



                //获取托条码
                //条码前缀 = ç»„织代码 + æºå•å•å·
@@ -581,6 +592,16 @@
            {
                return;
            }
            if (DSet.Tables[1].Rows.Count > 0)
            {
                //写入主表信息
                txtHCusName.Text = DBUtility.ClsPub.isStrNull(DSet.Tables[1].Rows[0]["客户"]);
                txtHConveyCompName.Text = DBUtility.ClsPub.isStrNull(DSet.Tables[1].Rows[0]["运输公司"]);
                txtHLinkMan.Text = DBUtility.ClsPub.isStrNull(DSet.Tables[1].Rows[0]["联系人"]);
                txtHLinkPhone.Text = DBUtility.ClsPub.isStrNull(DSet.Tables[1].Rows[0]["联系电话"]);
                txtHAddress.Text = DBUtility.ClsPub.isStrNull(DSet.Tables[1].Rows[0]["收件地址"]);
                txtHSourceBillNo.Text = DBUtility.ClsPub.isStrNull(DSet.Tables[1].Rows[0]["源单单号"]);
            }
            //
            grdMain.DataSource = DSet.Tables[0].DefaultView;


 SCM/µ¥¾Ý×ÊÁÏ/Sc_PackUnionBill.designer.cs

@@ -135,6 +135,17 @@
            this.btnBLQK = new System.Windows.Forms.Button();
            this.button4 = new System.Windows.Forms.Button();
            this.timer3 = new System.Windows.Forms.Timer(this.components);
            this.tabPage5 = new System.Windows.Forms.TabPage();
            this.txtHLinkPhone = new System.Windows.Forms.TextBox();
            this.label34 = new System.Windows.Forms.Label();
            this.txtHLinkMan = new System.Windows.Forms.TextBox();
            this.label17 = new System.Windows.Forms.Label();
            this.txtHCusName = new System.Windows.Forms.TextBox();
            this.label16 = new System.Windows.Forms.Label();
            this.txtHAddress = new System.Windows.Forms.TextBox();
            this.label35 = new System.Windows.Forms.Label();
            this.txtHConveyCompName = new System.Windows.Forms.TextBox();
            this.label36 = new System.Windows.Forms.Label();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
@@ -146,6 +157,7 @@
            this.tabPage3.SuspendLayout();
            this.tabPage1.SuspendLayout();
            this.tabPage4.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
            this.splitContainer1.Panel1.SuspendLayout();
            this.splitContainer1.Panel2.SuspendLayout();
            this.splitContainer1.SuspendLayout();
@@ -154,6 +166,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
            this.groupBox3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
            this.tabPage5.SuspendLayout();
            this.SuspendLayout();
            // 
            // Tool
@@ -247,6 +260,7 @@
            this.grdPrint.Location = new System.Drawing.Point(1029, 182);
            this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
            this.grdPrint.Name = "grdPrint";
            this.grdPrint.RowHeadersWidth = 51;
            this.grdPrint.RowTemplate.Height = 23;
            this.grdPrint.Size = new System.Drawing.Size(33, 30);
            this.grdPrint.TabIndex = 8;
@@ -263,6 +277,7 @@
            this.grdSum.Margin = new System.Windows.Forms.Padding(4);
            this.grdSum.Name = "grdSum";
            this.grdSum.ReadOnly = true;
            this.grdSum.RowHeadersWidth = 51;
            this.grdSum.RowTemplate.Height = 23;
            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
            this.grdSum.Size = new System.Drawing.Size(1604, 24);
@@ -334,7 +349,7 @@
            // 
            this.txtHZBarCode.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHZBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHZBarCode.Location = new System.Drawing.Point(459, 86);
            this.txtHZBarCode.Location = new System.Drawing.Point(459, 63);
            this.txtHZBarCode.Margin = new System.Windows.Forms.Padding(4);
            this.txtHZBarCode.Name = "txtHZBarCode";
            this.txtHZBarCode.Size = new System.Drawing.Size(445, 36);
@@ -345,7 +360,7 @@
            // 
            this.txtHMSourceBillNo.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHMSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMSourceBillNo.Location = new System.Drawing.Point(459, 31);
            this.txtHMSourceBillNo.Location = new System.Drawing.Point(459, 16);
            this.txtHMSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHMSourceBillNo.Name = "txtHMSourceBillNo";
            this.txtHMSourceBillNo.Size = new System.Drawing.Size(445, 36);
@@ -368,7 +383,7 @@
            this.label29.AutoSize = true;
            this.label29.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label29.ForeColor = System.Drawing.Color.Black;
            this.label29.Location = new System.Drawing.Point(345, 95);
            this.label29.Location = new System.Drawing.Point(345, 72);
            this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label29.Name = "label29";
            this.label29.Size = new System.Drawing.Size(109, 20);
@@ -380,7 +395,7 @@
            this.label28.AutoSize = true;
            this.label28.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label28.ForeColor = System.Drawing.Color.Black;
            this.label28.Location = new System.Drawing.Point(345, 40);
            this.label28.Location = new System.Drawing.Point(345, 25);
            this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label28.Name = "label28";
            this.label28.Size = new System.Drawing.Size(109, 20);
@@ -392,7 +407,7 @@
            this.label27.AutoSize = true;
            this.label27.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label27.ForeColor = System.Drawing.Color.Black;
            this.label27.Location = new System.Drawing.Point(996, 95);
            this.label27.Location = new System.Drawing.Point(996, 72);
            this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label27.Name = "label27";
            this.label27.Size = new System.Drawing.Size(109, 20);
@@ -403,7 +418,7 @@
            // 
            this.txtHSourceID.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID.Location = new System.Drawing.Point(1123, 86);
            this.txtHSourceID.Location = new System.Drawing.Point(1123, 63);
            this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID.Name = "txtHSourceID";
            this.txtHSourceID.Size = new System.Drawing.Size(168, 36);
@@ -413,7 +428,7 @@
            // cmdHSourceID
            // 
            this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
            this.cmdHSourceID.Location = new System.Drawing.Point(1291, 85);
            this.cmdHSourceID.Location = new System.Drawing.Point(1291, 62);
            this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID.Name = "cmdHSourceID";
            this.cmdHSourceID.Size = new System.Drawing.Size(43, 40);
@@ -426,7 +441,7 @@
            this.label19.AutoSize = true;
            this.label19.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label19.ForeColor = System.Drawing.Color.Black;
            this.label19.Location = new System.Drawing.Point(996, 40);
            this.label19.Location = new System.Drawing.Point(996, 25);
            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(109, 20);
@@ -437,7 +452,7 @@
            // 
            this.txtHGroupID.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHGroupID.Location = new System.Drawing.Point(1123, 31);
            this.txtHGroupID.Location = new System.Drawing.Point(1123, 16);
            this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHGroupID.Name = "txtHGroupID";
            this.txtHGroupID.Size = new System.Drawing.Size(168, 36);
@@ -447,7 +462,7 @@
            // cmdHGroupID
            // 
            this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
            this.cmdHGroupID.Location = new System.Drawing.Point(1291, 30);
            this.cmdHGroupID.Location = new System.Drawing.Point(1291, 15);
            this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHGroupID.Name = "cmdHGroupID";
            this.cmdHGroupID.Size = new System.Drawing.Size(43, 40);
@@ -519,6 +534,7 @@
            this.tabControl3.Controls.Add(this.tabPage3);
            this.tabControl3.Controls.Add(this.tabPage1);
            this.tabControl3.Controls.Add(this.tabPage4);
            this.tabControl3.Controls.Add(this.tabPage5);
            this.tabControl3.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabControl3.Location = new System.Drawing.Point(0, 0);
            this.tabControl3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -601,7 +617,7 @@
            this.txHBarCode_Pack.Location = new System.Drawing.Point(119, 112);
            this.txHBarCode_Pack.Margin = new System.Windows.Forms.Padding(4);
            this.txHBarCode_Pack.Name = "txHBarCode_Pack";
            this.txHBarCode_Pack.Size = new System.Drawing.Size(673, 36);
            this.txHBarCode_Pack.Size = new System.Drawing.Size(283, 36);
            this.txHBarCode_Pack.TabIndex = 125;
            // 
            // txtHMaterModel
@@ -940,7 +956,7 @@
            this.label33.Enabled = false;
            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(797, 24);
            this.label33.Location = new System.Drawing.Point(803, 24);
            this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label33.Name = "label33";
            this.label33.Size = new System.Drawing.Size(89, 20);
@@ -1468,6 +1484,145 @@
            this.timer3.Interval = 1000;
            this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
            // 
            // tabPage5
            // 
            this.tabPage5.BackColor = System.Drawing.Color.Lavender;
            this.tabPage5.Controls.Add(this.txtHConveyCompName);
            this.tabPage5.Controls.Add(this.label36);
            this.tabPage5.Controls.Add(this.txtHAddress);
            this.tabPage5.Controls.Add(this.label35);
            this.tabPage5.Controls.Add(this.txtHLinkPhone);
            this.tabPage5.Controls.Add(this.label34);
            this.tabPage5.Controls.Add(this.txtHLinkMan);
            this.tabPage5.Controls.Add(this.label17);
            this.tabPage5.Controls.Add(this.txtHCusName);
            this.tabPage5.Controls.Add(this.label16);
            this.tabPage5.Location = new System.Drawing.Point(4, 25);
            this.tabPage5.Name = "tabPage5";
            this.tabPage5.Size = new System.Drawing.Size(1596, 172);
            this.tabPage5.TabIndex = 3;
            this.tabPage5.Text = "物流信息";
            // 
            // txtHLinkPhone
            // 
            this.txtHLinkPhone.Enabled = false;
            this.txtHLinkPhone.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHLinkPhone.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHLinkPhone.Location = new System.Drawing.Point(510, 63);
            this.txtHLinkPhone.Margin = new System.Windows.Forms.Padding(4);
            this.txtHLinkPhone.Name = "txtHLinkPhone";
            this.txtHLinkPhone.Size = new System.Drawing.Size(284, 36);
            this.txtHLinkPhone.TabIndex = 167;
            // 
            // label34
            // 
            this.label34.AutoSize = true;
            this.label34.Enabled = false;
            this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label34.ForeColor = System.Drawing.Color.Black;
            this.label34.Location = new System.Drawing.Point(413, 72);
            this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label34.Name = "label34";
            this.label34.Size = new System.Drawing.Size(109, 20);
            this.label34.TabIndex = 166;
            this.label34.Text = "联系电话：";
            // 
            // txtHLinkMan
            // 
            this.txtHLinkMan.Enabled = false;
            this.txtHLinkMan.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHLinkMan.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHLinkMan.Location = new System.Drawing.Point(115, 63);
            this.txtHLinkMan.Margin = new System.Windows.Forms.Padding(4);
            this.txtHLinkMan.Name = "txtHLinkMan";
            this.txtHLinkMan.Size = new System.Drawing.Size(284, 36);
            this.txtHLinkMan.TabIndex = 165;
            // 
            // label17
            // 
            this.label17.AutoSize = true;
            this.label17.Enabled = false;
            this.label17.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label17.ForeColor = System.Drawing.Color.Black;
            this.label17.Location = new System.Drawing.Point(18, 72);
            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(89, 20);
            this.label17.TabIndex = 164;
            this.label17.Text = "联系人：";
            // 
            // txtHCusName
            // 
            this.txtHCusName.Enabled = false;
            this.txtHCusName.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHCusName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHCusName.Location = new System.Drawing.Point(115, 16);
            this.txtHCusName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHCusName.Name = "txtHCusName";
            this.txtHCusName.Size = new System.Drawing.Size(284, 36);
            this.txtHCusName.TabIndex = 163;
            // 
            // label16
            // 
            this.label16.AutoSize = true;
            this.label16.Enabled = false;
            this.label16.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label16.ForeColor = System.Drawing.Color.Black;
            this.label16.Location = new System.Drawing.Point(18, 25);
            this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(89, 20);
            this.label16.TabIndex = 162;
            this.label16.Text = "客  æˆ·ï¼š";
            // 
            // txtHAddress
            // 
            this.txtHAddress.Enabled = false;
            this.txtHAddress.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHAddress.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHAddress.Location = new System.Drawing.Point(115, 107);
            this.txtHAddress.Margin = new System.Windows.Forms.Padding(4);
            this.txtHAddress.Name = "txtHAddress";
            this.txtHAddress.Size = new System.Drawing.Size(1057, 36);
            this.txtHAddress.TabIndex = 169;
            // 
            // label35
            // 
            this.label35.AutoSize = true;
            this.label35.Enabled = false;
            this.label35.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label35.ForeColor = System.Drawing.Color.Black;
            this.label35.Location = new System.Drawing.Point(18, 116);
            this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label35.Name = "label35";
            this.label35.Size = new System.Drawing.Size(69, 20);
            this.label35.TabIndex = 168;
            this.label35.Text = "地址：";
            // 
            // txtHConveyCompName
            // 
            this.txtHConveyCompName.Enabled = false;
            this.txtHConveyCompName.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHConveyCompName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHConveyCompName.Location = new System.Drawing.Point(510, 18);
            this.txtHConveyCompName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHConveyCompName.Name = "txtHConveyCompName";
            this.txtHConveyCompName.Size = new System.Drawing.Size(284, 36);
            this.txtHConveyCompName.TabIndex = 171;
            // 
            // label36
            // 
            this.label36.AutoSize = true;
            this.label36.Enabled = false;
            this.label36.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label36.ForeColor = System.Drawing.Color.Black;
            this.label36.Location = new System.Drawing.Point(413, 27);
            this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label36.Name = "label36";
            this.label36.Size = new System.Drawing.Size(109, 20);
            this.label36.TabIndex = 170;
            this.label36.Text = "物流方式：";
            // 
            // Sc_PackUnionBill
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -1507,6 +1662,7 @@
            this.tabPage4.PerformLayout();
            this.splitContainer1.Panel1.ResumeLayout(false);
            this.splitContainer1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
            this.splitContainer1.ResumeLayout(false);
            this.tabControl2.ResumeLayout(false);
            this.tabPage2.ResumeLayout(false);
@@ -1514,6 +1670,8 @@
            this.groupBox3.ResumeLayout(false);
            this.groupBox3.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
            this.tabPage5.ResumeLayout(false);
            this.tabPage5.PerformLayout();
            this.ResumeLayout(false);

        }
@@ -1625,5 +1783,16 @@
        private System.Windows.Forms.Label lblComStatus;
        private System.Windows.Forms.ComboBox cmbDYMB;
        private System.Windows.Forms.Label label12;
        private System.Windows.Forms.TabPage tabPage5;
        private System.Windows.Forms.TextBox txtHConveyCompName;
        private System.Windows.Forms.Label label36;
        private System.Windows.Forms.TextBox txtHAddress;
        private System.Windows.Forms.Label label35;
        private System.Windows.Forms.TextBox txtHLinkPhone;
        private System.Windows.Forms.Label label34;
        private System.Windows.Forms.TextBox txtHLinkMan;
        private System.Windows.Forms.Label label17;
        private System.Windows.Forms.TextBox txtHCusName;
        private System.Windows.Forms.Label label16;
    }
}

 SCM/µ¥¾Ý×ÊÁÏ/Sc_PackUnionBill.resx

@@ -112,15 +112,15 @@
    <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="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>
  <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/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -387,10 +387,10 @@
        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>
  <data name="cmdHSourceID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -623,10 +623,10 @@
        FIYcEAA7
</value>
  </data>
  <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>292, 16</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>88</value>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>40</value>
  </metadata>
</root>

 SCM/Éú²ú¹ÜÀí/Sc_PackUnionBillList.cs

@@ -4,7 +4,9 @@
using System.Data;
using System.Drawing;
using System.Text;
using System.Threading;
using System.Windows.Forms;
using gregn6Lib;
using Pub_Class;

namespace SCM
@@ -206,6 +208,85 @@
                return false;
            }
        }
        

        //打印
        GridppReport Report;
        private void btnFQBD_Click(object sender, EventArgs e)
        {
            string sOpenTmp="在线打包";
            if (!Sub_SetReportList(sOpenTmp))
            {
                return;
            }
            Report.PrintPreview(false);
            Thread.Sleep(500);
        }
        protected double AllQty = 0;
        protected string str = "";
        private bool Sub_SetReportList(string sOpenTmp)
        {
            //判断行数
            for (int i = 0; i < grdMain.Rows.Count; i++)
            {
                grdMain.Rows[i].Cells[0].Value = "";
            }
            for (int i = 0; i < grdMain.SelectedRows.Count; i++)
            {
                grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
                AllQty += DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("数量")].Value);
                //判断多行补打时包装单号是否唯一
                string str2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("包装单号")].Value);
                if (i==0)
                {
                    str = str2;
                }
                else if (i>0)
                {
                    if (!str.Equals(str2))
                    {
                        str = "";
                        MessageBox.Show("包装单号不唯一，请重新选择！");
                        return false;
                    }
                }
            }
            Report = new GridppReport();
            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .
            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecordList);
            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTableList);
            //Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
            return true;
        }

        private void ReportBeforePostRecordList()
        {
            try
            {
                //Report.FieldByName("源单单号").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("包装单号")].Value);
                //Report.FieldByName("制单人").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("制单人")].Value);
                //Report.FieldByName("制单日期").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("制单日期")].Value);
                Report.FieldByName("源单单号").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("生产订单号")].Value);
                //Report.FieldByName("源单类型").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("源单类型")].Value);
                Report.FieldByName("总重量").AsString = DBUtility.ClsPub.isStrNull(AllQty);
                AllQty = 0;
            }
            catch (Exception e)
            {
                MessageBox.Show("打印失败!表头：" + e.Message);
            }
        }

        private void ReportFetchRecordByDataTableList()
        {
            try
            {
                DataTable ds = new DataTable();
                SCM.Utility.FillRecordToReport(Report, grdMain, ds, Fun_GetCol("选择"));
            }
            catch (Exception e)
            {
                MessageBox.Show("打印失败!表体：" + e.Message);
            }
        }
    }
}

 SCM/Éú²ú¹ÜÀí/Sc_PackUnionBillList.designer.cs

@@ -35,6 +35,7 @@
            this.grdPrint = new System.Windows.Forms.DataGridView();
            this.grdSum = new System.Windows.Forms.DataGridView();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.button1 = new System.Windows.Forms.Button();
            this.txtHBarCode = new System.Windows.Forms.TextBox();
            this.label3 = new System.Windows.Forms.Label();
            this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
@@ -50,7 +51,7 @@
            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
            this.bclk = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
            this.button1 = new System.Windows.Forms.Button();
            this.btnFQBD = new System.Windows.Forms.Button();
            ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
            this.groupBox1.SuspendLayout();
@@ -99,6 +100,7 @@
            // groupBox1
            // 
            this.groupBox1.BackColor = System.Drawing.Color.Lavender;
            this.groupBox1.Controls.Add(this.btnFQBD);
            this.groupBox1.Controls.Add(this.button1);
            this.groupBox1.Controls.Add(this.txtHBarCode);
            this.groupBox1.Controls.Add(this.label3);
@@ -113,6 +115,17 @@
            this.groupBox1.Size = new System.Drawing.Size(1028, 129);
            this.groupBox1.TabIndex = 50;
            this.groupBox1.TabStop = false;
            // 
            // button1
            // 
            this.button1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button1.Location = new System.Drawing.Point(725, 30);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(112, 37);
            this.button1.TabIndex = 17;
            this.button1.Text = "删除";
            this.button1.UseVisualStyleBackColor = true;
            this.button1.Click += new System.EventHandler(this.button1_Click);
            // 
            // txtHBarCode
            // 
@@ -273,16 +286,16 @@
            this.toolStripSeparator8.Name = "toolStripSeparator8";
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 47);
            // 
            // button1
            // btnFQBD
            // 
            this.button1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button1.Location = new System.Drawing.Point(725, 30);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(112, 37);
            this.button1.TabIndex = 17;
            this.button1.Text = "删除";
            this.button1.UseVisualStyleBackColor = true;
            this.button1.Click += new System.EventHandler(this.button1_Click);
            this.btnFQBD.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnFQBD.Location = new System.Drawing.Point(566, 30);
            this.btnFQBD.Name = "btnFQBD";
            this.btnFQBD.Size = new System.Drawing.Size(112, 37);
            this.btnFQBD.TabIndex = 18;
            this.btnFQBD.Text = "补打";
            this.btnFQBD.UseVisualStyleBackColor = true;
            this.btnFQBD.Click += new System.EventHandler(this.btnFQBD_Click);
            // 
            // Sc_PackUnionBillList
            // 
@@ -334,5 +347,6 @@
        private System.Windows.Forms.TextBox txtHBarCode;
        private System.Windows.Forms.Label label3;
        private System.Windows.Forms.Button button1;
        private System.Windows.Forms.Button btnFQBD;
    }
}

 SCM/Éú²ú¹ÜÀí/Sc_PackUnionBillList.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>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>
  <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="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAQUAAAEFCAYAAADqlvKRAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -234,7 +234,7 @@
        X8dcGLw8yCBGAAAAAElFTkSuQmCC
</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>281, 16</value>
  </metadata>
  <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -503,7 +503,7 @@
        AAAASUVORK5CYII=
</value>
  </data>
  <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>

 SCM/ϵͳ¹ÜÀí/Xt_UserNew.cs

@@ -21,6 +21,7 @@
        public string Czybm;
        public Int64 HOrgID = -1;
        public string HProcNo = "";
        public string HProcNumber = "";
        //窗体加载
        private void Xt_UserNew_Load(object sender, EventArgs e)
        {
@@ -375,7 +376,8 @@
                    ",HGroup='" + textHGroupID.Text.ToString() + "'" +
                    ",HGroupID=" + ClsPub.isLong(textHGroupID.Tag).ToString() +
                    ",HProc='" + textHProcNo.Text.ToString() +"'"+
                    ",HProcName='" + textHProcNo.Tag.ToString() +"'"+
                    ",HProcName='" + HProcNumber + "'" +
                    ",HProcID=" + ClsPub.isLong(textHProcNo.Tag.ToString()) +
                    ",HProcNo='" + HProcNo + "'" +
                    ",HWorkCenter='" + textHWorkCenterID.Text.ToString() + "'" +
                    ",HWorkCenterID=" + ClsPub.isLong(textHWorkCenterID.Tag).ToString() +
@@ -740,7 +742,8 @@
            if (oEmp.RefreshView(DeWhere))
            {
                this.textHProcNo.Text = oEmp.oModel.HName;
                this.textHProcNo.Tag = oEmp.oModel.HNumber;
                this.textHProcNo.Tag = oEmp.oModel.HItemID.ToString();
                HProcNumber = oEmp.oModel.HNumber;
                HProcNo = oEmp.oModel.HRemark;
            }
            else