diff --git a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo
index 6b7400e1..0213610b 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/Models/Stations.cs b/其他專案資料/AMES_AP/AMES_AP/Models/Stations.cs
index 71673e77..a41f46dd 100644
--- a/其他專案資料/AMES_AP/AMES_AP/Models/Stations.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/Models/Stations.cs
@@ -6,7 +6,7 @@ namespace AMES_AP.Models
/// <summary>
/// 站别資料
/// </summary>
- public class Stations
+ public class Station
{
/// <summary>
/// 站别序號
@@ -121,4 +121,11 @@ namespace AMES_AP.Models
public String StatusNo { get; set; }
}
+
+
+ public class Stations
+ {
+ public Station station { get; set; }
+ }
+
}
diff --git a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs
index da2226c4..5250b9ab 100644
--- a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.Designer.cs
@@ -28,12 +28,12 @@
/// </summary>
private void InitializeComponent()
{
- System.Windows.Forms.ListViewGroup listViewGroup13 = new System.Windows.Forms.ListViewGroup("ListViewGroup", System.Windows.Forms.HorizontalAlignment.Left);
- System.Windows.Forms.ListViewGroup listViewGroup14 = new System.Windows.Forms.ListViewGroup("ListViewGroup", System.Windows.Forms.HorizontalAlignment.Left);
- System.Windows.Forms.ListViewGroup listViewGroup15 = new System.Windows.Forms.ListViewGroup("ListViewGroup", System.Windows.Forms.HorizontalAlignment.Left);
- System.Windows.Forms.ListViewItem listViewItem13 = new System.Windows.Forms.ListViewItem("");
- System.Windows.Forms.ListViewItem listViewItem14 = new System.Windows.Forms.ListViewItem("");
- System.Windows.Forms.ListViewItem listViewItem15 = new System.Windows.Forms.ListViewItem("");
+ System.Windows.Forms.ListViewGroup listViewGroup4 = new System.Windows.Forms.ListViewGroup("ListViewGroup", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewGroup listViewGroup5 = new System.Windows.Forms.ListViewGroup("ListViewGroup", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewGroup listViewGroup6 = new System.Windows.Forms.ListViewGroup("ListViewGroup", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem("");
+ System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem("");
+ System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem("");
this.materialTabSelector1 = new MaterialSkin.Controls.MaterialTabSelector();
this.materialTabControl1 = new MaterialSkin.Controls.MaterialTabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -43,20 +43,14 @@
this.materialLabel13 = new MaterialSkin.Controls.MaterialLabel();
this.materialLabel12 = new MaterialSkin.Controls.MaterialLabel();
this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.materialLabel7 = new MaterialSkin.Controls.MaterialLabel();
- this.materialLabel8 = new MaterialSkin.Controls.MaterialLabel();
+ this.WipNo = new MaterialSkin.Controls.MaterialLabel();
this.materialLabel9 = new MaterialSkin.Controls.MaterialLabel();
this.materialLabel10 = new MaterialSkin.Controls.MaterialLabel();
this.materialLabel11 = new MaterialSkin.Controls.MaterialLabel();
- this.materialLabel6 = new MaterialSkin.Controls.MaterialLabel();
this.materialLabel5 = new MaterialSkin.Controls.MaterialLabel();
- this.materialLabel4 = new MaterialSkin.Controls.MaterialLabel();
this.materialLabel3 = new MaterialSkin.Controls.MaterialLabel();
this.materialLabel2 = new MaterialSkin.Controls.MaterialLabel();
this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.materialRadioButton2 = new MaterialSkin.Controls.MaterialRadioButton();
- this.materialRadioButton1 = new MaterialSkin.Controls.MaterialRadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.materialCheckBox4 = new MaterialSkin.Controls.MaterialCheckBox();
@@ -90,11 +84,15 @@
this.btnLogin = new MaterialSkin.Controls.MaterialRaisedButton();
this.textBox4 = new System.Windows.Forms.TextBox();
this.materialLabel1 = new MaterialSkin.Controls.MaterialLabel();
+ this.ItemNo = new MaterialSkin.Controls.MaterialLabel();
+ this.CustomerNo = new MaterialSkin.Controls.MaterialLabel();
+ this.PlanQty = new MaterialSkin.Controls.MaterialLabel();
+ this.ModelNo = new MaterialSkin.Controls.MaterialLabel();
+ this.CustomerItemNo = new MaterialSkin.Controls.MaterialLabel();
this.materialTabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox4.SuspendLayout();
- this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox6.SuspendLayout();
this.tabPage2.SuspendLayout();
@@ -119,11 +117,11 @@
this.materialTabControl1.Controls.Add(this.tabPage2);
this.materialTabControl1.Depth = 0;
this.materialTabControl1.Font = new System.Drawing.Font("新細明體", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
- this.materialTabControl1.Location = new System.Drawing.Point(0, 71);
+ this.materialTabControl1.Location = new System.Drawing.Point(0, 64);
this.materialTabControl1.MouseState = MaterialSkin.MouseState.HOVER;
this.materialTabControl1.Name = "materialTabControl1";
this.materialTabControl1.SelectedIndex = 0;
- this.materialTabControl1.Size = new System.Drawing.Size(640, 391);
+ this.materialTabControl1.Size = new System.Drawing.Size(1246, 708);
this.materialTabControl1.TabIndex = 0;
//
// tabPage1
@@ -131,13 +129,12 @@
this.tabPage1.Controls.Add(this.groupBox5);
this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Controls.Add(this.groupBox3);
- this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.groupBox6);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(632, 365);
+ this.tabPage1.Size = new System.Drawing.Size(1238, 682);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "包 裝";
//
@@ -147,9 +144,9 @@
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(6, 316);
+ this.groupBox5.Location = new System.Drawing.Point(8, 388);
this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(337, 91);
+ this.groupBox5.Size = new System.Drawing.Size(667, 91);
this.groupBox5.TabIndex = 4;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "箱號資訊";
@@ -208,48 +205,36 @@
//
// groupBox4
//
- this.groupBox4.Controls.Add(this.materialLabel7);
- this.groupBox4.Controls.Add(this.materialLabel8);
+ this.groupBox4.Controls.Add(this.CustomerItemNo);
+ this.groupBox4.Controls.Add(this.ModelNo);
+ this.groupBox4.Controls.Add(this.PlanQty);
+ this.groupBox4.Controls.Add(this.CustomerNo);
+ this.groupBox4.Controls.Add(this.ItemNo);
+ this.groupBox4.Controls.Add(this.WipNo);
this.groupBox4.Controls.Add(this.materialLabel9);
this.groupBox4.Controls.Add(this.materialLabel10);
this.groupBox4.Controls.Add(this.materialLabel11);
- this.groupBox4.Controls.Add(this.materialLabel6);
this.groupBox4.Controls.Add(this.materialLabel5);
- this.groupBox4.Controls.Add(this.materialLabel4);
this.groupBox4.Controls.Add(this.materialLabel3);
this.groupBox4.Controls.Add(this.materialLabel2);
- this.groupBox4.Location = new System.Drawing.Point(6, 155);
+ this.groupBox4.Location = new System.Drawing.Point(8, 273);
this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(610, 157);
+ this.groupBox4.Size = new System.Drawing.Size(667, 109);
this.groupBox4.TabIndex = 3;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "工單資訊";
//
- // materialLabel7
- //
- this.materialLabel7.AutoSize = true;
- this.materialLabel7.Depth = 0;
- this.materialLabel7.Font = new System.Drawing.Font("Roboto", 11F);
- this.materialLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.materialLabel7.Location = new System.Drawing.Point(305, 131);
- this.materialLabel7.MouseState = MaterialSkin.MouseState.HOVER;
- this.materialLabel7.Name = "materialLabel7";
- this.materialLabel7.Size = new System.Drawing.Size(77, 19);
- this.materialLabel7.TabIndex = 9;
- this.materialLabel7.Text = "箱號標籤:";
- //
- // materialLabel8
- //
- this.materialLabel8.AutoSize = true;
- this.materialLabel8.Depth = 0;
- this.materialLabel8.Font = new System.Drawing.Font("Roboto", 11F);
- this.materialLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.materialLabel8.Location = new System.Drawing.Point(305, 104);
- this.materialLabel8.MouseState = MaterialSkin.MouseState.HOVER;
- this.materialLabel8.Name = "materialLabel8";
- this.materialLabel8.Size = new System.Drawing.Size(77, 19);
- this.materialLabel8.TabIndex = 8;
- this.materialLabel8.Text = "客戶版本:";
+ // WipNo
+ //
+ this.WipNo.Depth = 0;
+ this.WipNo.Font = new System.Drawing.Font("Roboto", 11F);
+ this.WipNo.ForeColor = System.Drawing.Color.Red;
+ this.WipNo.Location = new System.Drawing.Point(89, 18);
+ this.WipNo.MouseState = MaterialSkin.MouseState.HOVER;
+ this.WipNo.Name = "WipNo";
+ this.WipNo.Size = new System.Drawing.Size(211, 19);
+ this.WipNo.TabIndex = 10;
+ this.WipNo.Text = "工單號碼";
//
// materialLabel9
//
@@ -262,7 +247,7 @@
this.materialLabel9.Name = "materialLabel9";
this.materialLabel9.Size = new System.Drawing.Size(77, 19);
this.materialLabel9.TabIndex = 7;
- this.materialLabel9.Text = "客戶機種:";
+ this.materialLabel9.Text = "客戶料號:";
//
// materialLabel10
//
@@ -283,51 +268,25 @@
this.materialLabel11.Depth = 0;
this.materialLabel11.Font = new System.Drawing.Font("Roboto", 11F);
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(306, 22);
+ 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(77, 19);
this.materialLabel11.TabIndex = 5;
this.materialLabel11.Text = "預計數量:";
//
- // materialLabel6
- //
- this.materialLabel6.AutoSize = true;
- this.materialLabel6.Depth = 0;
- this.materialLabel6.Font = new System.Drawing.Font("Roboto", 11F);
- this.materialLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.materialLabel6.Location = new System.Drawing.Point(6, 131);
- this.materialLabel6.MouseState = MaterialSkin.MouseState.HOVER;
- this.materialLabel6.Name = "materialLabel6";
- this.materialLabel6.Size = new System.Drawing.Size(77, 19);
- this.materialLabel6.TabIndex = 4;
- this.materialLabel6.Text = "條碼標籤:";
- //
// materialLabel5
//
this.materialLabel5.AutoSize = true;
this.materialLabel5.Depth = 0;
this.materialLabel5.Font = new System.Drawing.Font("Roboto", 11F);
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(6, 104);
+ this.materialLabel5.Location = new System.Drawing.Point(6, 76);
this.materialLabel5.MouseState = MaterialSkin.MouseState.HOVER;
this.materialLabel5.Name = "materialLabel5";
this.materialLabel5.Size = new System.Drawing.Size(77, 19);
this.materialLabel5.TabIndex = 3;
- this.materialLabel5.Text = "客戶代碼:";
- //
- // materialLabel4
- //
- this.materialLabel4.AutoSize = true;
- this.materialLabel4.Depth = 0;
- this.materialLabel4.Font = new System.Drawing.Font("Roboto", 11F);
- this.materialLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.materialLabel4.Location = new System.Drawing.Point(6, 76);
- this.materialLabel4.MouseState = MaterialSkin.MouseState.HOVER;
- this.materialLabel4.Name = "materialLabel4";
- this.materialLabel4.Size = new System.Drawing.Size(77, 19);
- this.materialLabel4.TabIndex = 2;
- this.materialLabel4.Text = "機種代碼:";
+ this.materialLabel5.Text = "客戶名稱:";
//
// materialLabel3
//
@@ -357,58 +316,13 @@
//
// groupBox3
//
- this.groupBox3.Location = new System.Drawing.Point(380, 58);
+ this.groupBox3.Location = new System.Drawing.Point(233, 156);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(236, 91);
+ this.groupBox3.Size = new System.Drawing.Size(442, 111);
this.groupBox3.TabIndex = 2;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "可選項";
//
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.materialRadioButton2);
- this.groupBox2.Controls.Add(this.materialRadioButton1);
- this.groupBox2.Location = new System.Drawing.Point(380, 6);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(236, 46);
- this.groupBox2.TabIndex = 1;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "SSN";
- //
- // materialRadioButton2
- //
- this.materialRadioButton2.AutoSize = true;
- this.materialRadioButton2.Depth = 0;
- this.materialRadioButton2.Font = new System.Drawing.Font("Roboto", 10F);
- this.materialRadioButton2.Location = new System.Drawing.Point(112, 11);
- this.materialRadioButton2.Margin = new System.Windows.Forms.Padding(0);
- this.materialRadioButton2.MouseLocation = new System.Drawing.Point(-1, -1);
- this.materialRadioButton2.MouseState = MaterialSkin.MouseState.HOVER;
- this.materialRadioButton2.Name = "materialRadioButton2";
- this.materialRadioButton2.Ripple = true;
- this.materialRadioButton2.Size = new System.Drawing.Size(85, 30);
- this.materialRadioButton2.TabIndex = 1;
- this.materialRadioButton2.TabStop = true;
- this.materialRadioButton2.Text = "SN!=SSN";
- this.materialRadioButton2.UseVisualStyleBackColor = true;
- //
- // materialRadioButton1
- //
- this.materialRadioButton1.AutoSize = true;
- this.materialRadioButton1.Depth = 0;
- this.materialRadioButton1.Font = new System.Drawing.Font("Roboto", 10F);
- this.materialRadioButton1.Location = new System.Drawing.Point(6, 11);
- this.materialRadioButton1.Margin = new System.Windows.Forms.Padding(0);
- this.materialRadioButton1.MouseLocation = new System.Drawing.Point(-1, -1);
- this.materialRadioButton1.MouseState = MaterialSkin.MouseState.HOVER;
- this.materialRadioButton1.Name = "materialRadioButton1";
- this.materialRadioButton1.Ripple = true;
- this.materialRadioButton1.Size = new System.Drawing.Size(81, 30);
- this.materialRadioButton1.TabIndex = 0;
- this.materialRadioButton1.TabStop = true;
- this.materialRadioButton1.Text = "SN=SSN";
- this.materialRadioButton1.UseVisualStyleBackColor = true;
- //
// groupBox1
//
this.groupBox1.Controls.Add(this.comboBox1);
@@ -418,9 +332,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(6, 6);
+ this.groupBox1.Location = new System.Drawing.Point(233, 6);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(368, 143);
+ this.groupBox1.Size = new System.Drawing.Size(442, 144);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "基本設定";
@@ -440,7 +354,7 @@
this.materialCheckBox4.AutoSize = true;
this.materialCheckBox4.Depth = 0;
this.materialCheckBox4.Font = new System.Drawing.Font("Roboto", 10F);
- this.materialCheckBox4.Location = new System.Drawing.Point(115, 101);
+ this.materialCheckBox4.Location = new System.Drawing.Point(115, 109);
this.materialCheckBox4.Margin = new System.Windows.Forms.Padding(0);
this.materialCheckBox4.MouseLocation = new System.Drawing.Point(-1, -1);
this.materialCheckBox4.MouseState = MaterialSkin.MouseState.HOVER;
@@ -470,7 +384,7 @@
this.materialCheckBox2.AutoSize = true;
this.materialCheckBox2.Depth = 0;
this.materialCheckBox2.Font = new System.Drawing.Font("Roboto", 10F);
- this.materialCheckBox2.Location = new System.Drawing.Point(6, 100);
+ this.materialCheckBox2.Location = new System.Drawing.Point(6, 109);
this.materialCheckBox2.Margin = new System.Windows.Forms.Padding(0);
this.materialCheckBox2.MouseLocation = new System.Drawing.Point(-1, -1);
this.materialCheckBox2.MouseState = MaterialSkin.MouseState.HOVER;
@@ -527,9 +441,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(705, 6);
+ this.groupBox6.Location = new System.Drawing.Point(8, 6);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(214, 306);
+ this.groupBox6.Size = new System.Drawing.Size(219, 261);
this.groupBox6.TabIndex = 5;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "條碼輸入";
@@ -537,9 +451,9 @@
// StationSelect
//
this.StationSelect.FormattingEnabled = true;
- this.StationSelect.Location = new System.Drawing.Point(106, 102);
+ this.StationSelect.Location = new System.Drawing.Point(81, 111);
this.StationSelect.Name = "StationSelect";
- this.StationSelect.Size = new System.Drawing.Size(102, 20);
+ this.StationSelect.Size = new System.Drawing.Size(124, 20);
this.StationSelect.TabIndex = 17;
//
// materialLabel22
@@ -548,19 +462,19 @@
this.materialLabel22.Depth = 0;
this.materialLabel22.Font = new System.Drawing.Font("Roboto", 11F);
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(6, 102);
+ this.materialLabel22.Location = new System.Drawing.Point(0, 109);
this.materialLabel22.MouseState = MaterialSkin.MouseState.HOVER;
this.materialLabel22.Name = "materialLabel22";
- this.materialLabel22.Size = new System.Drawing.Size(61, 19);
+ this.materialLabel22.Size = new System.Drawing.Size(77, 19);
this.materialLabel22.TabIndex = 16;
- this.materialLabel22.Text = "作業站:";
+ this.materialLabel22.Text = "作 業 站:";
//
// LineSelect
//
this.LineSelect.FormattingEnabled = true;
- this.LineSelect.Location = new System.Drawing.Point(106, 44);
+ this.LineSelect.Location = new System.Drawing.Point(81, 48);
this.LineSelect.Name = "LineSelect";
- this.LineSelect.Size = new System.Drawing.Size(102, 20);
+ this.LineSelect.Size = new System.Drawing.Size(124, 20);
this.LineSelect.TabIndex = 15;
//
// materialLabel21
@@ -569,25 +483,25 @@
this.materialLabel21.Depth = 0;
this.materialLabel21.Font = new System.Drawing.Font("Roboto", 11F);
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(6, 45);
+ this.materialLabel21.Location = new System.Drawing.Point(0, 48);
this.materialLabel21.MouseState = MaterialSkin.MouseState.HOVER;
this.materialLabel21.Name = "materialLabel21";
- this.materialLabel21.Size = new System.Drawing.Size(45, 19);
+ this.materialLabel21.Size = new System.Drawing.Size(77, 19);
this.materialLabel21.TabIndex = 14;
- this.materialLabel21.Text = "線別:";
+ this.materialLabel21.Text = "線 別:";
//
// textBox3
//
- this.textBox3.Location = new System.Drawing.Point(106, 146);
+ this.textBox3.Location = new System.Drawing.Point(81, 152);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(82, 22);
+ this.textBox3.Size = new System.Drawing.Size(124, 22);
this.textBox3.TabIndex = 13;
//
// textBox2
//
- this.textBox2.Location = new System.Drawing.Point(106, 175);
+ this.textBox2.Location = new System.Drawing.Point(81, 189);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(82, 22);
+ this.textBox2.Size = new System.Drawing.Size(124, 22);
this.textBox2.TabIndex = 12;
//
// materialLabel18
@@ -596,41 +510,40 @@
this.materialLabel18.Depth = 0;
this.materialLabel18.Font = new System.Drawing.Font("Roboto", 11F);
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(6, 175);
+ this.materialLabel18.Location = new System.Drawing.Point(-2, 192);
this.materialLabel18.MouseState = MaterialSkin.MouseState.HOVER;
this.materialLabel18.Name = "materialLabel18";
- this.materialLabel18.Size = new System.Drawing.Size(42, 19);
+ this.materialLabel18.Size = new System.Drawing.Size(77, 19);
this.materialLabel18.TabIndex = 11;
- this.materialLabel18.Text = "SSN:";
+ this.materialLabel18.Text = "客戶序號:";
//
// materialLabel19
//
- this.materialLabel19.AutoSize = true;
this.materialLabel19.Depth = 0;
this.materialLabel19.Font = new System.Drawing.Font("Roboto", 11F);
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(6, 149);
+ this.materialLabel19.Location = new System.Drawing.Point(-2, 152);
this.materialLabel19.MouseState = MaterialSkin.MouseState.HOVER;
this.materialLabel19.Name = "materialLabel19";
- this.materialLabel19.Size = new System.Drawing.Size(41, 19);
+ this.materialLabel19.Size = new System.Drawing.Size(77, 22);
this.materialLabel19.TabIndex = 10;
- this.materialLabel19.Text = "SN :";
+ this.materialLabel19.Text = "內部序號:";
//
// UnitSelect
//
this.UnitSelect.FormattingEnabled = true;
- this.UnitSelect.Location = new System.Drawing.Point(106, 17);
+ this.UnitSelect.Location = new System.Drawing.Point(81, 20);
this.UnitSelect.Name = "UnitSelect";
- this.UnitSelect.Size = new System.Drawing.Size(102, 20);
+ this.UnitSelect.Size = new System.Drawing.Size(124, 20);
this.UnitSelect.TabIndex = 9;
this.UnitSelect.SelectionChangeCommitted += new System.EventHandler(this.UnitSelect_SelectionChangeCommitted);
//
// txtWipNo
//
this.txtWipNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
- this.txtWipNo.Location = new System.Drawing.Point(106, 74);
+ this.txtWipNo.Location = new System.Drawing.Point(81, 79);
this.txtWipNo.Name = "txtWipNo";
- this.txtWipNo.Size = new System.Drawing.Size(82, 22);
+ this.txtWipNo.Size = new System.Drawing.Size(124, 22);
this.txtWipNo.TabIndex = 8;
this.txtWipNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtWipNo_KeyDown);
//
@@ -640,12 +553,12 @@
this.materialLabel17.Depth = 0;
this.materialLabel17.Font = new System.Drawing.Font("Roboto", 11F);
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(6, 73);
+ this.materialLabel17.Location = new System.Drawing.Point(0, 80);
this.materialLabel17.MouseState = MaterialSkin.MouseState.HOVER;
this.materialLabel17.Name = "materialLabel17";
- this.materialLabel17.Size = new System.Drawing.Size(45, 19);
+ this.materialLabel17.Size = new System.Drawing.Size(77, 19);
this.materialLabel17.TabIndex = 7;
- this.materialLabel17.Text = "工單:";
+ this.materialLabel17.Text = "工 單:";
//
// materialLabel16
//
@@ -653,12 +566,12 @@
this.materialLabel16.Depth = 0;
this.materialLabel16.Font = new System.Drawing.Font("Roboto", 11F);
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(6, 18);
+ this.materialLabel16.Location = new System.Drawing.Point(0, 22);
this.materialLabel16.MouseState = MaterialSkin.MouseState.HOVER;
this.materialLabel16.Name = "materialLabel16";
- this.materialLabel16.Size = new System.Drawing.Size(45, 19);
+ this.materialLabel16.Size = new System.Drawing.Size(77, 19);
this.materialLabel16.TabIndex = 6;
- this.materialLabel16.Text = "製程:";
+ this.materialLabel16.Text = "製 程:";
//
// tabPage2
//
@@ -674,7 +587,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(992, 585);
+ this.tabPage2.Size = new System.Drawing.Size(1238, 682);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "入庫單";
//
@@ -688,22 +601,22 @@
this.materialListView1.Depth = 0;
this.materialListView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F);
this.materialListView1.FullRowSelect = true;
- listViewGroup13.Header = "ListViewGroup";
- listViewGroup13.Name = "listViewGroup1";
- listViewGroup14.Header = "ListViewGroup";
- listViewGroup14.Name = "listViewGroup2";
- listViewGroup15.Header = "ListViewGroup";
- listViewGroup15.Name = "listViewGroup3";
+ listViewGroup4.Header = "ListViewGroup";
+ listViewGroup4.Name = "listViewGroup1";
+ listViewGroup5.Header = "ListViewGroup";
+ listViewGroup5.Name = "listViewGroup2";
+ listViewGroup6.Header = "ListViewGroup";
+ listViewGroup6.Name = "listViewGroup3";
this.materialListView1.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
- listViewGroup13,
- listViewGroup14,
- listViewGroup15});
+ listViewGroup4,
+ listViewGroup5,
+ listViewGroup6});
this.materialListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.materialListView1.HideSelection = false;
this.materialListView1.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
- listViewItem13,
- listViewItem14,
- listViewItem15});
+ listViewItem4,
+ listViewItem5,
+ listViewItem6});
this.materialListView1.Location = new System.Drawing.Point(41, 106);
this.materialListView1.MouseLocation = new System.Drawing.Point(-1, -1);
this.materialListView1.MouseState = MaterialSkin.MouseState.OUT;
@@ -799,6 +712,66 @@
this.materialLabel1.TabIndex = 9;
this.materialLabel1.Text = "工單:";
//
+ // ItemNo
+ //
+ this.ItemNo.Depth = 0;
+ this.ItemNo.Font = new System.Drawing.Font("Roboto", 11F);
+ this.ItemNo.ForeColor = System.Drawing.Color.Red;
+ this.ItemNo.Location = new System.Drawing.Point(89, 48);
+ this.ItemNo.MouseState = MaterialSkin.MouseState.HOVER;
+ this.ItemNo.Name = "ItemNo";
+ this.ItemNo.Size = new System.Drawing.Size(211, 19);
+ this.ItemNo.TabIndex = 11;
+ this.ItemNo.Text = "料號";
+ //
+ // CustomerNo
+ //
+ this.CustomerNo.Depth = 0;
+ this.CustomerNo.Font = new System.Drawing.Font("Roboto", 11F);
+ this.CustomerNo.ForeColor = System.Drawing.Color.Red;
+ this.CustomerNo.Location = new System.Drawing.Point(88, 76);
+ this.CustomerNo.MouseState = MaterialSkin.MouseState.HOVER;
+ this.CustomerNo.Name = "CustomerNo";
+ this.CustomerNo.Size = new System.Drawing.Size(211, 19);
+ this.CustomerNo.TabIndex = 13;
+ this.CustomerNo.Text = "客戶名稱";
+ //
+ // PlanQty
+ //
+ this.PlanQty.Depth = 0;
+ this.PlanQty.Font = new System.Drawing.Font("Roboto", 11F);
+ this.PlanQty.ForeColor = System.Drawing.Color.Red;
+ this.PlanQty.Location = new System.Drawing.Point(389, 18);
+ this.PlanQty.MouseState = MaterialSkin.MouseState.HOVER;
+ this.PlanQty.Name = "PlanQty";
+ this.PlanQty.Size = new System.Drawing.Size(211, 19);
+ this.PlanQty.TabIndex = 15;
+ this.PlanQty.Text = "預計數量";
+ //
+ // ModelNo
+ //
+ this.ModelNo.Depth = 0;
+ this.ModelNo.Font = new System.Drawing.Font("Roboto", 11F);
+ this.ModelNo.ForeColor = System.Drawing.Color.Red;
+ this.ModelNo.Location = new System.Drawing.Point(389, 48);
+ this.ModelNo.MouseState = MaterialSkin.MouseState.HOVER;
+ this.ModelNo.Name = "ModelNo";
+ this.ModelNo.Size = new System.Drawing.Size(211, 19);
+ this.ModelNo.TabIndex = 16;
+ this.ModelNo.Text = "機種";
+ //
+ // CustomerItemNo
+ //
+ this.CustomerItemNo.Depth = 0;
+ this.CustomerItemNo.Font = new System.Drawing.Font("Roboto", 11F);
+ this.CustomerItemNo.ForeColor = System.Drawing.Color.Red;
+ this.CustomerItemNo.Location = new System.Drawing.Point(389, 76);
+ this.CustomerItemNo.MouseState = MaterialSkin.MouseState.HOVER;
+ this.CustomerItemNo.Name = "CustomerItemNo";
+ this.CustomerItemNo.Size = new System.Drawing.Size(211, 19);
+ this.CustomerItemNo.TabIndex = 17;
+ this.CustomerItemNo.Text = "客戶料號";
+ //
// StockControlForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -817,8 +790,6 @@
this.groupBox5.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox6.ResumeLayout(false);
@@ -837,7 +808,6 @@
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox3;
- private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.GroupBox groupBox1;
private MaterialSkin.Controls.MaterialCheckBox materialCheckBox2;
private MaterialSkin.Controls.MaterialCheckBox materialCheckBox1;
@@ -845,20 +815,14 @@
private System.Windows.Forms.ComboBox comboBox2;
private System.Windows.Forms.TabPage tabPage2;
private MaterialSkin.Controls.MaterialLabel materialLabel2;
- private MaterialSkin.Controls.MaterialRadioButton materialRadioButton2;
- private MaterialSkin.Controls.MaterialRadioButton materialRadioButton1;
private MaterialSkin.Controls.MaterialLabel materialLabel15;
private MaterialSkin.Controls.MaterialLabel materialLabel14;
private MaterialSkin.Controls.MaterialLabel materialLabel13;
private MaterialSkin.Controls.MaterialLabel materialLabel12;
- private MaterialSkin.Controls.MaterialLabel materialLabel7;
- private MaterialSkin.Controls.MaterialLabel materialLabel8;
private MaterialSkin.Controls.MaterialLabel materialLabel9;
private MaterialSkin.Controls.MaterialLabel materialLabel10;
private MaterialSkin.Controls.MaterialLabel materialLabel11;
- private MaterialSkin.Controls.MaterialLabel materialLabel6;
private MaterialSkin.Controls.MaterialLabel materialLabel5;
- private MaterialSkin.Controls.MaterialLabel materialLabel4;
private MaterialSkin.Controls.MaterialLabel materialLabel3;
private MaterialSkin.Controls.MaterialCheckBox materialCheckBox4;
private MaterialSkin.Controls.MaterialCheckBox materialCheckBox3;
@@ -886,5 +850,11 @@
private System.Windows.Forms.ComboBox StationSelect;
private MaterialSkin.Controls.MaterialLabel materialLabel22;
private System.Windows.Forms.ComboBox LineSelect;
+ private MaterialSkin.Controls.MaterialLabel WipNo;
+ private MaterialSkin.Controls.MaterialLabel CustomerItemNo;
+ private MaterialSkin.Controls.MaterialLabel ModelNo;
+ private MaterialSkin.Controls.MaterialLabel PlanQty;
+ private MaterialSkin.Controls.MaterialLabel CustomerNo;
+ private MaterialSkin.Controls.MaterialLabel ItemNo;
}
}
\ No newline at end of file
diff --git a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs
index 89046d59..322beded 100644
--- a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs
+++ b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs
@@ -24,10 +24,14 @@ namespace AMES_AP
GetUnitSelect();
}
- private void GetUnitSelect()
+ #region 下拉選單
+ /// <summary>
+ /// 生產單位
+ /// </summary>
+ private void GetUnitSelect()
{
var query = ApiHelper.GetMethod("api/FactoryUnits");
- if (query == "error" || query== "無法連線WebAPI")
+ if (query == "error" || query == "無法連線WebAPI")
{
MessageBox.Show(query);
return;
@@ -60,7 +64,10 @@ namespace AMES_AP
//cbLine.SelectedIndex = index;
}
- private async void GetLineSelect()
+ /// <summary>
+ /// 線別
+ /// </summary>
+ private void GetLineSelect()
{
var query = ApiHelper.GetMethod($"api/LineInfoes/Unit/{UnitSelect.SelectedValue}");
if (query == "error" || query == "無法連線WebAPI")
@@ -79,10 +86,14 @@ namespace AMES_AP
LineSelect.ValueMember = "Key";
}
- private async void GetStationSelect(int FlowRuleID)
+ /// <summary>
+ /// 作業站
+ /// </summary>
+ /// <param name="FlowRuleID">流程ID</param>
+ private void GetStationSelect(int FlowRuleID)
{
var query = ApiHelper.GetMethod($"api/RuleStations/Flow/{FlowRuleID}");
- if (query== "error" || query == "無法連線WebAPI")
+ if (query == "error" || query == "無法連線WebAPI")
{
MessageBox.Show(query);
return;
@@ -91,12 +102,14 @@ namespace AMES_AP
ArrayList myline = new ArrayList();
foreach (var item in result)
{
- myline.Add(new DictionaryEntry(item.StationID, item.StationName));
+ myline.Add(new DictionaryEntry(item.station.StationID, item.station.StationName));
}
StationSelect.DataSource = new BindingSource(myline, null);
StationSelect.DisplayMember = "Value";
StationSelect.ValueMember = "Key";
}
+ #endregion
+
private void btnChooseFile_Click(object sender, EventArgs e)
{
var aa = ApiHelper.GetMethod("api/WipInfos");
@@ -137,21 +150,22 @@ namespace AMES_AP
MessageBox.Show("找不到工單相關資訊", "錯誤訊息", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
- GetStationSelect(wipInfos.FirstOrDefault().FlowRuleID);
- //if (result.Contains("多項錯誤"))
- //{
- // FlexibleMessageBox.Show("無法連接WebService，請聯繫系統工程師 / System Error ,Please Contact Person PG", "錯誤訊息", MessageBoxButtons.OK, MessageBoxIcon.Error);
- // return;
- //}
- //this.txtProduct.Text = result.Split(',')[0]; //料號
- //this.txtMoIDQty.Text = result.Split(',')[1]; //工單數量
+ GetStationSelect(wipInfos.FirstOrDefault().FlowRuleID);
- //Get_Data();
- //Get_SWeight();
- //Get_MoIDBomProduct();
- //Get_cbNumber();
+ GetWipInfoData(wipInfos.FirstOrDefault());
}
}
+
+ private void GetWipInfoData(WipInfo wipInfo)
+ {
+ WipNo.Text = wipInfo.WipNO;
+ ItemNo.Text = wipInfo.GetWipAtt.ItemNO;
+ CustomerNo.Text = wipInfo.CustomerNO;
+
+ PlanQty.Text = wipInfo.PlanQTY.ToString();
+ ModelNo.Text = wipInfo.GetWipAtt.ModelNO;
+ CustomerItemNo.Text = wipInfo.CustomerItemNO;
+ }
}
}
diff --git a/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe b/其他專案資料/AMES_AP/AMES_AP/bin/Debug/AMES_AP.exe
index e26c85ee..f7883a68 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 fbbdf38b..27212827 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.csproj.AssemblyReference.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.AssemblyReference.cache
index 1aa23a11..f5e894ae 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.AssemblyReference.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.AssemblyReference.cache differ
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 88a95fe5..48c426f5 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 e26c85ee..f7883a68 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 fbbdf38b..27212827 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