From 97577f6cbcf384f8d9ec20e4a123582581961049 Mon Sep 17 00:00:00 2001
From: wugang <1029149336@qq.com>
Date: Fri, 10 Nov 2017 20:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/BarCodeScan/BwpBarCodeUtil.cs              |  8 ++++--
 .../TrunksIousOutInStoreForm.cs               | 27 ++++++++++---------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/BO/BarCodeScan/BwpBarCodeUtil.cs b/BO/BarCodeScan/BwpBarCodeUtil.cs
index 383d80e..c7df749 100644
--- a/BO/BarCodeScan/BwpBarCodeUtil.cs
+++ b/BO/BarCodeScan/BwpBarCodeUtil.cs
@@ -20,15 +20,19 @@ namespace BO.BarCodeScan
       {
         return "&";
       }
-      if (e.KeyData == (Keys.ProcessKey | Keys.Shift))
+      if (e.KeyData == (Keys.Oem1 | Keys.Shift))
       {
-        return "&";
+        return ":";
       }
 
       if (e.KeyData == (Keys.Oem2))
       {
         return "/";
       }
+      if (e.KeyData == (Keys.OemPeriod))
+      {
+        return ".";
+      }
       if (e.KeyData == (Keys.Oem2 | Keys.Shift))
       {
         return "?";
diff --git a/TrunksIousOutInStore/TrunksIousOutInStoreForm.cs b/TrunksIousOutInStore/TrunksIousOutInStoreForm.cs
index 74b7ba5..2c261e0 100644
--- a/TrunksIousOutInStore/TrunksIousOutInStoreForm.cs
+++ b/TrunksIousOutInStore/TrunksIousOutInStoreForm.cs
@@ -28,7 +28,7 @@ namespace TrunksIousOutInStore
     private readonly string ClientGoodsSetApplyClient = "白条出入库";
     public const string DATA_PATH = "LocalData/TrunksIousOutInStore";
 
-//        BardCodeHooK BarCode = new BardCodeHooK();
+    //        BardCodeHooK BarCode = new BardCodeHooK();
 
     #region weightNeed
     SerialPort weightPort;
@@ -57,7 +57,7 @@ namespace TrunksIousOutInStore
         //          syncToServer.Abort();
       };
 
-//            BarCode.BarCodeEvent += new BardCodeHooK.BardCodeDeletegate(BarCode_BarCodeEvent);
+      //            BarCode.BarCodeEvent += new BardCodeHooK.BardCodeDeletegate(BarCode_BarCodeEvent);
 
       if (!Directory.Exists(DATA_PATH))
       {
@@ -80,9 +80,9 @@ namespace TrunksIousOutInStore
       {
         if (barCode.IsValid)
         {
-//          var code = UrlUtil.GetBarCode(barCode.BarCode.Trim());
-//          var goodsName = UrlUtil.GetGoodsName(barCode.BarCode);
-var code = barCode.BarCode.Trim();
+          //          var code = UrlUtil.GetBarCode(barCode.BarCode.Trim());
+          //          var goodsName = UrlUtil.GetGoodsName(barCode.BarCode);
+          var code = barCode.BarCode.Trim();
           doInsertUnSubmit(code, "", null);
         }
       }
@@ -386,7 +386,7 @@ var code = barCode.BarCode.Trim();
 
     private void TrunksIousOutInStoreForm_Load(object sender, EventArgs e)
     {
-//            BarCode.Start();
+      //            BarCode.Start();
 
       InitLocalList();
 
@@ -398,7 +398,7 @@ var code = barCode.BarCode.Trim();
     private void InitGoodsControl()
     {
       flpClass.Controls.Clear();
-      foreach (IGrouping<string, TrunksIousOutInStoreClientGoodsSet> grouping in mLocaList.Where(x=>!string.IsNullOrWhiteSpace(x.Name)).GroupBy(x=>x.Name))
+      foreach (IGrouping<string, TrunksIousOutInStoreClientGoodsSet> grouping in mLocaList.Where(x => !string.IsNullOrWhiteSpace(x.Name)).GroupBy(x => x.Name))
       {
         var btn = CreateClassButton(grouping.Key);
         flpClass.Controls.Add(btn);
@@ -407,7 +407,7 @@ var code = barCode.BarCode.Trim();
 
     private Button CreateClassButton(string text)
     {
-      var btn = new Button(){Text = text};
+      var btn = new Button() { Text = text };
       btn.Width = 100;
       btn.Height = 60;
       btn.Click += BtnClass_Click;
@@ -418,7 +418,7 @@ var code = barCode.BarCode.Trim();
     {
       var btnClass = sender as Button;
       flpGoods.Controls.Clear();
-      foreach (TrunksIousOutInStoreClientGoodsSet set in mLocaList.Where(x=>x.Name== btnClass.Text))
+      foreach (TrunksIousOutInStoreClientGoodsSet set in mLocaList.Where(x => x.Name == btnClass.Text))
       {
         var btn = CreateGoodsSetButton(set);
         flpGoods.Controls.Add(btn);
@@ -546,7 +546,7 @@ var code = barCode.BarCode.Trim();
 
     private void TrunksIousOutInStoreForm_FormClosed(object sender, FormClosedEventArgs e)
     {
-//            BarCode.Stop();
+      //            BarCode.Stop();
     }
 
 
@@ -642,8 +642,11 @@ var code = barCode.BarCode.Trim();
         {
 
 
-//          MessageBox.Show(barCodes.BarCode);
-          doInsertUnSubmit(barCodes.BarCode, "", null);
+          //          MessageBox.Show(barCodes.BarCode);
+          var code = UrlUtil.GetBarCode(barCodes.BarCode.ToLower().Trim());
+          var goodsName = UrlUtil.GetGoodsName(barCodes.BarCode.ToLower());
+
+          doInsertUnSubmit(code, goodsName, null);
           barCodes.StringBuilder = new StringBuilder();
         }
       }