parent: bbcea5fe | 补丁 | 提交 | ignore whitespace
杨乐
2022-01-08 4597f31ac5361650eda7b5cb74716e535266174d 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
3个文件已修改
84 ■■■■■ 已修改文件
WarM/条码打印/Gy_BarCodeBill.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Gy_BarCodeBill.designer.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Gy_BarCodeBill.resx 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs


@@ -3208,5 +3208,13 @@


                Thread.Sleep(1000);


            }


        }




        //生成外箱码


        private void wxm_Click(object sender, EventArgs e)


        {


            //根据HINTERID找到已生成外箱码；并显示到打印模板






        }


    }


}




 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.designer.cs


@@ -32,6 +32,7 @@


            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill));


            this.Tool = new System.Windows.Forms.ToolStrip();


            this.dy = new System.Windows.Forms.ToolStripButton();


            this.sdy = new System.Windows.Forms.ToolStripButton();


            this.yl = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();


            this.AddRow = new System.Windows.Forms.ToolStripButton();


@@ -106,7 +107,9 @@


            this.grdSub = new System.Windows.Forms.DataGridView();


            this.tabPage3 = new System.Windows.Forms.TabPage();


            this.grdList = new System.Windows.Forms.DataGridView();


            this.sdy = new System.Windows.Forms.ToolStripButton();


            this.wxm = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();


            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();


            this.Tool.SuspendLayout();


            this.P1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();


@@ -139,6 +142,9 @@


            this.DelRow,


            this.toolStripSeparator4,


            this.bc,


            this.toolStripSeparator8,


            this.wxm,


            this.toolStripSeparator9,


            this.cz,


            this.toolStripSeparator5,


            this.kc,


@@ -176,6 +182,20 @@


            this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


            this.dy.Click += new System.EventHandler(this.dy_Click);


            // 


            // sdy


            // 


            this.sdy.AutoSize = false;


            this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));


            this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;


            this.sdy.Name = "sdy";


            this.sdy.Size = new System.Drawing.Size(35, 47);


            this.sdy.Text = "浏览";


            this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


            this.sdy.Click += new System.EventHandler(this.sdy_Click);


            // 


            // yl


            // 


@@ -1037,19 +1057,29 @@


            this.grdList.Size = new System.Drawing.Size(1241, 347);


            this.grdList.TabIndex = 46;


            // 


            // sdy


            // wxm


            // 


            this.sdy.AutoSize = false;


            this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));


            this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;


            this.sdy.Name = "sdy";


            this.sdy.Size = new System.Drawing.Size(35, 47);


            this.sdy.Text = "浏览";


            this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


            this.sdy.Click += new System.EventHandler(this.sdy_Click);


            this.wxm.AutoSize = false;


            this.wxm.Image = ((System.Drawing.Image)(resources.GetObject("wxm.Image")));


            this.wxm.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.wxm.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.wxm.ImageTransparentColor = System.Drawing.Color.Magenta;


            this.wxm.Name = "wxm";


            this.wxm.Size = new System.Drawing.Size(50, 47);


            this.wxm.Text = "外箱码";


            this.wxm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.wxm.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


            this.wxm.Click += new System.EventHandler(this.wxm_Click);


            // 


            // toolStripSeparator8


            // 


            this.toolStripSeparator8.Name = "toolStripSeparator8";


            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);


            // 


            // toolStripSeparator9


            // 


            this.toolStripSeparator9.Name = "toolStripSeparator9";


            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);


            // 


            // Gy_BarCodeBill


            // 


@@ -1176,5 +1206,8 @@


        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;


        private System.Windows.Forms.ToolStripButton BatchNo;


        private System.Windows.Forms.ToolStripButton sdy;


        private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;


        private System.Windows.Forms.ToolStripButton wxm;


        private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;


    }


}




 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.resx


@@ -440,6 +440,21 @@


        SUVORK5CYII=


</value>


  </data>


  <data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO


        /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z


        mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq


        ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk


        rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9


        BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/


        rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l


        ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0


        eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA


        SUVORK5CYII=


</value>


  </data>


  <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


@@ -573,6 +588,6 @@


    <value>93, 17</value>


  </metadata>


  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">


    <value>42</value>


    <value>25</value>


  </metadata>


</root>