提交内容

BLL/Extension.cs

@@ -206,7 +206,7 @@ namespace BLL
                             { "Font", "Arial,12,B,"},                
                             { "Font", "Arial,12,B,"},                
                             {"Width", -1},                
                             {"Width", -1},                
                             {"Height", 40},                
                             {"Height", 40},                
-                            {"Text", Asa.FaceControl.Language.Dialog("Exchangedata_","替换数据")},}
+                            {"Text", Asa.FaceControl.Language.Dialog("ReplaceData","替换数据")},}
                          },        
                          },        
                         {           
                         {           
                             "Event",           
                             "Event",           

ExtensionGroup/Alcoelectro.cs

@@ -390,5 +390,10 @@ namespace ExtensionGroup
         {
         {
             throw new NotImplementedException();
             throw new NotImplementedException();
         }
         }
+
+        public void DrawTextBackground(Dictionary<string, string> key)
+        {
+            throw new NotImplementedException();
+        }
     }
     }
 }
 }

SmartScan/App.config

@@ -12,11 +12,12 @@
 		<add key="ContentType" value="application/json"/>
 		<add key="ContentType" value="application/json"/>
 		<add key="IsTokenRequired" value="TRUE"/>
 		<add key="IsTokenRequired" value="TRUE"/>
 		<!--isTokenRequired为true时，tokenurl必填-->
 		<!--isTokenRequired为true时，tokenurl必填-->
-		<add key="Tokenurl" value="http://myprai.iriichi.com.my:8888/IDORequestService/MGRestService.svc/json/token/IRIICHI"/>
-		<add key="Url" value="http://myprai.iriichi.com.my:8888/IDORequestService/MGRestService.svc/json/IR_SLAPIs/GRNNUM,GRNLine,vendnum,vendor_name,po_num,po_line,po_release,item_code,Rating,qty_ordered,qty_received,rcvd_date/adv?customloadmethod=IR_GetGrnDetailSp"/>
+		<add key="Tokenurl" value=""/>
+		<add key="Url" value=""/>
 		<!--关键字value请用，号隔开-->
 		<!--关键字value请用，号隔开-->
 		<add key="KeyWords" value="grn_num,vend_num,grn_line,infobar=0"/>
 		<add key="KeyWords" value="grn_num,vend_num,grn_line,infobar=0"/>
 		<!--服务器查询PN_结束-->
 		<!--服务器查询PN_结束-->
+		<!--启动服务路由地址-->
 		<add key="StartServiceName" value=""/>
 		<add key="StartServiceName" value=""/>
 		<add key="StartServicePath" value=""/>
 		<add key="StartServicePath" value=""/>
 		
 		

SmartScan/Form/FrmDrawText.Designer.cs

@@ -72,7 +72,7 @@
             this.Controls.Add(this.faceButton1);
             this.Controls.Add(this.faceButton1);
             this.Icon = ((System.Drawing.Bitmap)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Bitmap)(resources.GetObject("$this.Icon")));
             this.Name = "FrmDrawText";
             this.Name = "FrmDrawText";
-            this.Text = "含有OCR结果";
+            this.Text = "Using OCR result";
             this.Controls.SetChildIndex(this.faceButton1, 0);
             this.Controls.SetChildIndex(this.faceButton1, 0);
             this.Controls.SetChildIndex(this.faceButton2, 0);
             this.Controls.SetChildIndex(this.faceButton2, 0);
             this.ResumeLayout(false);
             this.ResumeLayout(false);

SmartScan/Form/FrmDrawText.resx

@@ -121,7 +121,7 @@
   <data name="$this.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
   <data name="$this.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS
-        cgAAEnIBXmVb4wAADHZJREFUeF7tmnlUU3cWx7Gb07GtrZJ9IzvSarVaSZQp1YobkgXCDioguwiyI4En
+        cQAAEnEB89x6jgAADHZJREFUeF7tmnlUU3cWx7Gb07GtrZJ9IzvSarVaSZQp1YobkgXCDioguwiyI4En
         2gpJCBAgSICwyh72uPV0xtN9rJ2Z2jkdT09P69hqF2urdnFr62/ui8+tijytaac9+Z7z/oD87n3vfd79
         2gpJCBAgSICwyh72uPV0xtN9rJ2Z2jkdT09P69hqF2urdnFr62/ui8+tijytaac9+Z7z/oD87n3vfd79
         3d+97/fcXHLJJZdccskll1xyotga44N0hcGLFmBYTAnQL5yu0DHdMOwe4uc/tphB5XNoSl0HVaH7lKrQ
         3d+97/fcXHLJJZdccskll1xyotga44N0hcGLFmBYTAnQL5yu0DHdMOwe4uc/tphB5XNoSl0HVaH7lKrQ
         f0tV6r+hqcoOMtRlGZRg7CFi2B9TjBDdU/RA/btw0+jGQ3eeHvTCNlFa2mRi+J0JImmauoztrtL5AmA1
         f0tV6r+hqcoOMtRlGZRg7CFi2B9TjBDdU/RA/btw0+jGQ3eeHvTCNlFa2mRi+J0JImmauoztrtL5AmA1