diff --git a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo
index ffbeebab..8ed5436c 100644
Binary files a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo and b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj b/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj
index 52e3523f..a05db2b5 100644
--- a/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj
+++ b/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj
@@ -131,7 +131,10 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="package.png" />
+    <Content Include="packages.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/其他專案資料/AMES_AP/AMES_AP/Form1.Designer.cs b/其他專案資料/AMES_AP/AMES_AP/Form1.Designer.cs
index 6d52e889..ee06b76a 100644
--- a/其他專案資料/AMES_AP/AMES_AP/Form1.Designer.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/Form1.Designer.cs
@@ -57,6 +57,7 @@ namespace AMES_AP
             // tabPage1
             // 
             this.tabPage1.BackColor = System.Drawing.Color.White;
+            this.tabPage1.CausesValidation = false;
             this.tabPage1.ImageKey = "packaging.png";
             this.tabPage1.Location = new System.Drawing.Point(4, 39);
             this.tabPage1.Name = "tabPage1";
diff --git a/其他專案資料/AMES_AP/AMES_AP/Form1.resx b/其他專案資料/AMES_AP/AMES_AP/Form1.resx
index 4d9c39ea..07edd52f 100644
--- a/其他專案資料/AMES_AP/AMES_AP/Form1.resx
+++ b/其他專案資料/AMES_AP/AMES_AP/Form1.resx
@@ -124,80 +124,80 @@
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+
-        EAAAAk1TRnQBSQFMAgEBAgEAAQgBAAEIAQABIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
-        AwABIAMAAQEBAAEgBgABQMoAAyUBOwMiAcsDIgHLAyUBO/8A6QADFAEcAy8BpgMLAfADHwHQAx8B0AML
-        AfADLwGmAxQBHP8A2QADBgEIAzQBfQMJAfMDMgGbAxABFgM0AYgDNAGIAxABFgMyAZsDCQHzAzQBfQMG
-        AQj/AC0AAwcBCQMhATMDIQEzAyEBMwMdASocAAMBAQIDIAExAyEBMwMhATMDIAExAwEBAhwAAx0BKgMh
-        ATMDIQEzAyEBMwMGAQgoAAMuAVQDFgHgAyYBwwMhATIIAAM0AYgDNAGICAADIQEyAyYBwwMWAeADLgFU
-        /wApAAMzAZQDIQHMAygBuwMoAbsDFAHjAykBQxgAAzIBaAMbAdcDKAG7AygBuwMbAdcDMwFuGAADJgE9
-        AxQB4wMoAbsDKAG7AyEBzAMyAZogAAMfAS4DJwG/AxUB4gMvAVgQAAM0AYgDNAGIEAADLwFYAxUB4gMn
-        Ab8DHwEu/wAdAAMjATcDJAHFAzQBcgMpAUQDKQFEAywBsgM0AYYDKQFEAykBRAMpAUQDKQFEAykBRAMp
-        AUQDLwGlAzMBkgMpAUQDKQFEAzMBkgMvAaUDKQFEAykBRAMLAQ8DFwEgAykBRAMpAUQDNAGGAywBsgMp
-        AUQDKQFEAzQBcgMkAcUDIwE3FAADDgETAzIBlgMJAfMDNAGBAwcBChQAAzQBiAM0AYgQAAMDAQQDBwEK
-        AzQBgQMJAfMDMgGWAw4BE/8AFQADBQH4Ay4BqgMuAaoDLgGqAy4BqgMuAaoDLgGqAy4BqgMuAaoDLgGq
-        Ay4BqgMuAaoDLgGqAy4BqgMuAaoDLgGqAy4BqgMuAaoDLgGqAy4BqgMuAaoDIAQxAV0DLgGqAy4BqgMu
-        AaoDLgGqAy4BqgMuAaoDLgGqAy4BqgMFAfgUAAMxAZwDKAG7AxYBHxwAAzQBiAM0AYgQAAMzAZIDLgFS
-        BAADFgEfAygBuwMxAZz/ABUAAwoB8gMhATMDIQEzAyEBMwMhATMDIQEzAyEBMwMhATMDIQEzAyEBMwMh
-        ATMDIQEzAyEBMwMhATMDIQEzAyEBMwMhATMDIQEzAyEBMwMhATMDIQEzAyEBMwMhATMDIQEzAyEBMwMh
-        ATMDIQEzAyEBMwMhATMDIQEzAyEBMwMKAfIUAAMvAagDMgFoIAADNAGIAzQBiBAAAzQBgQMpAUUDMgFr
-        AzIBawMyAWgDLwGo/wAVAAMtAa0DDwHqAyEBzAMoAbsDKAG7AygBuwMoAbsDKAG7AygBuwMoAbsDKAG7
-        AygBuwMoAbsDKAG7AygBuwMZAdsDGQHbAygBuwMoAbsDKAG7AygBuwMoAbsDKAG7AygBuwMoAbsDKAG7
-        AygBuwMoAbsDKAG7AyABzQMQAekDLQGtFAADLwGoAzIBaAwAAyUBOwMKAQ0MAAM0AYgDNAGIDAADCgEN
-        AyUBOwQAAzIBawMyAWsDMgFoAy8BqP8AGQADLAGwAycBPzAAAzQBeAM0AXgwAAMpAUQDLgGrGAADLwGo
-        AzIBaAQAAyABMAMmAcEDDwHrAxIB5wMxAWADAAEBBAADNAGIAzQBiAcAAQEDMQFgAxIB5wMPAesDJgHB
-        AyABMAQAAzIBaAMvAaj/ABkAAywBsAMnAT8wAAM0AXgDNAF4MAADKQFEAy4BqxgAAy8BqAM0AX0DMgGZ
-        Aw0B7gM0AXMDBAEFAyoBRgMcAdYDIgHKAyQBOAM0AYgDNAGIAyQBOAMiAcoDHAHWAyoBRgMEAQUDNAFz
-        Aw0B7gMyAZkDNAF9Ay8BqP8AGQADLgGpAyQBODAAAzQBeAM0AXgwAAMpAUQDLgGrFAADAwEEAygBvQMB
-        Af0DMQGcAxABFgwAAwMBBAMzAXEDDAHvAxIB5wMSAecDDAHvAzMBcQMDAQQMAAMQARYDMQGcAwEB/QMo
-        Ab0DAwEE/wAVAAMEAQY0AAM0AXgDNAF4MAADKQFEAy4BqxAAAyoBRgMcAdYDJgHDAyEBMhgAAwQBBgMz
-        AYwDAQH8AwEB/AMzAYwDBAEGGAADIQEyAyYBwwMcAdYDKgFG/wARAAMyAZYDHwEuEAADGgElAykBRAMp
-        AUQDEAEWEAADNAF4AzQBeBAAAxIBGAMpAUQDKQFEAxkBJBAAAykBRAMuAasIAAMZASMDLAGxAxUB4gMv
-        AVgcAAMsAU4DGQHbAygBvgMeAS0DHgEtAygBvgMZAdsDLAFOHAADLwFYAxUB4gMsAbEDGQEj/wAJAAMs
-        AbADJwE/EAADIwHJAyoBtgMjAckDMwGREAADNAF4AzQBeBAAAzIBlgMjAccDKgG3AyUBxBAAAykBRAMu
-        AasEAAM0AYADDAHvAzQBgQMHAQoYAAMdASoDKQG6AxcB3gMuAVIQAAMuAVIDFwHeAykBugMdASoYAAMH
-        AQoDNAGBAwwB7wM0AXf/AAUAAywBsAMnAT8QAAMhAcwDGQEjAzABXAMzAZMQAAM0AXgDNAF4EAADMgGY
-        Ay8BVwMbASgDIwHHEAADKQFEAy4BqwQAAzMBjAMMAe8DMwFwAwMBBBAAAw0BEQMzAZEDCwHwAzQBewMG
-        AQgYAAMGAQgDNAF7AwsB8AMzAZEDDQEREAADAwEEAzMBcAMMAe8DMwGV/wAFAAMsAbADJwE/EAADIQHM
-        AxkBIwMwAVwDMwGTEAADNAF4AzQBeBAAAzIBmAMvAVcDGwEoAyMBxxAAAykBRAMuAasIAAMjATYDIwHH
-        AxwB1gMpAUUEAAMCAQMDMgFoAw8B6wMwAaMDFAEbKAADFAEbAzABowMPAesDMgFoAwIBAwQAAykBRQMc
-        AdYDIwHHAyMBNv8ACQADLAGwAzIBmAM0AXcDNAF3AzQBdwM0AXcDEwHkAzQBigMvAagDJAHGAzQBdwM0
-        AXcDNAF3AzQBdwMqAbcDKgG3AzQBdwM0AXcDNAF3AzQBdwMjAcgDLwGlAzMBjAMVAeEDNAF3AzQBdwM0
-        AXcDNAF3AzIBmwMuAasPAAEBAzEBXQMTAeUDLAGyAx8B0QMiAcoDJAE5GAADFAEcAxgBIhgAAyQBOQMi
-        AcoDHwHRAywBsgMTAeUDMQFdAwABAf8ADQADKQFFAzQBdwM0AXcDNAF3AzQBdwM0AXcDNAF3AyMByAMv
-        AaUDNAF3AzQBdwM0AXcDNAF3AzQBdwM0AXcDNAF3AzQBdwM0AXcDNAF3AzQBdwM0AXcDLgGqAyUBxAM0
-        AXcDNAF3AzQBdwM0AXcDNAF3AzQBdwMoAUIQAAMZASQDKgG4Aw8B6wMFAfgDNAGOAwsBDxQAAwkBDAMY
-        Ad0DFwHeAwoBDRQAAwoBDgM0AY4DBQH4Aw8B6wMqAbgDGQEk/wAtAAMyAZgDLwFXMAADMQFgAzMBjyQA
-        AwoBDQM0AYkDCgHyAzQBigMKAQ4DGQEjAywBsAMQAekDMgFkAwEBAgwAAzIBmwMsAbEDLAGxAzEBnw8A
-        AQEDMgFiAxEB6AMsAbADGQEjAwoBDgM0AYoDCgHyAzQBiQMKAQ3/ACUAAzIBmAMvAVcwAAMxAWADMwGP
-        IAADMAFcAxIB5wMsAbIDGQEkEAADKQFEAx0B1AMgAc4DJgE9BAADLAFNAxEB6AMPARUDDwEVAxEB6AMu
-        AVMEAAMlAToDIgHLAx0B1AMpAUQQAAMZASQDLAGyAxIB5wMvAVn/ACEAAzIBmAMvAVcwAAMxAWADMwGP
-        IAADKwG0AxIB5wMoAUIYAAMCAQMDMgFrAw4B7AMuAakDEQHoAysBSggAAysBSgMOAewDLwGmAw4B7AMy
-        AWsDAgEDGAADKAFBAxIB5wMnAb//ACEAAzIBmAMvAVcwAAMxAWADMwGPIAADAQECAzIBZAMQAekDLQGu
-        AxgBIhgAAw0EEgHmAzABogMFAQcIAAMFAQcDMAGiAxIB5wMOARMYAAMXASEDLQGtAxAB6QMyAWUDAQEC
-        /wAhAAMyAZgDLwFXEAADLAFMAzQBiAM0AYgDKgFHEAADMQFgAzMBjygAAwoBDgMzAYwDCgHyAzQBhwMK
-        AQ0QAAMWAR8DBgH2AwAB/wMdAdMIAAMdAdMDAAH/AwEB/AMTARoQAAMIAQsDNAGEAwoB8gM0AY4DCwEP
-        /wApAAMyAZgDLwFXEAADKwG0AzIBlgMyAZsDLgGrEAADMQFgAzMBjzAAAxoBJgMrAbQDEgHnAzIBYQMA
-        AQEQAAMdASsDDwHqBAADCAELAwQB+QMHAQkTAAEBAzABXAMTAeQDKgG3AxsBJ/8AMQADMgGYAy8BVxAA
-        AysBtAMlATsDKQFEAy4BqxAAAzEBYAMzAY84AAMqAUgDGwHXAzMBcBAAAzQBhwMoAbsEAAMlATsDHQHT
-        EAADIgE1AyQBxgMaAdoDKwFL/wA5AAMyAZgDLwFXEAADKwG0AyUBOwMpAUQDLgGrEAADMQFgAzMBjzQA
-        AxMBGgMvAVcDCgENAwgBCwMvAVcDLwFYAzABXAMuAakDCwHxAyIBNQQAAzQBdAMxAZ8EAAMPARUDEwHl
-        AywBsAMLAfADNAF0AwQBBv8APQADMwGVAx4B0gMqAbYDEgEZAzQBhgMoAbsDDwHrAyIBywMgAc0DEAHp
-        AygBuwMoAbsDKAG7AygBuwMdAdUDMwGMNAADLQFQAyoBtwMfAS4DHwEuAyoBtwMqAbgDKwG1AzMBjwMa
-        ASYEAAMSARgDDwHqAycBPwgAAyUBPAM0AYMDEQEX/wBFAAMPARUDIQEzAyABMQMCAQMDFwQhATMDIQEz
-        AyEBMwMhATMDIQEzAyEBMwMhATMDIQEzAyEBMwMhATMDDgETLAADDQESAyABMAMgATADIAEwAyABMAMD
-        AQQXAAEBAywBsQMzAZD/AMkAAzQBggMWAeADFgHgAxYB4AMWAeADKQFDEAADFQEeAygBuwMgAc0DBwEJ
-        /wDBAAMFAQcDCAELBAADAgEDAwwBEAMMARADDAEQAwwBEAMMARADGQEkAy8BWAMzAY8DDQHuAzQBhgME
-        AQb/AMUAAy0BrwMSAeYDBwEJAzQBdwMAAf8DAAH/AwAB/wMAAf8DAAH/Aw4B7AMpAbkDNAGGAyIBNP8A
-        SQABQgFNAT4HAAE+AwABKAMAAYADAAEgAwABAQEAAQEGAAECFgAD/wEABf8B/AE/Af8IAAX/AfABDwH/
-        CAAF/wHAAQMB/wgAAYMB+AEfAcEB/wGGAWEB/wgAAYEB+AEfAYEB/gEeAXgBfwwAAfgBPgF4AR8MAAH4
-        Af4BeQEfDAAB+QH+AXgBHwwAAfkBzgFyAR8IAAGfAf4BfwL5AQIBQAGfCAABnwH+AX8B+QH4AgABHwgA
-        AZ8B/gF/AfkB8AFwAQ4BDwgAAb8B/gF/AfkB4QH4AR8BhwgAAZ4BHgF4AXkBhwHwAQ8B4QgAAZ4BHgF4
-        AXkBDwLDAfAIAAGeAR4BeAF5AQ8BBwHgAfAIAAGeAR4BeAF5AYQBHwH4ASEIAAGAAgABAQHAAn4BAwgA
-        AYACAAEBAeABfAE+AQcIAAH/AT8B/AH/AYABHAE4AQEIAAH/AT8B/AH/AQ8BCAEQAfAIAAH/AT8B/AH/
-        AR8CgQH4CAAB/wE/AfwB/wEHAeEBhwHgCAAB/wI8Af8BwQHhAYcBgwgAAf8CPAH/AfABeQEeAQ8IAAH/
-        AjwB/wH8AXkBPAE/CAAB/wI8Af8B+AEBASABfwgAAf8CAAH/AfgBAgExAf8IAAH/AgAB/wHgAXwBfwH/
-        CAAE/wHgAXgBfwH/CAAE/wGQAQAC/wgABP8BgAEDAv8IAAs=
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAC
+        EQAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        AwABIAMAAQEBAAEgBgABQMoAAycBOwM2AcsDNgHLAycBO/8A6QADFAEcA0QBpgMTAfADMwHQAzMB0AMT
+        AfADRAGmAxQBHP8A2QADBgEIA0EBfQMSAfMDRAGbAxABFgNCAYgDQgGIAxABFgNEAZsDEgHzA0EBfQMG
+        AQj/AC0AAwcBCQMjATMDIwEzAyMBMwMdASocAAMBAQIDIQExAyMBMwMjATMDIQExAwEBAhwAAx0BKgMj
+        ATMDIwEzAyMBMwMGAQgoAAMzAVQDJgHgAzsBwwMiATIIAANCAYgDQgGICAADIgEyAzsBwwMmAeADMwFU
+        /wApAANEAZQDNgHMAz4BuwM+AbsDJAHjAysBQxgAAzsBaAMvAdcDPgG7Az4BuwMvAdcDPQFuGAADKAE9
+        AyQB4wM+AbsDPgG7AzYBzANEAZogAAMgAS4DPAG/AyUB4gM1AVgQAANCAYgDQgGIEAADNQFYAyUB4gM8
+        Ab8DIAEu/wAdAAMlATcDOgHFAz4BcgMsAUQDLAFEA0IBsgNCAYYDLAFEAywBRAMsAUQDLAFEAywBRAMs
+        AUQDQwGlA0MBkgMsAUQDLAFEA0MBkgNDAaUDLAFEAywBRAMLAQ8DFwEgAywBRAMsAUQDQgGGA0IBsgMs
+        AUQDLAFEAz4BcgM6AcUDJQE3FAADDgETA0MBlgMSAfMDQgGBAwcBChQAA0IBiANCAYgQAAMDAQQDBwEK
+        A0IBgQMSAfMDQwGWAw4BE/8AFQADCgH4A0MBqgNDAaoDQwGqA0MBqgNDAaoDQwGqA0MBqgNDAaoDQwGq
+        A0MBqgNDAaoDQwGqA0MBqgNDAaoDQwGqA0MBqgNDAaoDQwGqA0MBqgNDAaoDIQExAzcBXQNDAaoDQwGq
+        A0MBqgNDAaoDQwGqA0MBqgNDAaoDQwGqAwoB+BQAA0QBnAM+AbsDFgEfHAADQgGIA0IBiBAAA0MBkgMy
+        AVIEAAMWAR8DPgG7A0QBnP8AFQADEgHyAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEz
+        AyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEz
+        AyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAxIB8hQAA0MBqAM7AWggAANCAYgDQgGIEAADQgGBAywBRQM8
+        AWsDPAFrAzsBaANDAaj/ABUAA0IBrQMcAeoDNgHMAz4BuwM+AbsDPgG7Az4BuwM+AbsDPgG7Az4BuwM+
+        AbsDPgG7Az4BuwM+AbsDPgG7AysB2wMrAdsDPgG7Az4BuwM+AbsDPgG7Az4BuwM+AbsDPgG7Az4BuwM+
+        AbsDPgG7Az4BuwM+AbsDNQHNAx4B6QNCAa0UAANDAagDOwFoDAADJwE7AwoBDQwAA0IBiANCAYgMAAMK
+        AQ0DJwE7BAADPAFrAzwBawM7AWgDQwGo/wAZAANBAbADKQE/MAADQAF4A0ABeDAAAywBRANDAasYAAND
+        AagDOwFoBAADIQEwAzwBwQMcAesDHwHnAzgBYAMAAQEEAANCAYgDQgGIBwABAQM4AWADHwHnAxwB6wM8
+        AcEDIQEwBAADOwFoA0MBqP8AGQADQQGwAykBPzAAA0ABeANAAXgwAAMsAUQDQwGrGAADQwGoA0EBfQND
+        AZkDFwHuAz4BcwMEAQUDLQFGAy8B1gM4AcoDJgE4A0IBiANCAYgDJgQ4AcoDLwHWAy0BRgMEAQUDPgFz
+        AxcB7gNDAZkDQQF9A0MBqP8AGQADQgGpAyYBODAAA0ABeANAAXgwAAMsAUQDQwGrFAADAwEEAz4BvQMC
+        Af0DRAGcAxABFgwAAwMBBAM+AXEDFQHvAx8B5wMfAecDFQHvAz4BcQMDAQQMAAMQARYDRAGcAwIB/QM+
+        Ab0DAwEE/wAVAAMEAQY0AANAAXgDQAF4MAADLAFEA0MBqxAAAy0BRgMvAdYDOwHDAyIBMhgAAwQBBgNC
+        AYwDAgH8AwIB/ANCAYwDBAEGGAADIgEyAzsBwwMvAdYDLQFG/wARAANDAZYDIAEuEAADGgElAywBRAMs
+        AUQDEAEWEAADQAF4A0ABeBAAAxIBGAMsAUQDLAFEAxoBJBAAAywBRANDAasIAAMZASMDQgGxAyUB4gM1
+        AVgcAAMwAU4DKwHbAz4BvgMfAS0DHwEtAz4BvgMrAdsDMAFOHAADNQFYAyUB4gNCAbEDGQEj/wAJAANB
+        AbADKQE/EAADOQHJAz8BtgM5AckDQwGREAADQAF4A0ABeBAAA0MBlgM4AccDPwG3AzoBxBAAAywBRAND
+        AasEAANCAYADFQHvA0IBgQMHAQoYAAMdASoDPwG6AycB3gMyAVIQAAMyAVIDJwHeAz8BugMdASoYAAMH
+        AQoDQgGBAxUB7wNAAXf/AAUAA0EBsAMpAT8QAAM2AcwDGQEjAzYBXANDAZMQAANAAXgDQAF4EAADRAGY
+        AzUBVwMcASgDOAHHEAADLAFEA0MBqwQAA0IBjAMVAe8DPQFwAwMBBBAAAw0BEQNDAZEDEwHwA0ABewMG
+        AQgYAAMGAQgDQAF7AxMB8ANDAZEDDQEREAADAwEEAz0BcAMVAe8DRAGV/wAFAANBAbADKQE/EAADNgHM
+        AxkBIwM2AVwDQwGTEAADQAF4A0ABeBAAA0QBmAM1AVcDHAEoAzgBxxAAAywBRANDAasIAAMkATYDOAHH
+        Ay8B1gMsAUUEAAMCAQMDOwFoAxwB6wNEAaMDFAEbKAADFAEbA0QBowMcAesDOwFoAwIBAwQAAywBRQMv
+        AdYDOAHHAyQBNv8ACQADQQGwA0QBmANAAXcDQAF3A0ABdwNAAXcDIgHkA0MBigNDAagDOgHGA0ABdwNA
+        AXcDQAF3A0ABdwM/AbcDPwG3A0ABdwNAAXcDQAF3A0ABdwM5AcgDQwGlA0IBjAMmAeEDQAF3A0ABdwNA
+        AXcDQAF3A0QBmwNDAasPAAEBAzcBXQMhAeUDQgGyAzMB0QM4AcoDJgE5GAADFAEcAxgBIhgAAyYBOQM4
+        AcoDMwHRA0IBsgMhAeUDNwFdAwABAf8ADQADLAFFA0ABdwNAAXcDQAF3A0ABdwNAAXcDQAF3AzkByAND
+        AaUDQAF3A0ABdwNAAXcDQAF3A0ABdwNAAXcDQAF3A0ABdwNAAXcDQAF3A0ABdwNAAXcDQwGqAzoBxANA
+        AXcDQAF3A0ABdwNAAXcDQAF3A0ABdwMrAUIQAAMaASQDPwG4AxwB6wMKAfgDRAGOAwsBDxQAAwkBDAMq
+        Ad0DJwHeAwoBDRQAAwoBDgNEAY4DCgH4AxwB6wM/AbgDGgEk/wAtAANEAZgDNQFXMAADOAFgA0QBjyQA
+        AwoBDQNDAYkDEgHyA0MBigMKAQ4DGQEjA0EBsAMeAekDOgFkAwEBAgwAA0QBmwNCAbEDQgGxA0QBnw8A
+        AQEDOQFiAx4B6ANBAbADGQEjAwoBDgNDAYoDEgHyA0MBiQMKAQ3/ACUAA0QBmAM1AVcwAAM4AWADRAGP
+        IAADNgFcAx8B5wNCAbIDGgEkEAADLAFEAzAB1AM1Ac4DKAE9BAADMAFNAx4B6AMQARUDEAEVAx4B6AMz
+        AVMEAAMmAToDNgHLAzAB1AMsAUQQAAMaASQDQgGyAx8B5wM1AVn/ACEAA0QBmAM1AVcwAAM4AWADRAGP
+        IAADQAG0Ax8B5wMrAUIYAAMCAQMDPAFrAxoB7ANCAakDHgHoAy8BSggAAy8BSgMaAewDRAGmAxoB7AM8
+        AWsDAgEDGAADKgFBAx8B5wM8Ab//ACEAA0QBmAM1AVcwAAM4AWADRAGPIAADAQECAzoBZAMeAekDQgGu
+        AxgBIhgAAw0BEgMgAeYDQwGiAwUBBwgAAwUBBwNDAaIDHwHnAw4BExgAAxgBIQNCAa0DHgHpAzoBZQMB
+        AQL/ACEAA0QBmAM1AVcQAAMwAUwDQgGIA0IBiAMtAUcQAAM4AWADRAGPKAADCgEOA0IBjAMSAfIDQgGH
+        AwoBDRAAAxYBHwMMAfYDAAH/AzEB0wgAAzEB0wMAAf8DAgH8AxMBGhAAAwgBCwNDAYQDEgHyA0QBjgML
+        AQ//ACkAA0QBmAM1AVcQAANAAbQDQwGWA0QBmwNDAasQAAM4AWADRAGPMAADGwEmA0ABtAMfAecDOQFh
+        AwABARAAAx4BKwMcAeoEAAMIAQsDCAH5AwcBCRMAAQEDNgFcAyIB5AM/AbcDHAEn/wAxAANEAZgDNQFX
+        EAADQAG0AycBOwMsAUQDQwGrEAADOAFgA0QBjzgAAy4BSAMvAdcDPQFwEAADQgGHAz4BuwQAAycBOwMx
+        AdMQAAMkATUDOgHGAywB2gMvAUv/ADkAA0QBmAM1AVcQAANAAbQDJwE7AywBRANDAasQAAM4AWADRAGP
+        NAADEwEaAzUBVwMKAQ0DCAELAzUBVwM1AVgDNgFcA0IBqQMTAfEDJAE1BAADPwF0A0QBnwQAAxABFQMh
+        AeUDQQGwAxMB8AM/AXQDBAEG/wA9AANEAZUDMgHSAz8BtgMSARkDQgGGAz4BuwMcAesDNgHLAzUBzQMe
+        AekDPgG7Az4BuwM+AbsDPgG7AzAB1QNCAYw0AAMyAVADPwG3AyABLgMgAS4DPwG3Az8BuANBAbUDRAGP
+        AxsBJgQAAxIBGAMcAeoDKQE/CAADKAE8A0MBgwMRARf/AEUAAxABFQMjATMDIQExAwIBAwMYASEDIwEz
+        AyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAw4BEywAAw0BEgMhATADIQEwAyEBMAMh
+        ATADAwEEFwABAQNCAbEDRAGQ/wDJAANCAYIDJgHgAyYB4AMmAeADJgHgAysBQxAAAxYBHgM+AbsDNQHN
+        AwcBCf8AwQADBQEHAwgBCwQAAwIBAwMMARADDAEQAwwBEAMMARADDAEQAxoBJAM1AVgDRAGPAxcB7gNC
+        AYYDBAEG/wDFAANCAa8DIAHmAwcBCQNAAXcDAAH/AwAB/wMAAf8DAAH/AwAB/wMaAewDPwG5A0IBhgMj
+        ATT/AEkAAUIBTQE+BwABPgMAASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAX/AfwBPwH/CAAF/wHw
+        AQ8B/wgABf8BwAEDAf8IAAGDAfgBHwHBAf8BhgFhAf8IAAGBAfgBHwGBAf4BHgF4AX8MAAH4AT4BeAEf
+        DAAB+AH+AXkBHwwAAfkB/gF4AR8MAAH5Ac4BcgEfCAABnwH+AX8C+QECAUABnwgAAZ8B/gF/AfkB+AIA
+        AR8IAAGfAf4BfwH5AfABcAEOAQ8IAAG/Af4BfwH5AeEB+AEfAYcIAAGeAR4BeAF5AYcB8AEPAeEIAAGe
+        AR4BeAF5AQ8CwwHwCAABngEeAXgBeQEPAQcB4AHwCAABngEeAXgBeQGEAR8B+AEhCAABgAIAAQEBwAJ+
+        AQMIAAGAAgABAQHgAXwBPgEHCAAB/wE/AfwB/wGAARwBOAEBCAAB/wE/AfwB/wEPAQgBEAHwCAAB/wE/
+        AfwB/wEfAoEB+AgAAf8BPwH8Af8BBwHhAYcB4AgAAf8CPAH/AcEB4QGHAYMIAAH/AjwB/wHwAXkBHgEP
+        CAAB/wI8Af8B/AF5ATwBPwgAAf8CPAH/AfgBAQEgAX8IAAH/AgAB/wH4AQIBMQH/CAAB/wIAAf8B4AF8
+        AX8B/wgABP8B4AF4AX8B/wgABP8BkAEAAv8IAAT/AYABAwL/CAAL
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/其他專案資料/AMES_AP/AMES_AP/InHouse.Designer.cs b/其他專案資料/AMES_AP/AMES_AP/InHouse.Designer.cs
index 6c44b885..b0e46cc0 100644
--- a/其他專案資料/AMES_AP/AMES_AP/InHouse.Designer.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/InHouse.Designer.cs
@@ -29,17 +29,17 @@ namespace AMES_AP
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.WipNo = new MaterialSkin.Controls.MaterialTextBox();
             this.materialButton5 = new MaterialSkin.Controls.MaterialButton();
-            this.materialButton4 = new MaterialSkin.Controls.MaterialButton();
             this.btnAddInHouse = new MaterialSkin.Controls.MaterialButton();
             this.DataToLeft = new MaterialSkin.Controls.MaterialButton();
             this.DataToRight = new MaterialSkin.Controls.MaterialButton();
@@ -59,10 +59,9 @@ namespace AMES_AP
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.materialButton1 = new MaterialSkin.Controls.MaterialButton();
             this.QueryWipNo = new MaterialSkin.Controls.MaterialButton();
-            this.InHouseNo = new MaterialSkin.Controls.MaterialMaskedTextBox();
             this.materialLabel2 = new MaterialSkin.Controls.MaterialLabel();
-            this.WipNo = new MaterialSkin.Controls.MaterialMaskedTextBox();
             this.materialLabel1 = new MaterialSkin.Controls.MaterialLabel();
+            this.InHouseNo = new MaterialSkin.Controls.MaterialTextBox();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
@@ -70,8 +69,9 @@ namespace AMES_AP
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.InHouseNo);
+            this.groupBox1.Controls.Add(this.WipNo);
             this.groupBox1.Controls.Add(this.materialButton5);
-            this.groupBox1.Controls.Add(this.materialButton4);
             this.groupBox1.Controls.Add(this.btnAddInHouse);
             this.groupBox1.Controls.Add(this.DataToLeft);
             this.groupBox1.Controls.Add(this.DataToRight);
@@ -83,9 +83,7 @@ namespace AMES_AP
             this.groupBox1.Controls.Add(this.dataGridView1);
             this.groupBox1.Controls.Add(this.materialButton1);
             this.groupBox1.Controls.Add(this.QueryWipNo);
-            this.groupBox1.Controls.Add(this.InHouseNo);
             this.groupBox1.Controls.Add(this.materialLabel2);
-            this.groupBox1.Controls.Add(this.WipNo);
             this.groupBox1.Controls.Add(this.materialLabel1);
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox1.Location = new System.Drawing.Point(3, 64);
@@ -94,6 +92,26 @@ namespace AMES_AP
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
+            // WipNo
+            // 
+            this.WipNo.AnimateReadOnly = false;
+            this.WipNo.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.WipNo.Depth = 0;
+            this.WipNo.Font = new System.Drawing.Font("Roboto", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
+            this.WipNo.Hint = "輸入工單號碼";
+            this.WipNo.LeadingIcon = null;
+            this.WipNo.Location = new System.Drawing.Point(101, 35);
+            this.WipNo.MaxLength = 50;
+            this.WipNo.MouseState = MaterialSkin.MouseState.OUT;
+            this.WipNo.Multiline = false;
+            this.WipNo.Name = "WipNo";
+            this.WipNo.Size = new System.Drawing.Size(136, 50);
+            this.WipNo.TabIndex = 22;
+            this.WipNo.TabStop = false;
+            this.WipNo.Text = "";
+            this.WipNo.TrailingIcon = null;
+            this.WipNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.WipNo_KeyPress);
+            // 
             // materialButton5
             // 
             this.materialButton5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
@@ -113,25 +131,6 @@ namespace AMES_AP
             this.materialButton5.UseAccentColor = false;
             this.materialButton5.UseVisualStyleBackColor = true;
             // 
-            // materialButton4
-            // 
-            this.materialButton4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.materialButton4.Density = MaterialSkin.Controls.MaterialButton.MaterialButtonDensity.Default;
-            this.materialButton4.Depth = 0;
-            this.materialButton4.HighEmphasis = true;
-            this.materialButton4.Icon = null;
-            this.materialButton4.Location = new System.Drawing.Point(983, 447);
-            this.materialButton4.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
-            this.materialButton4.MouseState = MaterialSkin.MouseState.HOVER;
-            this.materialButton4.Name = "materialButton4";
-            this.materialButton4.NoAccentTextColor = System.Drawing.Color.Empty;
-            this.materialButton4.Size = new System.Drawing.Size(64, 36);
-            this.materialButton4.TabIndex = 20;
-            this.materialButton4.Text = "預覽";
-            this.materialButton4.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained;
-            this.materialButton4.UseAccentColor = false;
-            this.materialButton4.UseVisualStyleBackColor = true;
-            // 
             // btnAddInHouse
             // 
             this.btnAddInHouse.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
@@ -270,17 +269,17 @@ namespace AMES_AP
             // 
             this.dataGridView2.AllowUserToAddRows = false;
             this.dataGridView2.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dataGridView2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dataGridView2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
             this.dataGridView2.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
             this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewCheckBoxColumn1,
@@ -289,18 +288,18 @@ namespace AMES_AP
             this.dataGridViewTextBoxColumn3});
             this.dataGridView2.Location = new System.Drawing.Point(629, 145);
             this.dataGridView2.Name = "dataGridView2";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle11;
             this.dataGridView2.RowHeadersVisible = false;
             this.dataGridView2.RowHeadersWidth = 51;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle12;
             this.dataGridView2.RowTemplate.Height = 27;
             this.dataGridView2.Size = new System.Drawing.Size(457, 274);
             this.dataGridView2.TabIndex = 11;
@@ -341,17 +340,17 @@ namespace AMES_AP
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
             this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
+            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column4,
@@ -360,18 +359,18 @@ namespace AMES_AP
             this.Column3});
             this.dataGridView1.Location = new System.Drawing.Point(17, 145);
             this.dataGridView1.Name = "dataGridView1";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
+            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle15;
             this.dataGridView1.RowHeadersVisible = false;
             this.dataGridView1.RowHeadersWidth = 51;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle16;
             this.dataGridView1.RowTemplate.Height = 27;
             this.dataGridView1.Size = new System.Drawing.Size(457, 274);
             this.dataGridView1.TabIndex = 10;
@@ -416,7 +415,7 @@ namespace AMES_AP
             this.materialButton1.Depth = 0;
             this.materialButton1.HighEmphasis = true;
             this.materialButton1.Icon = null;
-            this.materialButton1.Location = new System.Drawing.Point(906, 37);
+            this.materialButton1.Location = new System.Drawing.Point(897, 35);
             this.materialButton1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.materialButton1.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialButton1.Name = "materialButton1";
@@ -451,48 +450,6 @@ namespace AMES_AP
             this.QueryWipNo.UseVisualStyleBackColor = true;
             this.QueryWipNo.Click += new System.EventHandler(this.QueryWipNo_Click);
             // 
-            // InHouseNo
-            // 
-            this.InHouseNo.AllowPromptAsInput = true;
-            this.InHouseNo.AnimateReadOnly = false;
-            this.InHouseNo.AsciiOnly = false;
-            this.InHouseNo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.InHouseNo.BeepOnError = false;
-            this.InHouseNo.CutCopyMaskFormat = System.Windows.Forms.MaskFormat.IncludeLiterals;
-            this.InHouseNo.Depth = 0;
-            this.InHouseNo.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
-            this.InHouseNo.HidePromptOnLeave = false;
-            this.InHouseNo.HideSelection = true;
-            this.InHouseNo.Hint = "入庫單號碼";
-            this.InHouseNo.InsertKeyMode = System.Windows.Forms.InsertKeyMode.Default;
-            this.InHouseNo.LeadingIcon = null;
-            this.InHouseNo.Location = new System.Drawing.Point(729, 37);
-            this.InHouseNo.Mask = "";
-            this.InHouseNo.MaxLength = 32767;
-            this.InHouseNo.MouseState = MaterialSkin.MouseState.OUT;
-            this.InHouseNo.Name = "InHouseNo";
-            this.InHouseNo.PasswordChar = '\0';
-            this.InHouseNo.PrefixSuffixText = null;
-            this.InHouseNo.PromptChar = '_';
-            this.InHouseNo.ReadOnly = false;
-            this.InHouseNo.RejectInputOnFirstFailure = false;
-            this.InHouseNo.ResetOnPrompt = true;
-            this.InHouseNo.ResetOnSpace = true;
-            this.InHouseNo.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.InHouseNo.SelectedText = "";
-            this.InHouseNo.SelectionLength = 0;
-            this.InHouseNo.SelectionStart = 0;
-            this.InHouseNo.ShortcutsEnabled = true;
-            this.InHouseNo.Size = new System.Drawing.Size(170, 48);
-            this.InHouseNo.SkipLiterals = true;
-            this.InHouseNo.TabIndex = 6;
-            this.InHouseNo.TabStop = false;
-            this.InHouseNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
-            this.InHouseNo.TextMaskFormat = System.Windows.Forms.MaskFormat.IncludeLiterals;
-            this.InHouseNo.TrailingIcon = null;
-            this.InHouseNo.UseSystemPasswordChar = false;
-            this.InHouseNo.ValidatingType = null;
-            // 
             // materialLabel2
             // 
             this.materialLabel2.AutoSize = true;
@@ -505,48 +462,6 @@ namespace AMES_AP
             this.materialLabel2.TabIndex = 5;
             this.materialLabel2.Text = "入庫單號碼：";
             // 
-            // WipNo
-            // 
-            this.WipNo.AllowPromptAsInput = true;
-            this.WipNo.AnimateReadOnly = false;
-            this.WipNo.AsciiOnly = false;
-            this.WipNo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.WipNo.BeepOnError = false;
-            this.WipNo.CutCopyMaskFormat = System.Windows.Forms.MaskFormat.IncludeLiterals;
-            this.WipNo.Depth = 0;
-            this.WipNo.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
-            this.WipNo.HidePromptOnLeave = false;
-            this.WipNo.HideSelection = true;
-            this.WipNo.Hint = "輸入工單號碼";
-            this.WipNo.InsertKeyMode = System.Windows.Forms.InsertKeyMode.Default;
-            this.WipNo.LeadingIcon = null;
-            this.WipNo.Location = new System.Drawing.Point(101, 37);
-            this.WipNo.Mask = "";
-            this.WipNo.MaxLength = 32767;
-            this.WipNo.MouseState = MaterialSkin.MouseState.OUT;
-            this.WipNo.Name = "WipNo";
-            this.WipNo.PasswordChar = '\0';
-            this.WipNo.PrefixSuffixText = null;
-            this.WipNo.PromptChar = '_';
-            this.WipNo.ReadOnly = false;
-            this.WipNo.RejectInputOnFirstFailure = false;
-            this.WipNo.ResetOnPrompt = true;
-            this.WipNo.ResetOnSpace = true;
-            this.WipNo.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.WipNo.SelectedText = "";
-            this.WipNo.SelectionLength = 0;
-            this.WipNo.SelectionStart = 0;
-            this.WipNo.ShortcutsEnabled = true;
-            this.WipNo.Size = new System.Drawing.Size(170, 48);
-            this.WipNo.SkipLiterals = true;
-            this.WipNo.TabIndex = 4;
-            this.WipNo.TabStop = false;
-            this.WipNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
-            this.WipNo.TextMaskFormat = System.Windows.Forms.MaskFormat.IncludeLiterals;
-            this.WipNo.TrailingIcon = null;
-            this.WipNo.UseSystemPasswordChar = false;
-            this.WipNo.ValidatingType = null;
-            // 
             // materialLabel1
             // 
             this.materialLabel1.AutoSize = true;
@@ -559,6 +474,25 @@ namespace AMES_AP
             this.materialLabel1.TabIndex = 3;
             this.materialLabel1.Text = "工單號碼：";
             // 
+            // InHouseNo
+            // 
+            this.InHouseNo.AnimateReadOnly = false;
+            this.InHouseNo.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.InHouseNo.Depth = 0;
+            this.InHouseNo.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
+            this.InHouseNo.Hint = "入庫單號碼";
+            this.InHouseNo.LeadingIcon = null;
+            this.InHouseNo.Location = new System.Drawing.Point(729, 35);
+            this.InHouseNo.MaxLength = 50;
+            this.InHouseNo.MouseState = MaterialSkin.MouseState.OUT;
+            this.InHouseNo.Multiline = false;
+            this.InHouseNo.Name = "InHouseNo";
+            this.InHouseNo.Size = new System.Drawing.Size(136, 50);
+            this.InHouseNo.TabIndex = 23;
+            this.InHouseNo.TabStop = false;
+            this.InHouseNo.Text = "";
+            this.InHouseNo.TrailingIcon = null;
+            // 
             // InHouse
             // 
             this.AutoSize = true;
@@ -587,9 +521,7 @@ namespace AMES_AP
         private System.Windows.Forms.GroupBox groupBox1;
         private MaterialSkin.Controls.MaterialButton materialButton1;
         private MaterialSkin.Controls.MaterialButton QueryWipNo;
-        private MaterialSkin.Controls.MaterialMaskedTextBox InHouseNo;
         private MaterialSkin.Controls.MaterialLabel materialLabel2;
-        private MaterialSkin.Controls.MaterialMaskedTextBox WipNo;
         private MaterialSkin.Controls.MaterialLabel materialLabel1;
         private System.Windows.Forms.DataGridView dataGridView1;
         private MaterialSkin.Controls.MaterialComboBox materialComboBox1;
@@ -601,7 +533,6 @@ namespace AMES_AP
         private MaterialSkin.Controls.MaterialLabel materialLabel4;
         private MaterialSkin.Controls.MaterialButton btnAddInHouse;
         private MaterialSkin.Controls.MaterialButton materialButton5;
-        private MaterialSkin.Controls.MaterialButton materialButton4;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
@@ -610,5 +541,7 @@ namespace AMES_AP
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private MaterialSkin.Controls.MaterialTextBox WipNo;
+        private MaterialSkin.Controls.MaterialTextBox InHouseNo;
     }
 }
diff --git a/其他專案資料/AMES_AP/AMES_AP/InHouse.cs b/其他專案資料/AMES_AP/AMES_AP/InHouse.cs
index de9f20ee..caf0550b 100644
--- a/其他專案資料/AMES_AP/AMES_AP/InHouse.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/InHouse.cs
@@ -48,7 +48,7 @@ namespace AMES_AP
 
         private void QueryWipNo_Click(object sender, EventArgs e)
         {
-            var query_extraNo = ApiHelper.GetMethod($"api/BarcodeInfoes/ByWipNo/{WipNo.Text.ToUpper()}");
+            var query_extraNo = ApiHelper.GetMethod($"api/BarcodeInfoes/ByWipNo/{WipNo.Text}");
             if (query_extraNo == "error" || query_extraNo == "無法連線WebAPI")
             {
                 MessageBox.Show(query_extraNo);
@@ -180,7 +180,7 @@ namespace AMES_AP
                 }
             }
 
-            var query = ApiHelper.GetMethod($"api/WipInfos/WipInfoByWipNo/{WipNo.Text.ToUpper()}");
+            var query = ApiHelper.GetMethod($"api/WipInfos/WipInfoByWipNo/{WipNo.Text}");
             if (query == "error" || query == "無法連線WebAPI")
             {
                 MessageBox.Show(query);
@@ -191,7 +191,7 @@ namespace AMES_AP
 
             var InhouseM = new FqcInhouseMaster
             {
-                InhouseNo = "Q" + WipNo.Text.ToUpper() + "001",
+                InhouseNo = "Q" + WipNo.Text + "001",
                 SeqID = 1,
                 ItemNo = wipInfos.FirstOrDefault().GetWipAtt.ItemNO,
                 Plant = materialComboBox2.SelectedItem.ToString(),
@@ -207,7 +207,7 @@ namespace AMES_AP
             {
                 InhouseD.Add(new FqcInhouseDetail
                 {
-                    InhouseNo = "Q" + WipNo.Text.ToUpper() + "001",
+                    InhouseNo = "Q" + WipNo.Text + "001",
                     SeqID = 1,
                     SerialNo = item,
                     SerialType = "B"
@@ -222,12 +222,21 @@ namespace AMES_AP
                     ApiHelper.PostInsertMethod("api/FqcInhouseDetail", JsonConvert.SerializeObject(item));
                 }
 
-                InHouseNo.Text = "Q" + WipNo.Text.ToUpper() + "001";
+                InHouseNo.Text = "Q" + WipNo.Text + "001";
                 MessageBox.Show("入庫單號：" + InHouseNo.Text);
             }
             DataRight.Clear();
             GetDataGridView();
         }
+
+        private void WipNo_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (char.IsLower(e.KeyChar))
+            {
+                WipNo.SelectedText = char.ToUpper(e.KeyChar).ToString();
+                e.Handled = true;
+            }
+        }
     }
 
     public class DataBarcodeInfo
diff --git a/其他專案資料/AMES_AP/AMES_AP/Login.Designer.cs b/其他專案資料/AMES_AP/AMES_AP/Login.Designer.cs
index 0aa0bd00..d1c12a1b 100644
--- a/其他專案資料/AMES_AP/AMES_AP/Login.Designer.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/Login.Designer.cs
@@ -47,8 +47,7 @@
             this.txtUserName.HideSelection = true;
             this.txtUserName.Hint = "帳號";
             this.txtUserName.LeadingIcon = null;
-            this.txtUserName.Location = new System.Drawing.Point(21, 177);
-            this.txtUserName.Margin = new System.Windows.Forms.Padding(4);
+            this.txtUserName.Location = new System.Drawing.Point(16, 142);
             this.txtUserName.MaxLength = 32767;
             this.txtUserName.MouseState = MaterialSkin.MouseState.OUT;
             this.txtUserName.Name = "txtUserName";
@@ -60,7 +59,7 @@
             this.txtUserName.SelectionLength = 0;
             this.txtUserName.SelectionStart = 0;
             this.txtUserName.ShortcutsEnabled = true;
-            this.txtUserName.Size = new System.Drawing.Size(523, 48);
+            this.txtUserName.Size = new System.Drawing.Size(392, 48);
             this.txtUserName.TabIndex = 0;
             this.txtUserName.TabStop = false;
             this.txtUserName.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
@@ -74,8 +73,7 @@
             this.materialLabel1.Depth = 0;
             this.materialLabel1.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel1.Location = new System.Drawing.Point(260, 129);
-            this.materialLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel1.Location = new System.Drawing.Point(159, 103);
             this.materialLabel1.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel1.Name = "materialLabel1";
             this.materialLabel1.Size = new System.Drawing.Size(66, 19);
@@ -92,8 +90,7 @@
             this.txtPassword.HideSelection = true;
             this.txtPassword.Hint = "密碼";
             this.txtPassword.LeadingIcon = null;
-            this.txtPassword.Location = new System.Drawing.Point(21, 252);
-            this.txtPassword.Margin = new System.Windows.Forms.Padding(4);
+            this.txtPassword.Location = new System.Drawing.Point(16, 202);
             this.txtPassword.MaxLength = 32767;
             this.txtPassword.MouseState = MaterialSkin.MouseState.OUT;
             this.txtPassword.Name = "txtPassword";
@@ -105,7 +102,7 @@
             this.txtPassword.SelectionLength = 0;
             this.txtPassword.SelectionStart = 0;
             this.txtPassword.ShortcutsEnabled = true;
-            this.txtPassword.Size = new System.Drawing.Size(523, 48);
+            this.txtPassword.Size = new System.Drawing.Size(392, 48);
             this.txtPassword.TabIndex = 2;
             this.txtPassword.TabStop = false;
             this.txtPassword.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
@@ -118,7 +115,7 @@
             this.cbxRemember.BackColor = System.Drawing.Color.Transparent;
             this.cbxRemember.Depth = 0;
             this.cbxRemember.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-            this.cbxRemember.Location = new System.Drawing.Point(21, 318);
+            this.cbxRemember.Location = new System.Drawing.Point(16, 254);
             this.cbxRemember.Margin = new System.Windows.Forms.Padding(0);
             this.cbxRemember.MouseLocation = new System.Drawing.Point(-1, -1);
             this.cbxRemember.MouseState = MaterialSkin.MouseState.HOVER;
@@ -137,8 +134,7 @@
             this.btnLogin.Depth = 0;
             this.btnLogin.HighEmphasis = true;
             this.btnLogin.Icon = null;
-            this.btnLogin.Location = new System.Drawing.Point(262, 392);
-            this.btnLogin.Margin = new System.Windows.Forms.Padding(4);
+            this.btnLogin.Location = new System.Drawing.Point(162, 306);
             this.btnLogin.MouseState = MaterialSkin.MouseState.HOVER;
             this.btnLogin.Name = "btnLogin";
             this.btnLogin.NoAccentTextColor = System.Drawing.Color.Empty;
@@ -157,8 +153,7 @@
             this.lblErrorMessage.Depth = 0;
             this.lblErrorMessage.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.lblErrorMessage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.lblErrorMessage.Location = new System.Drawing.Point(133, 428);
-            this.lblErrorMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblErrorMessage.Location = new System.Drawing.Point(100, 342);
             this.lblErrorMessage.MouseState = MaterialSkin.MouseState.HOVER;
             this.lblErrorMessage.Name = "lblErrorMessage";
             this.lblErrorMessage.Size = new System.Drawing.Size(1, 0);
@@ -166,9 +161,9 @@
             // 
             // Login
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(565, 519);
+            this.ClientSize = new System.Drawing.Size(424, 415);
             this.Controls.Add(this.lblErrorMessage);
             this.Controls.Add(this.btnLogin);
             this.Controls.Add(this.cbxRemember);
@@ -176,9 +171,9 @@
             this.Controls.Add(this.materialLabel1);
             this.Controls.Add(this.txtUserName);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.Name = "Login";
+            this.Padding = new System.Windows.Forms.Padding(2, 51, 2, 2);
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Login Form";
             this.Load += new System.EventHandler(this.Login_Load);
diff --git a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs
index 9f11c54e..54ec69da 100644
--- a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs
@@ -29,6 +29,7 @@
         private void InitializeComponent()
         {
             this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.ManualCloseBox = new MaterialSkin.Controls.MaterialButton();
             this.BoxS = new System.Windows.Forms.Label();
             this.ByBox = new System.Windows.Forms.Label();
             this.NowBoxNo = new System.Windows.Forms.Label();
@@ -72,9 +73,10 @@
             this.txtWipNo = new System.Windows.Forms.TextBox();
             this.materialLabel17 = new MaterialSkin.Controls.MaterialLabel();
             this.materialLabel16 = new MaterialSkin.Controls.MaterialLabel();
-            this.ManualCloseBox = new MaterialSkin.Controls.MaterialButton();
+            this.materialCheckedListBox1 = new MaterialSkin.Controls.MaterialCheckedListBox();
             this.groupBox5.SuspendLayout();
             this.groupBox4.SuspendLayout();
+            this.groupBox3.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox6.SuspendLayout();
             this.SuspendLayout();
@@ -90,22 +92,44 @@
             this.groupBox5.Controls.Add(this.materialLabel14);
             this.groupBox5.Controls.Add(this.materialLabel13);
             this.groupBox5.Controls.Add(this.materialLabel12);
-            this.groupBox5.Location = new System.Drawing.Point(30, 563);
-            this.groupBox5.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox5.Location = new System.Drawing.Point(22, 450);
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox5.Size = new System.Drawing.Size(959, 94);
+            this.groupBox5.Size = new System.Drawing.Size(719, 75);
             this.groupBox5.TabIndex = 9;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "箱號資訊";
             // 
+            // ManualCloseBox
+            // 
+            this.ManualCloseBox.AutoSize = false;
+            this.ManualCloseBox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.ManualCloseBox.Density = MaterialSkin.Controls.MaterialButton.MaterialButtonDensity.Default;
+            this.ManualCloseBox.Depth = 0;
+            this.ManualCloseBox.Font = new System.Drawing.Font("新細明體", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
+            this.ManualCloseBox.ForeColor = System.Drawing.SystemColors.ActiveCaption;
+            this.ManualCloseBox.HighEmphasis = true;
+            this.ManualCloseBox.Icon = null;
+            this.ManualCloseBox.Location = new System.Drawing.Point(654, 23);
+            this.ManualCloseBox.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.ManualCloseBox.MouseState = MaterialSkin.MouseState.HOVER;
+            this.ManualCloseBox.Name = "ManualCloseBox";
+            this.ManualCloseBox.NoAccentTextColor = System.Drawing.Color.Empty;
+            this.ManualCloseBox.Size = new System.Drawing.Size(59, 38);
+            this.ManualCloseBox.TabIndex = 26;
+            this.ManualCloseBox.Text = "手動關箱";
+            this.ManualCloseBox.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained;
+            this.ManualCloseBox.UseAccentColor = false;
+            this.ManualCloseBox.UseVisualStyleBackColor = true;
+            this.ManualCloseBox.Click += new System.EventHandler(this.ManualCloseBox_Click);
+            // 
             // BoxS
             // 
             this.BoxS.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.BoxS.ForeColor = System.Drawing.Color.Red;
-            this.BoxS.Location = new System.Drawing.Point(117, 50);
+            this.BoxS.Location = new System.Drawing.Point(88, 40);
+            this.BoxS.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.BoxS.Name = "BoxS";
-            this.BoxS.Size = new System.Drawing.Size(186, 24);
+            this.BoxS.Size = new System.Drawing.Size(140, 19);
             this.BoxS.TabIndex = 25;
             this.BoxS.Text = "本箱數量";
             // 
@@ -113,9 +137,10 @@
             // 
             this.ByBox.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.ByBox.ForeColor = System.Drawing.Color.Red;
-            this.ByBox.Location = new System.Drawing.Point(117, 20);
+            this.ByBox.Location = new System.Drawing.Point(88, 16);
+            this.ByBox.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ByBox.Name = "ByBox";
-            this.ByBox.Size = new System.Drawing.Size(186, 24);
+            this.ByBox.Size = new System.Drawing.Size(140, 19);
             this.ByBox.TabIndex = 24;
             this.ByBox.Text = "單箱數量";
             // 
@@ -123,9 +148,10 @@
             // 
             this.NowBoxNo.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.NowBoxNo.ForeColor = System.Drawing.Color.Red;
-            this.NowBoxNo.Location = new System.Drawing.Point(519, 57);
+            this.NowBoxNo.Location = new System.Drawing.Point(389, 46);
+            this.NowBoxNo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.NowBoxNo.Name = "NowBoxNo";
-            this.NowBoxNo.Size = new System.Drawing.Size(275, 24);
+            this.NowBoxNo.Size = new System.Drawing.Size(206, 19);
             this.NowBoxNo.TabIndex = 23;
             this.NowBoxNo.Text = "當前箱號";
             // 
@@ -133,9 +159,10 @@
             // 
             this.BoxCnt.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.BoxCnt.ForeColor = System.Drawing.Color.Red;
-            this.BoxCnt.Location = new System.Drawing.Point(519, 26);
+            this.BoxCnt.Location = new System.Drawing.Point(389, 21);
+            this.BoxCnt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.BoxCnt.Name = "BoxCnt";
-            this.BoxCnt.Size = new System.Drawing.Size(186, 24);
+            this.BoxCnt.Size = new System.Drawing.Size(140, 19);
             this.BoxCnt.TabIndex = 22;
             this.BoxCnt.Text = "包裝數量";
             // 
@@ -145,8 +172,7 @@
             this.materialLabel15.Depth = 0;
             this.materialLabel15.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel15.Location = new System.Drawing.Point(407, 26);
-            this.materialLabel15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel15.Location = new System.Drawing.Point(305, 21);
             this.materialLabel15.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel15.Name = "materialLabel15";
             this.materialLabel15.Size = new System.Drawing.Size(69, 19);
@@ -159,8 +185,7 @@
             this.materialLabel14.Depth = 0;
             this.materialLabel14.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel14.Location = new System.Drawing.Point(407, 58);
-            this.materialLabel14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel14.Location = new System.Drawing.Point(305, 46);
             this.materialLabel14.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel14.Name = "materialLabel14";
             this.materialLabel14.Size = new System.Drawing.Size(69, 19);
@@ -173,8 +198,7 @@
             this.materialLabel13.Depth = 0;
             this.materialLabel13.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel13.Location = new System.Drawing.Point(8, 53);
-            this.materialLabel13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel13.Location = new System.Drawing.Point(6, 42);
             this.materialLabel13.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel13.Name = "materialLabel13";
             this.materialLabel13.Size = new System.Drawing.Size(69, 19);
@@ -187,8 +211,7 @@
             this.materialLabel12.Depth = 0;
             this.materialLabel12.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel12.Location = new System.Drawing.Point(8, 22);
-            this.materialLabel12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel12.Location = new System.Drawing.Point(6, 18);
             this.materialLabel12.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel12.Name = "materialLabel12";
             this.materialLabel12.Size = new System.Drawing.Size(69, 19);
@@ -209,11 +232,9 @@
             this.groupBox4.Controls.Add(this.materialLabel5);
             this.groupBox4.Controls.Add(this.materialLabel3);
             this.groupBox4.Controls.Add(this.materialLabel2);
-            this.groupBox4.Location = new System.Drawing.Point(30, 419);
-            this.groupBox4.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox4.Location = new System.Drawing.Point(22, 335);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox4.Size = new System.Drawing.Size(959, 136);
+            this.groupBox4.Size = new System.Drawing.Size(719, 109);
             this.groupBox4.TabIndex = 8;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "工單資訊";
@@ -222,9 +243,10 @@
             // 
             this.CustomerItemNo.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.CustomerItemNo.ForeColor = System.Drawing.Color.Red;
-            this.CustomerItemNo.Location = new System.Drawing.Point(518, 102);
+            this.CustomerItemNo.Location = new System.Drawing.Point(388, 82);
+            this.CustomerItemNo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.CustomerItemNo.Name = "CustomerItemNo";
-            this.CustomerItemNo.Size = new System.Drawing.Size(345, 24);
+            this.CustomerItemNo.Size = new System.Drawing.Size(259, 19);
             this.CustomerItemNo.TabIndex = 30;
             this.CustomerItemNo.Text = "客戶料號";
             // 
@@ -232,9 +254,10 @@
             // 
             this.ModelNo.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.ModelNo.ForeColor = System.Drawing.Color.Red;
-            this.ModelNo.Location = new System.Drawing.Point(519, 61);
+            this.ModelNo.Location = new System.Drawing.Point(389, 49);
+            this.ModelNo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ModelNo.Name = "ModelNo";
-            this.ModelNo.Size = new System.Drawing.Size(344, 24);
+            this.ModelNo.Size = new System.Drawing.Size(258, 19);
             this.ModelNo.TabIndex = 29;
             this.ModelNo.Text = "機種名稱";
             // 
@@ -242,9 +265,10 @@
             // 
             this.PlanQty.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.PlanQty.ForeColor = System.Drawing.Color.Red;
-            this.PlanQty.Location = new System.Drawing.Point(518, 22);
+            this.PlanQty.Location = new System.Drawing.Point(388, 18);
+            this.PlanQty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PlanQty.Name = "PlanQty";
-            this.PlanQty.Size = new System.Drawing.Size(186, 24);
+            this.PlanQty.Size = new System.Drawing.Size(140, 19);
             this.PlanQty.TabIndex = 28;
             this.PlanQty.Text = "預計數量";
             // 
@@ -252,9 +276,10 @@
             // 
             this.CustomerNo.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.CustomerNo.ForeColor = System.Drawing.Color.Red;
-            this.CustomerNo.Location = new System.Drawing.Point(117, 99);
+            this.CustomerNo.Location = new System.Drawing.Point(88, 79);
+            this.CustomerNo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.CustomerNo.Name = "CustomerNo";
-            this.CustomerNo.Size = new System.Drawing.Size(284, 24);
+            this.CustomerNo.Size = new System.Drawing.Size(213, 19);
             this.CustomerNo.TabIndex = 27;
             this.CustomerNo.Text = "客戶名稱";
             // 
@@ -262,9 +287,10 @@
             // 
             this.ItemNo.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.ItemNo.ForeColor = System.Drawing.Color.Red;
-            this.ItemNo.Location = new System.Drawing.Point(117, 60);
+            this.ItemNo.Location = new System.Drawing.Point(88, 48);
+            this.ItemNo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ItemNo.Name = "ItemNo";
-            this.ItemNo.Size = new System.Drawing.Size(186, 24);
+            this.ItemNo.Size = new System.Drawing.Size(140, 19);
             this.ItemNo.TabIndex = 26;
             this.ItemNo.Text = "料號";
             // 
@@ -272,9 +298,10 @@
             // 
             this.WipNo.Font = new System.Drawing.Font("微軟正黑體", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
             this.WipNo.ForeColor = System.Drawing.Color.Red;
-            this.WipNo.Location = new System.Drawing.Point(117, 19);
+            this.WipNo.Location = new System.Drawing.Point(88, 15);
+            this.WipNo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.WipNo.Name = "WipNo";
-            this.WipNo.Size = new System.Drawing.Size(186, 24);
+            this.WipNo.Size = new System.Drawing.Size(140, 19);
             this.WipNo.TabIndex = 25;
             this.WipNo.Text = "工單號碼";
             // 
@@ -284,8 +311,7 @@
             this.materialLabel9.Depth = 0;
             this.materialLabel9.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel9.Location = new System.Drawing.Point(408, 102);
-            this.materialLabel9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel9.Location = new System.Drawing.Point(306, 82);
             this.materialLabel9.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel9.Name = "materialLabel9";
             this.materialLabel9.Size = new System.Drawing.Size(69, 19);
@@ -298,8 +324,7 @@
             this.materialLabel10.Depth = 0;
             this.materialLabel10.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel10.Location = new System.Drawing.Point(407, 60);
-            this.materialLabel10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel10.Location = new System.Drawing.Point(305, 48);
             this.materialLabel10.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel10.Name = "materialLabel10";
             this.materialLabel10.Size = new System.Drawing.Size(69, 19);
@@ -312,8 +337,7 @@
             this.materialLabel11.Depth = 0;
             this.materialLabel11.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel11.Location = new System.Drawing.Point(408, 22);
-            this.materialLabel11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel11.Location = new System.Drawing.Point(306, 18);
             this.materialLabel11.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel11.Name = "materialLabel11";
             this.materialLabel11.Size = new System.Drawing.Size(69, 19);
@@ -326,8 +350,7 @@
             this.materialLabel5.Depth = 0;
             this.materialLabel5.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel5.Location = new System.Drawing.Point(10, 100);
-            this.materialLabel5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel5.Location = new System.Drawing.Point(8, 80);
             this.materialLabel5.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel5.Name = "materialLabel5";
             this.materialLabel5.Size = new System.Drawing.Size(69, 19);
@@ -340,8 +363,7 @@
             this.materialLabel3.Depth = 0;
             this.materialLabel3.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel3.Location = new System.Drawing.Point(8, 60);
-            this.materialLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel3.Location = new System.Drawing.Point(6, 48);
             this.materialLabel3.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel3.Name = "materialLabel3";
             this.materialLabel3.Size = new System.Drawing.Size(69, 19);
@@ -354,8 +376,7 @@
             this.materialLabel2.Depth = 0;
             this.materialLabel2.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel2.Location = new System.Drawing.Point(8, 22);
-            this.materialLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel2.Location = new System.Drawing.Point(6, 18);
             this.materialLabel2.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel2.Name = "materialLabel2";
             this.materialLabel2.Size = new System.Drawing.Size(69, 19);
@@ -364,11 +385,10 @@
             // 
             // groupBox3
             // 
-            this.groupBox3.Location = new System.Drawing.Point(400, 273);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox3.Controls.Add(this.materialCheckedListBox1);
+            this.groupBox3.Location = new System.Drawing.Point(300, 218);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox3.Size = new System.Drawing.Size(589, 139);
+            this.groupBox3.Size = new System.Drawing.Size(442, 111);
             this.groupBox3.TabIndex = 7;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "可選項";
@@ -382,11 +402,9 @@
             this.groupBox1.Controls.Add(this.materialCheckBox1);
             this.groupBox1.Controls.Add(this.comboBox3);
             this.groupBox1.Controls.Add(this.comboBox2);
-            this.groupBox1.Location = new System.Drawing.Point(400, 86);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Location = new System.Drawing.Point(300, 69);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox1.Size = new System.Drawing.Size(589, 180);
+            this.groupBox1.Size = new System.Drawing.Size(442, 144);
             this.groupBox1.TabIndex = 6;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "基本設定";
@@ -396,10 +414,9 @@
             this.comboBox1.DropDownHeight = 300;
             this.comboBox1.FormattingEnabled = true;
             this.comboBox1.IntegralHeight = false;
-            this.comboBox1.Location = new System.Drawing.Point(27, 28);
-            this.comboBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.comboBox1.Location = new System.Drawing.Point(20, 22);
             this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(231, 23);
+            this.comboBox1.Size = new System.Drawing.Size(174, 20);
             this.comboBox1.TabIndex = 7;
             // 
             // materialCheckBox4
@@ -407,7 +424,7 @@
             this.materialCheckBox4.AutoSize = true;
             this.materialCheckBox4.Depth = 0;
             this.materialCheckBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-            this.materialCheckBox4.Location = new System.Drawing.Point(153, 136);
+            this.materialCheckBox4.Location = new System.Drawing.Point(115, 105);
             this.materialCheckBox4.Margin = new System.Windows.Forms.Padding(0);
             this.materialCheckBox4.MouseLocation = new System.Drawing.Point(-1, -1);
             this.materialCheckBox4.MouseState = MaterialSkin.MouseState.HOVER;
@@ -423,7 +440,7 @@
             this.materialCheckBox3.AutoSize = true;
             this.materialCheckBox3.Depth = 0;
             this.materialCheckBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-            this.materialCheckBox3.Location = new System.Drawing.Point(153, 82);
+            this.materialCheckBox3.Location = new System.Drawing.Point(115, 66);
             this.materialCheckBox3.Margin = new System.Windows.Forms.Padding(0);
             this.materialCheckBox3.MouseLocation = new System.Drawing.Point(-1, -1);
             this.materialCheckBox3.MouseState = MaterialSkin.MouseState.HOVER;
@@ -439,7 +456,7 @@
             this.materialCheckBox2.AutoSize = true;
             this.materialCheckBox2.Depth = 0;
             this.materialCheckBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-            this.materialCheckBox2.Location = new System.Drawing.Point(8, 136);
+            this.materialCheckBox2.Location = new System.Drawing.Point(6, 105);
             this.materialCheckBox2.Margin = new System.Windows.Forms.Padding(0);
             this.materialCheckBox2.MouseLocation = new System.Drawing.Point(-1, -1);
             this.materialCheckBox2.MouseState = MaterialSkin.MouseState.HOVER;
@@ -456,7 +473,7 @@
             this.materialCheckBox1.AutoSize = true;
             this.materialCheckBox1.Depth = 0;
             this.materialCheckBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-            this.materialCheckBox1.Location = new System.Drawing.Point(8, 82);
+            this.materialCheckBox1.Location = new System.Drawing.Point(6, 66);
             this.materialCheckBox1.Margin = new System.Windows.Forms.Padding(0);
             this.materialCheckBox1.MouseLocation = new System.Drawing.Point(-1, -1);
             this.materialCheckBox1.MouseState = MaterialSkin.MouseState.HOVER;
@@ -471,19 +488,17 @@
             // comboBox3
             // 
             this.comboBox3.FormattingEnabled = true;
-            this.comboBox3.Location = new System.Drawing.Point(404, 56);
-            this.comboBox3.Margin = new System.Windows.Forms.Padding(4);
+            this.comboBox3.Location = new System.Drawing.Point(303, 45);
             this.comboBox3.Name = "comboBox3";
-            this.comboBox3.Size = new System.Drawing.Size(77, 23);
+            this.comboBox3.Size = new System.Drawing.Size(59, 20);
             this.comboBox3.TabIndex = 2;
             // 
             // comboBox2
             // 
             this.comboBox2.FormattingEnabled = true;
-            this.comboBox2.Location = new System.Drawing.Point(404, 21);
-            this.comboBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.comboBox2.Location = new System.Drawing.Point(303, 17);
             this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Size = new System.Drawing.Size(77, 23);
+            this.comboBox2.Size = new System.Drawing.Size(59, 20);
             this.comboBox2.TabIndex = 1;
             // 
             // groupBox6
@@ -500,11 +515,9 @@
             this.groupBox6.Controls.Add(this.txtWipNo);
             this.groupBox6.Controls.Add(this.materialLabel17);
             this.groupBox6.Controls.Add(this.materialLabel16);
-            this.groupBox6.Location = new System.Drawing.Point(30, 86);
-            this.groupBox6.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox6.Location = new System.Drawing.Point(22, 69);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox6.Size = new System.Drawing.Size(362, 326);
+            this.groupBox6.Size = new System.Drawing.Size(272, 261);
             this.groupBox6.TabIndex = 10;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "條碼輸入";
@@ -512,10 +525,9 @@
             // StationSelect
             // 
             this.StationSelect.FormattingEnabled = true;
-            this.StationSelect.Location = new System.Drawing.Point(122, 138);
-            this.StationSelect.Margin = new System.Windows.Forms.Padding(4);
+            this.StationSelect.Location = new System.Drawing.Point(92, 110);
             this.StationSelect.Name = "StationSelect";
-            this.StationSelect.Size = new System.Drawing.Size(164, 23);
+            this.StationSelect.Size = new System.Drawing.Size(124, 20);
             this.StationSelect.TabIndex = 17;
             // 
             // materialLabel22
@@ -524,8 +536,7 @@
             this.materialLabel22.Depth = 0;
             this.materialLabel22.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel22.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel22.Location = new System.Drawing.Point(9, 141);
-            this.materialLabel22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel22.Location = new System.Drawing.Point(7, 113);
             this.materialLabel22.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel22.Name = "materialLabel22";
             this.materialLabel22.Size = new System.Drawing.Size(69, 19);
@@ -535,10 +546,9 @@
             // LineSelect
             // 
             this.LineSelect.FormattingEnabled = true;
-            this.LineSelect.Location = new System.Drawing.Point(122, 59);
-            this.LineSelect.Margin = new System.Windows.Forms.Padding(4);
+            this.LineSelect.Location = new System.Drawing.Point(92, 47);
             this.LineSelect.Name = "LineSelect";
-            this.LineSelect.Size = new System.Drawing.Size(164, 23);
+            this.LineSelect.Size = new System.Drawing.Size(124, 20);
             this.LineSelect.TabIndex = 15;
             // 
             // materialLabel21
@@ -547,8 +557,7 @@
             this.materialLabel21.Depth = 0;
             this.materialLabel21.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel21.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel21.Location = new System.Drawing.Point(8, 62);
-            this.materialLabel21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel21.Location = new System.Drawing.Point(6, 50);
             this.materialLabel21.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel21.Name = "materialLabel21";
             this.materialLabel21.Size = new System.Drawing.Size(69, 19);
@@ -557,19 +566,17 @@
             // 
             // BarCodeNo
             // 
-            this.BarCodeNo.Location = new System.Drawing.Point(122, 204);
-            this.BarCodeNo.Margin = new System.Windows.Forms.Padding(4);
+            this.BarCodeNo.Location = new System.Drawing.Point(92, 163);
             this.BarCodeNo.Name = "BarCodeNo";
-            this.BarCodeNo.Size = new System.Drawing.Size(164, 25);
+            this.BarCodeNo.Size = new System.Drawing.Size(124, 22);
             this.BarCodeNo.TabIndex = 13;
             this.BarCodeNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BarCodeNo_KeyDown);
             // 
             // ExtraNo
             // 
-            this.ExtraNo.Location = new System.Drawing.Point(122, 257);
-            this.ExtraNo.Margin = new System.Windows.Forms.Padding(4);
+            this.ExtraNo.Location = new System.Drawing.Point(92, 206);
             this.ExtraNo.Name = "ExtraNo";
-            this.ExtraNo.Size = new System.Drawing.Size(164, 25);
+            this.ExtraNo.Size = new System.Drawing.Size(124, 22);
             this.ExtraNo.TabIndex = 12;
             this.ExtraNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ExtraNo_KeyDown);
             // 
@@ -579,8 +586,7 @@
             this.materialLabel18.Depth = 0;
             this.materialLabel18.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel18.Location = new System.Drawing.Point(9, 260);
-            this.materialLabel18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel18.Location = new System.Drawing.Point(7, 208);
             this.materialLabel18.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel18.Name = "materialLabel18";
             this.materialLabel18.Size = new System.Drawing.Size(69, 19);
@@ -592,30 +598,27 @@
             this.materialLabel19.Depth = 0;
             this.materialLabel19.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel19.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel19.Location = new System.Drawing.Point(9, 207);
-            this.materialLabel19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel19.Location = new System.Drawing.Point(7, 166);
             this.materialLabel19.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel19.Name = "materialLabel19";
-            this.materialLabel19.Size = new System.Drawing.Size(103, 28);
+            this.materialLabel19.Size = new System.Drawing.Size(77, 22);
             this.materialLabel19.TabIndex = 10;
             this.materialLabel19.Text = "內部序號:";
             // 
             // UnitSelect
             // 
             this.UnitSelect.FormattingEnabled = true;
-            this.UnitSelect.Location = new System.Drawing.Point(122, 24);
-            this.UnitSelect.Margin = new System.Windows.Forms.Padding(4);
+            this.UnitSelect.Location = new System.Drawing.Point(92, 19);
             this.UnitSelect.Name = "UnitSelect";
-            this.UnitSelect.Size = new System.Drawing.Size(164, 23);
+            this.UnitSelect.Size = new System.Drawing.Size(124, 20);
             this.UnitSelect.TabIndex = 9;
             // 
             // txtWipNo
             // 
             this.txtWipNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-            this.txtWipNo.Location = new System.Drawing.Point(122, 98);
-            this.txtWipNo.Margin = new System.Windows.Forms.Padding(4);
+            this.txtWipNo.Location = new System.Drawing.Point(92, 78);
             this.txtWipNo.Name = "txtWipNo";
-            this.txtWipNo.Size = new System.Drawing.Size(164, 25);
+            this.txtWipNo.Size = new System.Drawing.Size(124, 22);
             this.txtWipNo.TabIndex = 8;
             this.txtWipNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtWipNo_KeyDown);
             // 
@@ -625,8 +628,7 @@
             this.materialLabel17.Depth = 0;
             this.materialLabel17.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel17.Location = new System.Drawing.Point(8, 101);
-            this.materialLabel17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel17.Location = new System.Drawing.Point(6, 81);
             this.materialLabel17.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel17.Name = "materialLabel17";
             this.materialLabel17.Size = new System.Drawing.Size(69, 19);
@@ -639,52 +641,40 @@
             this.materialLabel16.Depth = 0;
             this.materialLabel16.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.materialLabel16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.materialLabel16.Location = new System.Drawing.Point(9, 28);
-            this.materialLabel16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.materialLabel16.Location = new System.Drawing.Point(7, 22);
             this.materialLabel16.MouseState = MaterialSkin.MouseState.HOVER;
             this.materialLabel16.Name = "materialLabel16";
             this.materialLabel16.Size = new System.Drawing.Size(69, 19);
             this.materialLabel16.TabIndex = 6;
             this.materialLabel16.Text = "製        程:";
             // 
-            // ManualCloseBox
+            // materialCheckedListBox1
             // 
-            this.ManualCloseBox.AutoSize = false;
-            this.ManualCloseBox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ManualCloseBox.Density = MaterialSkin.Controls.MaterialButton.MaterialButtonDensity.Default;
-            this.ManualCloseBox.Depth = 0;
-            this.ManualCloseBox.Font = new System.Drawing.Font("新細明體", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
-            this.ManualCloseBox.ForeColor = System.Drawing.SystemColors.ActiveCaption;
-            this.ManualCloseBox.HighEmphasis = true;
-            this.ManualCloseBox.Icon = null;
-            this.ManualCloseBox.Location = new System.Drawing.Point(872, 29);
-            this.ManualCloseBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
-            this.ManualCloseBox.MouseState = MaterialSkin.MouseState.HOVER;
-            this.ManualCloseBox.Name = "ManualCloseBox";
-            this.ManualCloseBox.NoAccentTextColor = System.Drawing.Color.Empty;
-            this.ManualCloseBox.Size = new System.Drawing.Size(79, 48);
-            this.ManualCloseBox.TabIndex = 26;
-            this.ManualCloseBox.Text = "手動關箱";
-            this.ManualCloseBox.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained;
-            this.ManualCloseBox.UseAccentColor = false;
-            this.ManualCloseBox.UseVisualStyleBackColor = true;
-            this.ManualCloseBox.Click += new System.EventHandler(this.ManualCloseBox_Click);
+            this.materialCheckedListBox1.AutoScroll = true;
+            this.materialCheckedListBox1.BackColor = System.Drawing.SystemColors.Control;
+            this.materialCheckedListBox1.Depth = 0;
+            this.materialCheckedListBox1.Location = new System.Drawing.Point(4, 14);
+            this.materialCheckedListBox1.MouseState = MaterialSkin.MouseState.HOVER;
+            this.materialCheckedListBox1.Name = "materialCheckedListBox1";
+            this.materialCheckedListBox1.Size = new System.Drawing.Size(432, 91);
+            this.materialCheckedListBox1.Striped = false;
+            this.materialCheckedListBox1.StripeDarkColor = System.Drawing.Color.Empty;
+            this.materialCheckedListBox1.TabIndex = 0;
+    
             // 
             // StockControlForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1667, 938);
+            this.ClientSize = new System.Drawing.Size(1250, 707);
             this.Controls.Add(this.groupBox5);
             this.Controls.Add(this.groupBox4);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.groupBox6);
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "StockControlForm";
-            this.Padding = new System.Windows.Forms.Padding(4, 80, 4, 4);
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.TopMost = true;
@@ -693,6 +683,7 @@
             this.groupBox5.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.groupBox6.ResumeLayout(false);
@@ -748,5 +739,6 @@
         private System.Windows.Forms.Label PlanQty;
         private System.Windows.Forms.Label CustomerNo;
         private MaterialSkin.Controls.MaterialButton ManualCloseBox;
+        private MaterialSkin.Controls.MaterialCheckedListBox materialCheckedListBox1;
     }
 }
\ No newline at end of file
diff --git a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs
index c73cc236..28ccf968 100644
--- a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs
@@ -25,6 +25,18 @@ namespace AMES_AP
         private void Form1_Load(object sender, EventArgs e)
         {
             GetUnitSelect();
+
+            ArrayList mylist = new ArrayList();
+            mylist.Add(new DictionaryEntry("A", "彩盒列印"));
+            mylist.Add(new DictionaryEntry("B", "外箱列印"));
+            comboBox1.DataSource = new BindingSource(mylist, null);
+            comboBox1.DisplayMember = "Value";
+            comboBox1.ValueMember = "Key";
+
+            materialCheckedListBox1.Items.Add("CE",false);
+            materialCheckedListBox1.Items.Add("FCC", false);
+            materialCheckedListBox1.Items.Add("ROHS", false);
+            materialCheckedListBox1.Items.Add("UL", false);
         }
 
         #region 下拉選單
diff --git a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe
index 3e39cbb3..a6a36fa4 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe and b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb
index 523ecccd..1a847fe8 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb and b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.pdb differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.Form1.resources b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.Form1.resources
index da78a7f4..52542fea 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.Form1.resources and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.Form1.resources differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CopyComplete b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CopyComplete
deleted file mode 100644
index e69de29b..00000000
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache
index 8fb3990a..f01e35c9 100644
--- a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache
+++ b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-469b641da526204665f1818cac890e31cf88bd73
+d07028157cf87768b972228036dee67e5502361c
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt
index bce6c6e3..f2b381d9 100644
--- a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt
+++ b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.FileListAbsolute.txt
@@ -46,3 +46,5 @@ C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.exe
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.pdb
 C:\Users\USER\Desktop\MES\AMES0916\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.csproj.AssemblyReference.cache
+D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.Form1.resources
+D:\Ray_Work\AMES\其他專案資料\AMES_AP\AMES_AP\obj\Debug\AMES_AP.InHouse.resources
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache
index 77c8b885..f73abd9c 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.GenerateResource.cache differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe
index 3e39cbb3..a6a36fa4 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.exe differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb
index 523ecccd..1a847fe8 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.pdb differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 7514fc70..b090d2b6 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index c2f48cf3..e69f3919 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/package.png b/其他專案資料/AMES_AP/AMES_AP/package.png
new file mode 100644
index 00000000..af957253
Binary files /dev/null and b/其他專案資料/AMES_AP/AMES_AP/package.png differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/packages.png b/其他專案資料/AMES_AP/AMES_AP/packages.png
new file mode 100644
index 00000000..093169a1
Binary files /dev/null and b/其他專案資料/AMES_AP/AMES_AP/packages.png differ
diff --git a/其他專案資料/AMES_AP/Temp.txt b/其他專案資料/AMES_AP/Temp.txt
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/其他專案資料/AMES_AP/Temp.txt
@@ -0,0 +1 @@
+
\ No newline at end of file