Commit 0181f10e 刘韬

1

1 个父辈 3f972f3f
...@@ -224,8 +224,11 @@ namespace OnlineStore.ACSingleStore ...@@ -224,8 +224,11 @@ namespace OnlineStore.ACSingleStore
private void ResourceCulture_LanguageReload(object sender, EventArgs e) private void ResourceCulture_LanguageReload(object sender, EventArgs e)
{ {
this.LanguageProcess(); this.Invoke((EventHandler)delegate{
LanguagePro(); this.LanguageProcess();
LanguagePro();
});
} }
private void AddForm<T>(string text, T form) where T : Form private void AddForm<T>(string text, T form) where T : Form
...@@ -233,7 +236,7 @@ namespace OnlineStore.ACSingleStore ...@@ -233,7 +236,7 @@ namespace OnlineStore.ACSingleStore
TabPage lineTabPage = new TabPage(text); TabPage lineTabPage = new TabPage(text);
Panel linePan = new Panel(); Panel linePan = new Panel();
linePan.Dock = DockStyle.Fill; linePan.Dock = DockStyle.Fill;
linePan.AutoScroll = true; linePan.AutoScroll = true;
form.FormBorderStyle = FormBorderStyle.None; form.FormBorderStyle = FormBorderStyle.None;
form.TopLevel = false; form.TopLevel = false;
......
...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices; ...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 0611b64cd55529e2d6f26d9a2b0f7b8a6a22700d")] [assembly: AssemblyProduct("SO951-HC-ACSingleStore 3f972f3f1ae8ddd17dbf3847e26af0a0b4e1f8b2")]
[assembly: AssemblyCopyright("Copyright ? 2017")] [assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
......
...@@ -130,14 +130,22 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -130,14 +130,22 @@ namespace OnlineStore.ACSingleStore.useControl
var pa2 = pa[2]; var pa2 = pa[2];
var pb2 = pb[2]; var pb2 = pb[2];
if (pa[2].Length == 2 && pb[2].Length == 2) if (pa[2].Length == 2)
{ {
if ((pa[2][1].Equals('A') || pa[2][1].Equals('B')) && (pb[2][1].Equals('A') || pb[2][1].Equals('B'))) if (pa[2][1].Equals('A') || pa[2][1].Equals('B'))
{ {
pa2 = (pa[2][1].Equals('A') ? "1" : "2") + pa[2][0]; pa2 = (pa[2][1].Equals('A') ? "1" : "2") + pa[2][0];
}
}
if ( pb[2].Length == 2)
{
if ((pb[2][1].Equals('A') || pb[2][1].Equals('B')))
{
pb2 = (pb[2][1].Equals('A') ? "1" : "2") + pb[2][0]; pb2 = (pb[2][1].Equals('A') ? "1" : "2") + pb[2][0];
} }
} }
var isa = Regex.Replace(pa[1], @"[^\d]*", "") + pa1 + pa2 + pa[3].PadLeft(2, '0'); var isa = Regex.Replace(pa[1], @"[^\d]*", "") + pa1 + pa2 + pa[3].PadLeft(2, '0');
var isb = Regex.Replace(pb[1], @"[^\d]*", "") + pb1 + pb2 + pb[3].PadLeft(2, '0'); var isb = Regex.Replace(pb[1], @"[^\d]*", "") + pb1 + pb2 + pb[3].PadLeft(2, '0');
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!