同步之前修改。

SCBC Factory Tools/Licence.txt

@@ -5,5 +5,5 @@ moka tools
 //////////////////////////////////////
 Ver=3.0.5.9
 1.由于FiretvDSN业务接口由scbc-server迁移至IDManage，针对更新对应的GetFireTvDSN接口。
-
+2.抄写DSN订单时，自动启用条码限制功能，并将订单号作为关键字使用，且FSN要符合数字+大写字母的要求
 

SCBC Factory Tools/Packagescript/setup without net40.nsi

@@ -4,7 +4,7 @@ ${StrRep}
 
 ; °²×°³ÌÐò³õʼ¶¨Òå³£Á¿
 !define PRODUCT_NAME "MOKA Factory Tools"
-!define PRODUCT_VERSION "3.0.5.9"
+!define PRODUCT_VERSION "3.0.6.0"
 !define PRODUCT_PUBLISHER "MOKA"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\MOKA Factory Tools.exe"
 !define UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall"

SCBC Factory Tools/Packagescript/setup.nsi

@@ -4,7 +4,7 @@ ${StrRep}
 
 ; °²×°³ÌÐò³õʼ¶¨Òå³£Á¿
 !define PRODUCT_NAME "MOKA Factory Tools"
-!define PRODUCT_VERSION "3.0.5.9"
+!define PRODUCT_VERSION "3.0.6.0"
 !define PRODUCT_PUBLISHER "MOKA"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\MOKA Factory Tools.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

SCBC Factory Tools/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.5.9")]
+[assembly: AssemblyVersion("3.0.6.0")]
 [assembly: AssemblyFileVersion("1.0.0.1")]

SCBC Factory Tools/Views/Main.cs

@@ -81,6 +81,10 @@ namespace MOKA_Factory_Tools
 
         private void SetDSNLimit()
         {
+            // 如果抄写PSN,不自动赋值条码限制;
+            if (BarcodeWrite.Checked )
+                return;
+
             // 设置条码限制默认打上勾;
             if ( midList1.keytype.ContainsKey("DSN") )
             {
@@ -575,7 +579,7 @@ namespace MOKA_Factory_Tools
                         };
                     }
 
-                    OperationPanel operationPanel1 = new OperationPanel(this, null, ErrorDB, null, functionSetting1, WriteCheck1, ReadCheck1, WriteDone1, Preload.Checked, midList1, OrderText.Text.Trim());
+                    OperationPanel operationPanel1 = new OperationPanel(this, LocalDB, ErrorDB, null, functionSetting1, WriteCheck1, ReadCheck1, WriteDone1, Preload.Checked, midList1, OrderText.Text.Trim());
                     operationPanel1.StartPosition = FormStartPosition.Manual;
                     if((this.Right + operationPanel1.Size.Width * formlocationmsg.Count)> Screen.PrimaryScreen.Bounds.Width&&LocationMark)
                     {

SCBC Factory Tools/Views/OperationPanel.cs

@@ -709,7 +709,7 @@ namespace MOKA_Factory_Tools
                         return;
                     }
 
-                    if ( midListNow.keytype.ContainsKey("DSN") )
+                    if (!FunctionSettingNow.BarcodeWrite && midListNow.keytype.ContainsKey("DSN") )
                     {
                         // 如果不是全大写字母+数字,返回;
                         Regex r = new Regex(@"^[A-Z0-9]+$");