From d574705357af4e7714bd64a1fac571c2b42a3fa2 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 12 七月 2022 18:22:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 LMES/Frm_Show.cs |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/LMES/Frm_Show.cs b/LMES/Frm_Show.cs
index 163629d..e94a1ee 100644
--- a/LMES/Frm_Show.cs
+++ b/LMES/Frm_Show.cs
@@ -83,8 +83,8 @@
 
         private void SetPic()
         {
-            Image img = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/MainToolPic.jpg"); ;
-            panel3.BackgroundImage = img;
+            //Image img = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/MainToolPic.jpg"); ;
+            //panel3.BackgroundImage = img;
         }
 
         private void Frm_Show_Load(object sender, EventArgs e)
@@ -469,9 +469,11 @@
             SetTool(sup);
         }
 
-      
-
-       
-
+        private void pBarCodeEdit_Click(object sender, EventArgs e)
+        {
+            WarM.Sc_ICMOToBarCode oSc_ICMOToBarCode = new WarM.Sc_ICMOToBarCode();
+            oSc_ICMOToBarCode.ModCaption = "鏉$爜蹇�熺敓鎴�";
+            oSc_ICMOToBarCode.ShowDialog();
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1