Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2021-12-01 0a6bc1020d17bbd9923fc78157688183287a6270

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 LMES/bin/x86/奥邦Debug.rar

Binary files differ

 WarM/条码打印/Sc_ICMOToBarCode.cs

@@ -1122,11 +1122,11 @@

        private void cmdHSourceID_Click(object sender, EventArgs e)
        {
            DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
            if (oSource.RefreshView())
            DAL.ClsGy_WorkCenter_View oWork = new DAL.ClsGy_WorkCenter_View();
            if (oWork.RefreshView())
            {
                this.txtHSourceID.Text = oSource.oModel.HName;
                this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
                this.txtHSourceID.Text = oWork.oModel.HName;
                this.txtHSourceID.Tag = oWork.oModel.HItemID.ToString();
            }
            else
            {

 WarM/条码打印/Sc_ICMOToBarCode.designer.cs

@@ -38,6 +38,7 @@
            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
            this.bclk = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
            this.cz = new System.Windows.Forms.ToolStripButton();
            this.timer1 = new System.Windows.Forms.Timer(this.components);
            this.timer2 = new System.Windows.Forms.Timer(this.components);
            this.grdMain = new System.Windows.Forms.DataGridView();
@@ -86,7 +87,6 @@
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.tabPage2 = new System.Windows.Forms.TabPage();
            this.grdList = new System.Windows.Forms.DataGridView();
            this.cz = new System.Windows.Forms.ToolStripButton();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
            this.gbUp.SuspendLayout();
@@ -185,6 +185,20 @@
            this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator8.Name = "toolStripSeparator8";
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
            // 
            // cz
            // 
            this.cz.AutoSize = false;
            this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
            this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
            this.cz.Name = "cz";
            this.cz.Size = new System.Drawing.Size(35, 47);
            this.cz.Text = "閲嶇疆";
            this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
            this.cz.Click += new System.EventHandler(this.cz_Click);
            // 
            // timer1
            // 
@@ -348,7 +362,7 @@
            this.gbUp.Controls.Add(this.cmdHEmpID);
            this.gbUp.Location = new System.Drawing.Point(11, 55);
            this.gbUp.Name = "gbUp";
            this.gbUp.Size = new System.Drawing.Size(1148, 126);
            this.gbUp.Size = new System.Drawing.Size(1149, 126);
            this.gbUp.TabIndex = 58;
            this.gbUp.TabStop = false;
            // 
@@ -723,20 +737,6 @@
            this.grdList.RowTemplate.Height = 23;
            this.grdList.Size = new System.Drawing.Size(866, 269);
            this.grdList.TabIndex = 20;
            // 
            // cz
            // 
            this.cz.AutoSize = false;
            this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
            this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
            this.cz.Name = "cz";
            this.cz.Size = new System.Drawing.Size(35, 47);
            this.cz.Text = "閲嶇疆";
            this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
            this.cz.Click += new System.EventHandler(this.cz_Click);
            // 
            // Sc_ICMOToBarCode
            //