backup

OW-ERP-SYS/03、倉儲管理系統/倉儲基本控制/物料領料單.vb

@@ -1439,24 +1439,36 @@ Public Class 物料領料單
     Private Sub 確認出庫_bt_Click(sender As Object, e As EventArgs) Handles 確認出庫_bt.Click
         If 領料單編號_tb.Text <> "" Then
             If 指定倉庫_cb.Text <> "" Then
+                SQL_指定倉儲_資料讀取(指定倉庫_cb.Text)
+                Dim 倉庫級別 As String = ""
+                Dim 倉庫編號 As String = ""
+                If dr.Read() Then
+                    倉庫級別 = dr("倉級") : 倉庫編號 = dr("倉名編號")
+                End If : conn.Close()
+
 
                 For I As Integer = 0 To 領料單明細_dgv.Rows.Count - 1
                     Dim 物料編號 As String = 領料單明細_dgv.Rows(I).Cells("物料編號").Value.ToString().Trim()
+                    Dim 物品名稱 As String = 領料單明細_dgv.Rows(I).Cells("物品名稱").Value.ToString()
+                    Dim 數量 As Double = 領料單明細_dgv.Rows(I).Cells("數量").Value
                     If String.IsNullOrEmpty(物料編號) Then
                         MGB("物料不能為空", 1)
                         Return ' 如果有任意一個物料料號為空，則不繼續執行
                     End If
+
+                    Dim 庫存量 As Double = 0
+                    SQL_庫存餘額判斷(倉庫編號, 物料編號)
+                    If dr.Read() Then
+                        庫存量 = dr("庫存量")
+                        If 數量 > 庫存量 Then
+                            MGB(物品名稱 & "庫存量不足", 1)
+                            Return
+                        End If
+                    End If : conn.Close()
                 Next
 
                 MGB("確定要出庫嗎?", 2) ' 確認刪除操作
                 If 訊息回應 <> "YES" Then Return
-                SQL_指定倉儲_資料讀取(指定倉庫_cb.Text)
-                Dim 倉庫級別 As String = ""
-                Dim 倉庫編號 As String = ""
-                If dr.Read() Then
-                    倉庫級別 = dr("倉級") : 倉庫編號 = dr("倉名編號")
-                End If : conn.Close()
-
 
                 For I As Integer = 0 To 領料單明細_dgv.Rows.Count - 1
                     Dim 領料單明細編號 As String = 領料單明細_dgv.Rows(I).Cells("領料單明細編號").Value.ToString()

OW-ERP-SYS/03、倉儲管理系統/倉儲明細表.vb

@@ -42,17 +42,17 @@ Public Class 倉儲明細表
         End If
         SQL_倉儲管理系統_倉儲明細表(物料種類_cb.Text, 關鍵字_tb.Text, 倉庫編號, str) : da.Fill(ds1) : 明細表_dgv.DataSource = ds1.Tables(0) : conn.Close()
         明細表_dgv.Columns(1).ReadOnly = True : 明細表_dgv.Columns(2).ReadOnly = True : 明細表_dgv.Columns(3).ReadOnly = True
-        明細表_dgv.Columns(0).Visible = False : 明細表_dgv.Columns(1).FillWeight = 150 : 明細表_dgv.Columns(2).FillWeight = 150
-        明細表_dgv.Columns(3).FillWeight = 50
-        明細表_dgv.Columns(3).DefaultCellStyle.Format = "#,##0"
-        明細表_dgv.Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
-        明細表_dgv.Columns(3).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        明細表_dgv.Columns(0).Visible = False : 明細表_dgv.Columns(1).FillWeight = 100 : 明細表_dgv.Columns(2).FillWeight = 150
+        明細表_dgv.Columns(3).FillWeight = 150 : 明細表_dgv.Columns(4).FillWeight = 50 : 明細表_dgv.Columns(5).Visible = False
+        明細表_dgv.Columns(4).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        明細表_dgv.Columns(4).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
 
     End Sub
     Private Sub 明細表_dgv_CellClick(ByVal sender As System.Object, ByVal e As System.Windows.Forms.DataGridViewCellEventArgs) Handles 明細表_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             料號_tb.Text = 明細表_dgv(0, e.RowIndex).Value.ToString
-            品名_tb.Text = 明細表_dgv(1, e.RowIndex).Value.ToString
+            品名_tb.Text = 明細表_dgv(2, e.RowIndex).Value.ToString
             Set_清單1()
         End If
     End Sub

OW-ERP-SYS/03、倉儲管理系統/盤營盤損.Designer.vb

@@ -22,6 +22,10 @@ Partial Class 盤營盤損
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -38,14 +42,23 @@ Partial Class 盤營盤損
         Me.明細表1_dgv = New System.Windows.Forms.DataGridView()
         Me.明細表_dgv = New System.Windows.Forms.DataGridView()
         Me.存檔 = New System.Windows.Forms.Button()
+        Me.日期_dgv = New System.Windows.Forms.DataGridView()
+        Me.日期明細_dgv = New System.Windows.Forms.DataGridView()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.人員_tb = New System.Windows.Forms.TextBox()
+        Me.日期_tb = New System.Windows.Forms.TextBox()
         CType(Me.明細表1_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.日期_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.日期明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
         '
         '庫存為零_rb
         '
+        Me.庫存為零_rb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.庫存為零_rb.AutoSize = True
-        Me.庫存為零_rb.Location = New System.Drawing.Point(543, 35)
+        Me.庫存為零_rb.Location = New System.Drawing.Point(1199, 35)
         Me.庫存為零_rb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.庫存為零_rb.Name = "庫存為零_rb"
         Me.庫存為零_rb.Size = New System.Drawing.Size(73, 20)
@@ -56,9 +69,10 @@ Partial Class 盤營盤損
         '
         '庫存非零_rb
         '
+        Me.庫存非零_rb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.庫存非零_rb.AutoSize = True
         Me.庫存非零_rb.ImageAlign = System.Drawing.ContentAlignment.BottomRight
-        Me.庫存非零_rb.Location = New System.Drawing.Point(543, 5)
+        Me.庫存非零_rb.Location = New System.Drawing.Point(1199, 5)
         Me.庫存非零_rb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.庫存非零_rb.Name = "庫存非零_rb"
         Me.庫存非零_rb.Size = New System.Drawing.Size(73, 20)
@@ -69,20 +83,22 @@ Partial Class 盤營盤損
         '
         '指定倉庫_cb
         '
+        Me.指定倉庫_cb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.指定倉庫_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple
         Me.指定倉庫_cb.FormattingEnabled = True
         Me.指定倉庫_cb.Items.AddRange(New Object() {"2019"})
-        Me.指定倉庫_cb.Location = New System.Drawing.Point(292, 2)
+        Me.指定倉庫_cb.Location = New System.Drawing.Point(999, 4)
         Me.指定倉庫_cb.Name = "指定倉庫_cb"
-        Me.指定倉庫_cb.Size = New System.Drawing.Size(179, 24)
+        Me.指定倉庫_cb.Size = New System.Drawing.Size(135, 24)
         Me.指定倉庫_cb.TabIndex = 2002
         '
         'Label2
         '
+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label2.AutoSize = True
         Me.Label2.BackColor = System.Drawing.Color.Transparent
         Me.Label2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Label2.Location = New System.Drawing.Point(255, 5)
+        Me.Label2.Location = New System.Drawing.Point(962, 7)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(31, 16)
         Me.Label2.TabIndex = 2001
@@ -91,20 +107,22 @@ Partial Class 盤營盤損
         '
         '物料種類_cb
         '
+        Me.物料種類_cb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.物料種類_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple
         Me.物料種類_cb.FormattingEnabled = True
         Me.物料種類_cb.Items.AddRange(New Object() {"2019"})
-        Me.物料種類_cb.Location = New System.Drawing.Point(68, 2)
+        Me.物料種類_cb.Location = New System.Drawing.Point(821, 4)
         Me.物料種類_cb.Name = "物料種類_cb"
-        Me.物料種類_cb.Size = New System.Drawing.Size(181, 24)
+        Me.物料種類_cb.Size = New System.Drawing.Size(135, 24)
         Me.物料種類_cb.TabIndex = 1996
         '
         '簡稱_lb
         '
+        Me.簡稱_lb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.簡稱_lb.AutoSize = True
         Me.簡稱_lb.BackColor = System.Drawing.Color.Transparent
         Me.簡稱_lb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.簡稱_lb.Location = New System.Drawing.Point(9, 5)
+        Me.簡稱_lb.Location = New System.Drawing.Point(760, 7)
         Me.簡稱_lb.Name = "簡稱_lb"
         Me.簡稱_lb.Size = New System.Drawing.Size(55, 16)
         Me.簡稱_lb.TabIndex = 1995
@@ -113,16 +131,18 @@ Partial Class 盤營盤損
         '
         '關鍵字_tb
         '
-        Me.關鍵字_tb.Location = New System.Drawing.Point(68, 31)
+        Me.關鍵字_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.關鍵字_tb.Location = New System.Drawing.Point(821, 31)
         Me.關鍵字_tb.Name = "關鍵字_tb"
-        Me.關鍵字_tb.Size = New System.Drawing.Size(403, 23)
+        Me.關鍵字_tb.Size = New System.Drawing.Size(313, 23)
         Me.關鍵字_tb.TabIndex = 1994
         '
         'Label1
         '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label1.AutoSize = True
         Me.Label1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.Label1.Location = New System.Drawing.Point(9, 34)
+        Me.Label1.Location = New System.Drawing.Point(760, 34)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(55, 16)
         Me.Label1.TabIndex = 1993
@@ -131,11 +151,12 @@ Partial Class 盤營盤損
         '
         '客戶搜尋_bt
         '
+        Me.客戶搜尋_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.客戶搜尋_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Search
         Me.客戶搜尋_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.客戶搜尋_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.客戶搜尋_bt.ForeColor = System.Drawing.Color.Black
-        Me.客戶搜尋_bt.Location = New System.Drawing.Point(477, 2)
+        Me.客戶搜尋_bt.Location = New System.Drawing.Point(1141, 2)
         Me.客戶搜尋_bt.Name = "客戶搜尋_bt"
         Me.客戶搜尋_bt.Size = New System.Drawing.Size(51, 53)
         Me.客戶搜尋_bt.TabIndex = 1992
@@ -143,63 +164,130 @@ Partial Class 盤營盤損
         '
         '明細表1_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
-        Me.明細表1_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表1_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.明細表1_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.明細表1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.明細表1_dgv.BackgroundColor = System.Drawing.Color.White
         Me.明細表1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.明細表1_dgv.Location = New System.Drawing.Point(5, 59)
+        Me.明細表1_dgv.Location = New System.Drawing.Point(757, 59)
         Me.明細表1_dgv.Margin = New System.Windows.Forms.Padding(5)
         Me.明細表1_dgv.Name = "明細表1_dgv"
         Me.明細表1_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.明細表1_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.明細表1_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
         Me.明細表1_dgv.RowTemplate.Height = 24
-        Me.明細表1_dgv.Size = New System.Drawing.Size(675, 619)
+        Me.明細表1_dgv.Size = New System.Drawing.Size(574, 619)
         Me.明細表1_dgv.TabIndex = 1991
         '
         '明細表_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
-        Me.明細表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.明細表_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.明細表_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.明細表_dgv.BackgroundColor = System.Drawing.Color.White
         Me.明細表_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.明細表_dgv.Location = New System.Drawing.Point(5, 59)
+        Me.明細表_dgv.Location = New System.Drawing.Point(757, 59)
         Me.明細表_dgv.Margin = New System.Windows.Forms.Padding(5)
         Me.明細表_dgv.Name = "明細表_dgv"
         Me.明細表_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.明細表_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.明細表_dgv.RowsDefaultCellStyle = DataGridViewCellStyle4
         Me.明細表_dgv.RowTemplate.Height = 24
-        Me.明細表_dgv.Size = New System.Drawing.Size(675, 619)
+        Me.明細表_dgv.Size = New System.Drawing.Size(574, 619)
         Me.明細表_dgv.TabIndex = 1990
         '
         '存檔
         '
+        Me.存檔.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.存檔.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Save_Win11
         Me.存檔.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.存檔.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.存檔.ForeColor = System.Drawing.Color.Black
-        Me.存檔.Location = New System.Drawing.Point(629, 2)
+        Me.存檔.Location = New System.Drawing.Point(1278, 2)
         Me.存檔.Name = "存檔"
         Me.存檔.Size = New System.Drawing.Size(51, 53)
         Me.存檔.TabIndex = 2005
         Me.存檔.UseVisualStyleBackColor = True
         '
+        '日期_dgv
+        '
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.日期_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        Me.日期_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.日期_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.日期_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.日期_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.日期_dgv.Location = New System.Drawing.Point(5, 5)
+        Me.日期_dgv.Margin = New System.Windows.Forms.Padding(5)
+        Me.日期_dgv.Name = "日期_dgv"
+        Me.日期_dgv.RowHeadersWidth = 5
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.日期_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
+        Me.日期_dgv.RowTemplate.Height = 24
+        Me.日期_dgv.Size = New System.Drawing.Size(148, 673)
+        Me.日期_dgv.TabIndex = 2006
+        '
+        '日期明細_dgv
+        '
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.日期明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        Me.日期明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.日期明細_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.日期明細_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.日期明細_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.日期明細_dgv.Location = New System.Drawing.Point(155, 5)
+        Me.日期明細_dgv.Margin = New System.Windows.Forms.Padding(5)
+        Me.日期明細_dgv.Name = "日期明細_dgv"
+        Me.日期明細_dgv.RowHeadersWidth = 5
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.日期明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        Me.日期明細_dgv.RowTemplate.Height = 24
+        Me.日期明細_dgv.Size = New System.Drawing.Size(597, 673)
+        Me.日期明細_dgv.TabIndex = 2007
+        '
+        'Panel1
+        '
+        Me.Panel1.Controls.Add(Me.日期_tb)
+        Me.Panel1.Controls.Add(Me.人員_tb)
+        Me.Panel1.Location = New System.Drawing.Point(260, 243)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(290, 206)
+        Me.Panel1.TabIndex = 2008
+        Me.Panel1.Visible = False
+        '
+        '人員_tb
+        '
+        Me.人員_tb.Location = New System.Drawing.Point(12, 15)
+        Me.人員_tb.Name = "人員_tb"
+        Me.人員_tb.Size = New System.Drawing.Size(97, 23)
+        Me.人員_tb.TabIndex = 1995
+        '
+        '日期_tb
+        '
+        Me.日期_tb.Location = New System.Drawing.Point(115, 15)
+        Me.日期_tb.Name = "日期_tb"
+        Me.日期_tb.Size = New System.Drawing.Size(97, 23)
+        Me.日期_tb.TabIndex = 1996
+        '
         '盤營盤損
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(690, 681)
+        Me.ClientSize = New System.Drawing.Size(1334, 681)
+        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.日期明細_dgv)
+        Me.Controls.Add(Me.日期_dgv)
         Me.Controls.Add(Me.存檔)
         Me.Controls.Add(Me.庫存為零_rb)
         Me.Controls.Add(Me.庫存非零_rb)
@@ -219,6 +307,10 @@ Partial Class 盤營盤損
         Me.Text = "盤營盤損"
         CType(Me.明細表1_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.日期_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.日期明細_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -236,4 +328,9 @@ Partial Class 盤營盤損
     Friend WithEvents 明細表1_dgv As DataGridView
     Friend WithEvents 明細表_dgv As DataGridView
     Friend WithEvents 存檔 As Button
+    Friend WithEvents 日期_dgv As DataGridView
+    Friend WithEvents 日期明細_dgv As DataGridView
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents 日期_tb As TextBox
+    Friend WithEvents 人員_tb As TextBox
 End Class

OW-ERP-SYS/03、倉儲管理系統/盤營盤損.vb

@@ -1,11 +1,12 @@
 Public Class 盤營盤損
     Dim EDR As Integer = 0 : Dim ESTR As String
     Private Sub 盤營盤損_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Me.MdiParent = OW_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
         庫存非零_rb.Checked = True : 庫存為零_rb.Checked = False
         物料種類_cb_下拉表單資料載入() : 指定倉庫_cb_下拉表單資料載入()
     End Sub
     Private Sub 盤營盤損_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
-        CB選擇清單(指定倉庫_cb, 指定倉庫_cb.Text) : Set_清單()
+        Set_清單1() : CB選擇清單(指定倉庫_cb, 指定倉庫_cb.Text) : Set_清單()
     End Sub
     Private Sub 物料種類_cb_Click(sender As Object, e As EventArgs) Handles 物料種類_cb.Click
         CB選擇清單(物料種類_cb, 物料種類_cb.Text)
@@ -49,14 +50,61 @@
         End If
         SQL_倉儲管理系統_倉儲明細表(物料種類_cb.Text, 關鍵字_tb.Text, 倉庫編號, str) : da.Fill(ds1) : 明細表_dgv.DataSource = ds1.Tables(0)
         da.Fill(ds2) : 明細表1_dgv.DataSource = ds2.Tables(0) : conn.Close()
-        明細表_dgv.Columns(1).ReadOnly = True : 明細表_dgv.Columns(2).ReadOnly = True
-        明細表_dgv.Columns(0).FillWeight = 100 : 明細表_dgv.Columns(1).FillWeight = 150 : 明細表_dgv.Columns(2).FillWeight = 150
-        明細表_dgv.Columns(3).FillWeight = 50
-        明細表_dgv.Columns(3).DefaultCellStyle.Format = "#,##0"
-        明細表_dgv.Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
-        明細表_dgv.Columns(3).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        明細表_dgv.Columns(1).ReadOnly = True : 明細表_dgv.Columns(2).ReadOnly = True : 明細表_dgv.Columns(3).ReadOnly = True
+        明細表_dgv.Columns(0).Visible = False : 明細表_dgv.Columns(1).FillWeight = 100 : 明細表_dgv.Columns(2).FillWeight = 150
+        明細表_dgv.Columns(3).Visible = False : 明細表_dgv.Columns(4).FillWeight = 50 : 明細表_dgv.Columns(5).FillWeight = 150
+        明細表_dgv.Columns(4).DefaultCellStyle.Format = "#,##0"
+        明細表_dgv.Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        明細表_dgv.Columns(4).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
     End Sub
+    Private Sub Set_清單1()
+        Dim ds1 As New DataSet : 日期_dgv.DataSource = Nothing : ds1.Clear()
+        日期_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        日期_dgv.ColumnHeadersHeight = 25
+        日期_dgv.AllowUserToAddRows = False
+        日期_dgv.RowTemplate.Height = 35
+        日期_dgv.EditMode = DataGridViewEditMode.EditOnEnter
 
+        SQL_盤營盤損_日期清單() : da.Fill(ds1) : 日期_dgv.DataSource = ds1.Tables(0) : conn.Close()
+        日期_dgv.Columns(0).ReadOnly = True : 日期_dgv.Columns(1).ReadOnly = True
+        日期_dgv.Columns(0).FillWeight = 45 : 日期_dgv.Columns(1).FillWeight = 55
+    End Sub
+    Private Sub 日期_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 日期_dgv.CellClick
+        If e.RowIndex = -1 Then : Else
+            人員_tb.Text = 日期_dgv(0, e.RowIndex).Value.ToString : 日期_tb.Text = 日期_dgv(1, e.RowIndex).Value.ToString
+            Set_清單2()
+        End If
+    End Sub
+    Private Sub Set_清單2()
+        Dim ds1 As New DataSet : 日期明細_dgv.DataSource = Nothing : ds1.Clear()
+        日期明細_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        日期明細_dgv.ColumnHeadersHeight = 25
+        日期明細_dgv.AllowUserToAddRows = False
+        日期明細_dgv.RowTemplate.Height = 35
+        日期明細_dgv.EditMode = DataGridViewEditMode.EditOnEnter
+
+        SQL_盤營盤損_日期清單明細(人員_tb.Text, 日期_tb.Text) : da.Fill(ds1) : 日期明細_dgv.DataSource = ds1.Tables(0) : conn.Close()
+        日期明細_dgv.Columns(0).ReadOnly = True : 日期明細_dgv.Columns(1).ReadOnly = True
+        日期明細_dgv.Columns(0).Visible = False : 日期明細_dgv.Columns(1).FillWeight = 50 : 日期明細_dgv.Columns(2).FillWeight = 80
+        日期明細_dgv.Columns(3).Visible = False : 日期明細_dgv.Columns(4).FillWeight = 150 : 日期明細_dgv.Columns(5).Visible = False
+        日期明細_dgv.Columns(6).FillWeight = 50 : 日期明細_dgv.Columns(7).FillWeight = 50 : 日期明細_dgv.Columns(8).FillWeight = 50
+        日期明細_dgv.Columns(9).FillWeight = 50 : 日期明細_dgv.Columns(10).FillWeight = 100
+        日期明細_dgv.Columns(1).ReadOnly = True : 日期明細_dgv.Columns(2).ReadOnly = True : 日期明細_dgv.Columns(4).ReadOnly = True
+        日期明細_dgv.Columns(5).ReadOnly = True : 日期明細_dgv.Columns(6).ReadOnly = True : 日期明細_dgv.Columns(7).ReadOnly = True
+        日期明細_dgv.Columns(8).ReadOnly = True : 日期明細_dgv.Columns(9).ReadOnly = True : 日期明細_dgv.Columns(10).ReadOnly = True
+        日期明細_dgv.Columns(6).DefaultCellStyle.Format = "#,##0"
+        日期明細_dgv.Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        日期明細_dgv.Columns(6).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        日期明細_dgv.Columns(7).DefaultCellStyle.Format = "#,##0"
+        日期明細_dgv.Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        日期明細_dgv.Columns(7).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        日期明細_dgv.Columns(8).DefaultCellStyle.Format = "#,##0"
+        日期明細_dgv.Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        日期明細_dgv.Columns(8).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        日期明細_dgv.Columns(9).DefaultCellStyle.Format = "#,##0"
+        日期明細_dgv.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        日期明細_dgv.Columns(9).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+    End Sub
     Private Sub 客戶搜尋_bt_Click(sender As Object, e As EventArgs) Handles 客戶搜尋_bt.Click
         Set_清單()
     End Sub
@@ -86,13 +134,14 @@
                 倉庫級別 = dr("倉級") : 倉庫編號 = dr("倉名編號")
             End If : conn.Close()
             For I As Integer = 0 To 明細表_dgv.Rows.Count - 1
-                Dim 數量 As Double = 明細表_dgv.Rows(I).Cells("庫存量").Value
-                Dim 數量1 As Double = 明細表1_dgv.Rows(I).Cells("庫存量").Value
-                Dim 料號 As String = 明細表1_dgv.Rows(I).Cells("物料料號").Value
+                Dim 盤點量 As Double = 明細表_dgv.Rows(I).Cells("庫存量").Value
+                Dim 庫存量 As Double = 明細表1_dgv.Rows(I).Cells("庫存量").Value
+                Dim 料號 As String = 明細表_dgv.Rows(I).Cells("物料料號").Value
+                Dim 備註 As String = 明細表_dgv.Rows(I).Cells("備註").Value
                 Dim 差 As Double = 0
-                If (數量 <> 數量1) Then
-                    If (數量 > 數量1) Then
-                        差 = 數量 - 數量1
+                If (盤點量 <> 庫存量) Then
+                    If (盤點量 > 庫存量) Then
+                        差 = 盤點量 - 庫存量
                         SQL_倉儲明細表_最後一筆資料()
                         If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
                         conn.Close()
@@ -106,10 +155,10 @@
                         ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
                         ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
                         ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
-                        SQL_料驗收與指定入庫_倉儲明細表_新增(ESTR, "", 倉庫級別, 倉庫編號, 料號, 差, "0", "", "盤營入庫", "") : conn.Close()
-
+                        SQL_料驗收與指定入庫_倉儲明細表_新增(ESTR, "", 倉庫級別, 倉庫編號, 料號, 差, "0", 備註, "盤營入庫", "") : conn.Close()
+                        SQL_盤營盤損_倉儲明細表(ESTR, 庫存量, 盤點量) : conn.Close()
                     Else
-                        差 = 數量1 - 數量
+                        差 = 庫存量 - 盤點量
                         SQL_倉儲明細表_最後一筆資料()
                         If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
                         conn.Close()
@@ -123,11 +172,12 @@
                         ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
                         ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
                         ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
-                        SQL_料驗收與指定入庫_倉儲明細表_新增(ESTR, "", 倉庫級別, 倉庫編號, 料號, "0", 差, "", "盤損出庫", "") : conn.Close()
+                        SQL_料驗收與指定入庫_倉儲明細表_新增(ESTR, "", 倉庫級別, 倉庫編號, 料號, "0", 差, 備註, "盤損出庫", "") : conn.Close()
+                        SQL_盤營盤損_倉儲明細表(ESTR, 庫存量, 盤點量) : conn.Close()
                     End If
                 End If
             Next
-            Set_清單()
+            Set_清單() : Set_清單1() : 日期明細_dgv.DataSource = Nothing : 人員_tb.Text = "" : 日期_tb.Text = ""
         End If
     End Sub
 End Class

OW-ERP-SYS/03、倉儲管理系統/退貨單審核.Designer.vb

@@ -312,6 +312,7 @@ Partial Class 退貨單審核
         Me.項次_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.項次_tb.Location = New System.Drawing.Point(1113, 54)
         Me.項次_tb.Name = "項次_tb"
+        Me.項次_tb.ReadOnly = True
         Me.項次_tb.Size = New System.Drawing.Size(50, 23)
         Me.項次_tb.TabIndex = 1987
         '

OW-ERP-SYS/03、倉儲管理系統/退貨申請單.Designer.vb

@@ -23,18 +23,18 @@ Partial Class 退貨申請單
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.Panel3 = New System.Windows.Forms.Panel()
@@ -119,9 +119,9 @@ Partial Class 退貨申請單
         Me.TabControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.TabControl1.Appearance = System.Windows.Forms.TabAppearance.Buttons
-        Me.TabControl1.Controls.Add(Me.TabPage1)
         Me.TabControl1.Controls.Add(Me.TabPage3)
         Me.TabControl1.Controls.Add(Me.TabPage2)
+        Me.TabControl1.Controls.Add(Me.TabPage1)
         Me.TabControl1.Location = New System.Drawing.Point(1, 2)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
@@ -292,8 +292,8 @@ Partial Class 退貨申請單
         '
         '物料清單_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.物料清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.物料清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
         Me.物料清單_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -304,9 +304,9 @@ Partial Class 退貨申請單
         Me.物料清單_dgv.Location = New System.Drawing.Point(0, -1)
         Me.物料清單_dgv.Name = "物料清單_dgv"
         Me.物料清單_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.物料清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle22.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.物料清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle22
         Me.物料清單_dgv.RowTemplate.Height = 24
         Me.物料清單_dgv.Size = New System.Drawing.Size(389, 544)
         Me.物料清單_dgv.TabIndex = 680
@@ -379,8 +379,8 @@ Partial Class 退貨申請單
         '
         '作廢清單_dgv
         '
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.作廢清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.作廢清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
         Me.作廢清單_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -391,16 +391,16 @@ Partial Class 退貨申請單
         Me.作廢清單_dgv.Location = New System.Drawing.Point(2, 28)
         Me.作廢清單_dgv.Name = "作廢清單_dgv"
         Me.作廢清單_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.作廢清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.作廢清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle14
         Me.作廢清單_dgv.RowTemplate.Height = 24
         Me.作廢清單_dgv.Size = New System.Drawing.Size(385, 612)
         Me.作廢清單_dgv.TabIndex = 1022
         '
         '未核准_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.未核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.未核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15
         Me.未核准_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -411,16 +411,16 @@ Partial Class 退貨申請單
         Me.未核准_dgv.Location = New System.Drawing.Point(2, 28)
         Me.未核准_dgv.Name = "未核准_dgv"
         Me.未核准_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.未核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.未核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle16
         Me.未核准_dgv.RowTemplate.Height = 24
         Me.未核准_dgv.Size = New System.Drawing.Size(385, 612)
         Me.未核准_dgv.TabIndex = 1026
         '
         '已核准_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.已核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.已核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
         Me.已核准_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -431,8 +431,8 @@ Partial Class 退貨申請單
         Me.已核准_dgv.Location = New System.Drawing.Point(2, 28)
         Me.已核准_dgv.Name = "已核准_dgv"
         Me.已核准_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.已核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.已核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle18
         Me.已核准_dgv.RowTemplate.Height = 24
         Me.已核准_dgv.Size = New System.Drawing.Size(385, 612)
         Me.已核准_dgv.TabIndex = 1018
@@ -581,8 +581,8 @@ Partial Class 退貨申請單
         '
         '客戶清單_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.客戶清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.客戶清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
         Me.客戶清單_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -593,9 +593,9 @@ Partial Class 退貨申請單
         Me.客戶清單_dgv.Location = New System.Drawing.Point(0, -1)
         Me.客戶清單_dgv.Name = "客戶清單_dgv"
         Me.客戶清單_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.客戶清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle20.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.客戶清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle20
         Me.客戶清單_dgv.RowTemplate.Height = 24
         Me.客戶清單_dgv.Size = New System.Drawing.Size(385, 516)
         Me.客戶清單_dgv.TabIndex = 680
@@ -615,8 +615,8 @@ Partial Class 退貨申請單
         '
         '退貨明細_dgv
         '
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.退貨明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.退貨明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
         Me.退貨明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -627,9 +627,9 @@ Partial Class 退貨申請單
         Me.退貨明細_dgv.Location = New System.Drawing.Point(401, 82)
         Me.退貨明細_dgv.Name = "退貨明細_dgv"
         Me.退貨明細_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.退貨明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle24.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.退貨明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle24
         Me.退貨明細_dgv.RowTemplate.Height = 24
         Me.退貨明細_dgv.Size = New System.Drawing.Size(929, 594)
         Me.退貨明細_dgv.TabIndex = 1975
@@ -738,6 +738,7 @@ Partial Class 退貨申請單
         Me.項次_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.項次_tb.Location = New System.Drawing.Point(1117, 53)
         Me.項次_tb.Name = "項次_tb"
+        Me.項次_tb.ReadOnly = True
         Me.項次_tb.Size = New System.Drawing.Size(50, 23)
         Me.項次_tb.TabIndex = 1967
         '

OW-ERP-SYS/03、倉儲管理系統/退貨申請單.vb

@@ -145,7 +145,7 @@ Public Class 退貨申請單
     End Sub
     Private Sub 物料清單_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 物料清單_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            料號_tb.Text = 物料清單_dgv(1, e.RowIndex).Value.ToString
+            料號_tb.Text = 物料清單_dgv(4, e.RowIndex).Value.ToString
             品名_tb.Text = 物料清單_dgv(2, e.RowIndex).Value.ToString
             NUM2 = e.RowIndex
         End If

OW-ERP-SYS/03、倉儲管理系統/退貨處理單.vb

@@ -902,6 +902,6 @@ Public Class 退貨處理單
         ToolTip1.SetToolTip(Me.存檔_bt, "存檔")
     End Sub
     Private Sub 處理完成_bt_MouseEnter(sender As Object, e As EventArgs) Handles 處理完成_bt.MouseEnter
-        ToolTip1.SetToolTip(Me.處理完成_bt, "退貨處理")
+        ToolTip1.SetToolTip(Me.處理完成_bt, "執行退貨處理入庫")
     End Sub
 End Class

OW-ERP-SYS/03、倉儲管理系統/送貨單審核.Designer.vb

@@ -23,14 +23,14 @@ Partial Class 送貨單審核
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.訂購明細_dgv = New System.Windows.Forms.DataGridView()
@@ -77,6 +77,7 @@ Partial Class 送貨單審核
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.指定倉庫_cb = New System.Windows.Forms.ComboBox()
         Me.Label12 = New System.Windows.Forms.Label()
+        Me.已出貨_ch = New System.Windows.Forms.CheckBox()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
         CType(Me.訂購明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -110,7 +111,6 @@ Partial Class 送貨單審核
         Me.Panel2.Controls.Add(Me.電話1_tb)
         Me.Panel2.Controls.Add(Me.項次_lb)
         Me.Panel2.Controls.Add(Me.地址1_tb)
-        Me.Panel2.Controls.Add(Me.已簽收_ch)
         Me.Panel2.Controls.Add(Me.項次_tb)
         Me.Panel2.Location = New System.Drawing.Point(41, 197)
         Me.Panel2.Name = "Panel2"
@@ -120,8 +120,8 @@ Partial Class 送貨單審核
         '
         '訂購明細_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.訂購明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.訂購明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25
         Me.訂購明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -132,9 +132,9 @@ Partial Class 送貨單審核
         Me.訂購明細_dgv.Location = New System.Drawing.Point(19, 177)
         Me.訂購明細_dgv.Name = "訂購明細_dgv"
         Me.訂購明細_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.訂購明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle26.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.訂購明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle26
         Me.訂購明細_dgv.RowTemplate.Height = 24
         Me.訂購明細_dgv.Size = New System.Drawing.Size(103, 70)
         Me.訂購明細_dgv.TabIndex = 2221
@@ -215,7 +215,7 @@ Partial Class 送貨單審核
         Me.已簽收_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.已簽收_ch.AutoSize = True
         Me.已簽收_ch.Enabled = False
-        Me.已簽收_ch.Location = New System.Drawing.Point(221, 254)
+        Me.已簽收_ch.Location = New System.Drawing.Point(1253, 81)
         Me.已簽收_ch.Name = "已簽收_ch"
         Me.已簽收_ch.Size = New System.Drawing.Size(62, 20)
         Me.已簽收_ch.TabIndex = 2209
@@ -256,8 +256,8 @@ Partial Class 送貨單審核
         '
         '已核准_dgv
         '
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.已核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.已核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27
         Me.已核准_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -268,16 +268,16 @@ Partial Class 送貨單審核
         Me.已核准_dgv.Location = New System.Drawing.Point(0, 30)
         Me.已核准_dgv.Name = "已核准_dgv"
         Me.已核准_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.已核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle28.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.已核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle28
         Me.已核准_dgv.RowTemplate.Height = 24
         Me.已核准_dgv.Size = New System.Drawing.Size(385, 641)
         Me.已核准_dgv.TabIndex = 1027
         '
         '未核准_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.未核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.未核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29
         Me.未核准_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -288,8 +288,8 @@ Partial Class 送貨單審核
         Me.未核准_dgv.Location = New System.Drawing.Point(0, 30)
         Me.未核准_dgv.Name = "未核准_dgv"
         Me.未核准_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.未核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle30.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.未核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle30
         Me.未核准_dgv.RowTemplate.Height = 24
         Me.未核准_dgv.Size = New System.Drawing.Size(385, 641)
         Me.未核准_dgv.TabIndex = 1032
@@ -309,8 +309,8 @@ Partial Class 送貨單審核
         '
         '送貨明細_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.送貨明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.送貨明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31
         Me.送貨明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -321,9 +321,9 @@ Partial Class 送貨單審核
         Me.送貨明細_dgv.Location = New System.Drawing.Point(398, 106)
         Me.送貨明細_dgv.Name = "送貨明細_dgv"
         Me.送貨明細_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.送貨明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle32.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.送貨明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle32
         Me.送貨明細_dgv.RowTemplate.Height = 24
         Me.送貨明細_dgv.Size = New System.Drawing.Size(927, 572)
         Me.送貨明細_dgv.TabIndex = 2244
@@ -407,7 +407,7 @@ Partial Class 送貨單審核
         Me.備註_tb.Location = New System.Drawing.Point(947, 53)
         Me.備註_tb.Multiline = True
         Me.備註_tb.Name = "備註_tb"
-        Me.備註_tb.Size = New System.Drawing.Size(378, 48)
+        Me.備註_tb.Size = New System.Drawing.Size(300, 48)
         Me.備註_tb.TabIndex = 2238
         '
         '申請日期_lb
@@ -417,7 +417,7 @@ Partial Class 送貨單審核
         Me.申請日期_lb.Name = "申請日期_lb"
         Me.申請日期_lb.Size = New System.Drawing.Size(55, 16)
         Me.申請日期_lb.TabIndex = 2236
-        Me.申請日期_lb.Text = "申請日期"
+        Me.申請日期_lb.Text = "送貨日期"
         '
         '填表日期_dtp
         '
@@ -582,11 +582,24 @@ Partial Class 送貨單審核
         Me.Label12.Text = "出庫庫別"
         Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
+        '已出貨_ch
+        '
+        Me.已出貨_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.已出貨_ch.AutoSize = True
+        Me.已出貨_ch.Enabled = False
+        Me.已出貨_ch.Location = New System.Drawing.Point(1253, 55)
+        Me.已出貨_ch.Name = "已出貨_ch"
+        Me.已出貨_ch.Size = New System.Drawing.Size(62, 20)
+        Me.已出貨_ch.TabIndex = 2250
+        Me.已出貨_ch.Text = "已出貨"
+        Me.已出貨_ch.UseVisualStyleBackColor = True
+        '
         '送貨單審核
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1334, 681)
+        Me.Controls.Add(Me.已出貨_ch)
         Me.Controls.Add(Me.指定倉庫_cb)
         Me.Controls.Add(Me.Label12)
         Me.Controls.Add(Me.車號_cb)
@@ -596,6 +609,7 @@ Partial Class 送貨單審核
         Me.Controls.Add(Me.小間距_ch)
         Me.Controls.Add(Me.大間距_ch)
         Me.Controls.Add(Me.中間距_ch)
+        Me.Controls.Add(Me.已簽收_ch)
         Me.Controls.Add(Me.Label8)
         Me.Controls.Add(Me.送貨單號_tb)
         Me.Controls.Add(Me.儲存_bt)
@@ -679,4 +693,5 @@ Partial Class 送貨單審核
     Friend WithEvents ToolTip1 As ToolTip
     Friend WithEvents 指定倉庫_cb As ComboBox
     Friend WithEvents Label12 As Label
+    Friend WithEvents 已出貨_ch As CheckBox
 End Class

OW-ERP-SYS/03、倉儲管理系統/送貨單審核.vb

@@ -1,5 +1,5 @@
 Public Class 送貨單審核
-    Dim EDR As Integer = 0 : Dim ESTR As String
+
     Private Sub 送貨單審核_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = OW_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
         儲存_bt.Enabled = False : 簽收_bt.Enabled = False
@@ -36,7 +36,7 @@
         未核准_dgv.ColumnHeadersHeight = 40 : 未核准_dgv.AllowUserToAddRows = False
         SQL_送貨單控制表_未審核()
         da.Fill(ds6) : 未核准_dgv.DataSource = ds6.Tables(0) : conn.Close()
-        For i As Integer = 0 To 14
+        For i As Integer = 0 To 16
             If i = 0 Then
                 未核准_dgv.Columns(i).FillWeight = 50 : 未核准_dgv.Columns(i).ReadOnly = True
             ElseIf i = 5 Then
@@ -54,7 +54,7 @@
         已核准_dgv.ColumnHeadersHeight = 40 : 已核准_dgv.AllowUserToAddRows = False
         SQL_送貨單控制表_已審核()
         da.Fill(ds6) : 已核准_dgv.DataSource = ds6.Tables(0) : conn.Close()
-        For i As Integer = 0 To 14
+        For i As Integer = 0 To 16
             If i = 0 Then
                 已核准_dgv.Columns(i).FillWeight = 50 : 已核准_dgv.Columns(i).ReadOnly = True
             ElseIf i = 5 Then
@@ -115,9 +115,9 @@
             客編_tb.Text = 未核准_dgv(4, e.RowIndex).Value.ToString : 客名_tb.Text = 未核准_dgv(5, e.RowIndex).Value.ToString
             地址_tb.Text = 未核准_dgv(6, e.RowIndex).Value.ToString : 電話_tb.Text = 未核准_dgv(7, e.RowIndex).Value.ToString
             備註_tb.Text = 未核准_dgv(8, e.RowIndex).Value.ToString : 已簽收_ch.Checked = 未核准_dgv(13, e.RowIndex).Value
-            指定倉庫_cb.Text = 未核准_dgv(14, e.RowIndex).Value.ToString
-            If Not String.IsNullOrEmpty(未核准_dgv(10, e.RowIndex).Value.ToString()) Then
-                填表日期_dtp.Value = Convert.ToDateTime(未核准_dgv(10, e.RowIndex).Value.ToString())
+            指定倉庫_cb.Text = 未核准_dgv(14, e.RowIndex).Value.ToString : 已出貨_ch.Checked = 未核准_dgv(15, e.RowIndex).Value
+            If Not String.IsNullOrEmpty(未核准_dgv(16, e.RowIndex).Value.ToString()) Then
+                填表日期_dtp.Value = Convert.ToDateTime(未核准_dgv(16, e.RowIndex).Value.ToString())
             End If
             Set_清單5()
         End If
@@ -129,9 +129,9 @@
             客編_tb.Text = 已核准_dgv(4, e.RowIndex).Value.ToString : 客名_tb.Text = 已核准_dgv(5, e.RowIndex).Value.ToString
             地址_tb.Text = 已核准_dgv(6, e.RowIndex).Value.ToString : 電話_tb.Text = 已核准_dgv(7, e.RowIndex).Value.ToString
             備註_tb.Text = 已核准_dgv(8, e.RowIndex).Value.ToString : 已簽收_ch.Checked = 已核准_dgv(13, e.RowIndex).Value
-            指定倉庫_cb.Text = 未核准_dgv(14, e.RowIndex).Value.ToString
-            If Not String.IsNullOrEmpty(已核准_dgv(10, e.RowIndex).Value.ToString()) Then
-                填表日期_dtp.Value = Convert.ToDateTime(已核准_dgv(10, e.RowIndex).Value.ToString())
+            指定倉庫_cb.Text = 已核准_dgv(14, e.RowIndex).Value.ToString : 已出貨_ch.Checked = 已核准_dgv(15, e.RowIndex).Value
+            If Not String.IsNullOrEmpty(已核准_dgv(16, e.RowIndex).Value.ToString()) Then
+                填表日期_dtp.Value = Convert.ToDateTime(已核准_dgv(16, e.RowIndex).Value.ToString())
             End If
             Set_清單5()
         End If
@@ -160,53 +160,27 @@
             Dim 日期 As String = 送貨明細_dgv.Rows(i).Cells("有效日期").Value
             SQL_送貨單明細表_存檔(送貨單號_tb.Text, 項次, 規格, 數量, 單位, 批號, 日期) : conn.Close()
         Next
-        SQL_送貨單控制表_修改(送貨單號_tb.Text, 訂購單號_tb.Text, 客編_tb.Text, 地址_tb.Text, 電話_tb.Text, 備註_tb.Text, 物流_tb.Text, 車號_cb.Text, 指定倉庫_cb.Text)
+        SQL_送貨單控制表_修改(送貨單號_tb.Text, 訂購單號_tb.Text, 客編_tb.Text, 地址_tb.Text, 電話_tb.Text, 備註_tb.Text, 物流_tb.Text, 車號_cb.Text, 指定倉庫_cb.Text, 填表日期_dtp.Value.ToString("yyyy/MM/dd"))
     End Sub
 
     Private Sub 簽收_bt_Click(sender As Object, e As EventArgs) Handles 簽收_bt.Click
         Set_日期格式轉換()
         If 訂購單號_tb.Text = "" Then : MsgBox("沒有選擇單據。") : Else
-            存檔()
-            SQL_送貨單核准_核准(送貨單號_tb.Text, gUserName) : conn.Close()
-
-
-            SQL_指定倉儲_資料讀取(指定倉庫_cb.Text)
-            Dim 倉庫級別 As String = ""
-            Dim 倉庫編號 As String = ""
-            If dr.Read() Then
-                倉庫級別 = dr("倉級") : 倉庫編號 = dr("倉名編號")
-            End If : conn.Close()
-
-            For I As Integer = 0 To 送貨明細_dgv.Rows.Count - 1
-                SQL_倉儲明細表_最後一筆資料()
-                If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
-                conn.Close()
-                EDR += 1
-                If EDR < 10 Then : ESTR = "WH" & "00000000" & EDR
-                ElseIf EDR > 9 And EDR < 100 Then : ESTR = "WH" & "0000000" & EDR
-                ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "WH" & "000000" & EDR
-                ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "WH" & "00000" & EDR
-                ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "WH" & "0000" & EDR
-                ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "WH" & "000" & EDR
-                ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
-                ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
-                ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
-                Dim 數量 As String = 送貨明細_dgv.Rows(I).Cells("數量").Value
-                Dim 料號 As String = 送貨明細_dgv.Rows(I).Cells("料號").Value
-                Dim 批號 As String = 送貨明細_dgv.Rows(I).Cells("生產批號").Value
-                SQL_料驗收與指定入庫_倉儲明細表_新增(ESTR, 送貨單號_tb.Text, 倉庫級別, 倉庫編號, 料號, "0", 數量, "", "送貨出庫", 批號) : conn.Close()
-            Next
-            MsgBox("單據 [" & 送貨單號_tb.Text & "] 核准完成。")
-            送貨明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 客編_tb.Text = ""
-            地址_tb.Text = "" : 電話_tb.Text = "" : 備註_tb.Text = "" : 送貨單號_tb.Text = "" : 指定倉庫_cb.Text = ""
-            物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False
-            Set_清單5() : Set_清單1() : Set_清單2()
+            If 已出貨_ch.Checked = False Then : MsgBox("未出貨的單據無法審核") : Else
+                存檔()
+                SQL_送貨單核准_核准(送貨單號_tb.Text, gUserName) : conn.Close()
+                MsgBox("單據 [" & 送貨單號_tb.Text & "] 核准完成。")
+                送貨明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 客編_tb.Text = ""
+                地址_tb.Text = "" : 電話_tb.Text = "" : 備註_tb.Text = "" : 送貨單號_tb.Text = "" : 指定倉庫_cb.Text = ""
+                物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False
+                Set_清單5() : Set_清單1() : Set_清單2()
+            End If
         End If
     End Sub
     Private Sub 儲存_bt_MouseEnter(sender As Object, e As EventArgs) Handles 儲存_bt.MouseEnter
         ToolTip1.SetToolTip(Me.儲存_bt, "儲存")
     End Sub
     Private Sub 簽收_bt_MouseEnter(sender As Object, e As EventArgs) Handles 簽收_bt.MouseEnter
-        ToolTip1.SetToolTip(Me.簽收_bt, "確認審核審核")
+        ToolTip1.SetToolTip(Me.簽收_bt, "核准")
     End Sub
 End Class

OW-ERP-SYS/03、倉儲管理系統/送貨單申請.Designer.vb

@@ -33,8 +33,6 @@ Partial Class 送貨單申請
         Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.Panel3 = New System.Windows.Forms.Panel()
@@ -51,20 +49,20 @@ Partial Class 送貨單申請
         Me.電話1_tb = New System.Windows.Forms.TextBox()
         Me.項次_lb = New System.Windows.Forms.Label()
         Me.地址1_tb = New System.Windows.Forms.TextBox()
-        Me.已簽收_ch = New System.Windows.Forms.CheckBox()
         Me.項次_tb = New System.Windows.Forms.TextBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.客編1_tb = New System.Windows.Forms.TextBox()
         Me.訂單清單_dgv = New System.Windows.Forms.DataGridView()
         Me.Label2 = New System.Windows.Forms.Label()
+        Me.訂單加入_bt = New System.Windows.Forms.Button()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
         Me.單據_p = New System.Windows.Forms.Panel()
-        Me.已審已收_rb = New System.Windows.Forms.RadioButton()
         Me.未審核_rb = New System.Windows.Forms.RadioButton()
-        Me.已審未收_rb = New System.Windows.Forms.RadioButton()
-        Me.已審已收_dgv = New System.Windows.Forms.DataGridView()
+        Me.已審核_rb = New System.Windows.Forms.RadioButton()
         Me.未核准_dgv = New System.Windows.Forms.DataGridView()
-        Me.已審未收_dgv = New System.Windows.Forms.DataGridView()
+        Me.已審核_dgv = New System.Windows.Forms.DataGridView()
+        Me.重新整理_bt = New System.Windows.Forms.Button()
+        Me.已簽收_ch = New System.Windows.Forms.CheckBox()
         Me.客名_tb = New System.Windows.Forms.TextBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.客編_tb = New System.Windows.Forms.TextBox()
@@ -96,8 +94,8 @@ Partial Class 送貨單申請
         Me.刪除_bt = New System.Windows.Forms.Button()
         Me.儲存_bt = New System.Windows.Forms.Button()
         Me.開立訂購單_bt = New System.Windows.Forms.Button()
-        Me.訂單加入_bt = New System.Windows.Forms.Button()
-        Me.重新整理_bt = New System.Windows.Forms.Button()
+        Me.出貨_bt = New System.Windows.Forms.Button()
+        Me.已出貨_ch = New System.Windows.Forms.CheckBox()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.Panel3.SuspendLayout()
@@ -106,9 +104,8 @@ Partial Class 送貨單申請
         CType(Me.訂單清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage3.SuspendLayout()
         Me.單據_p.SuspendLayout()
-        CType(Me.已審已收_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.未核准_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.已審未收_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.已審核_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.送貨明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -197,7 +194,6 @@ Partial Class 送貨單申請
         Me.Panel1.Controls.Add(Me.電話1_tb)
         Me.Panel1.Controls.Add(Me.項次_lb)
         Me.Panel1.Controls.Add(Me.地址1_tb)
-        Me.Panel1.Controls.Add(Me.已簽收_ch)
         Me.Panel1.Controls.Add(Me.項次_tb)
         Me.Panel1.Location = New System.Drawing.Point(34, 230)
         Me.Panel1.Name = "Panel1"
@@ -297,18 +293,6 @@ Partial Class 送貨單申請
         Me.地址1_tb.Size = New System.Drawing.Size(95, 23)
         Me.地址1_tb.TabIndex = 1981
         '
-        '已簽收_ch
-        '
-        Me.已簽收_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.已簽收_ch.AutoSize = True
-        Me.已簽收_ch.Enabled = False
-        Me.已簽收_ch.Location = New System.Drawing.Point(221, 254)
-        Me.已簽收_ch.Name = "已簽收_ch"
-        Me.已簽收_ch.Size = New System.Drawing.Size(62, 20)
-        Me.已簽收_ch.TabIndex = 2209
-        Me.已簽收_ch.Text = "已簽收"
-        Me.已簽收_ch.UseVisualStyleBackColor = True
-        '
         '項次_tb
         '
         Me.項次_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -367,6 +351,19 @@ Partial Class 送貨單申請
         Me.Label2.TabIndex = 1991
         Me.Label2.Text = "客戶編號"
         '
+        '訂單加入_bt
+        '
+        Me.訂單加入_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.訂單加入_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.add_blue_cercle
+        Me.訂單加入_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.訂單加入_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.訂單加入_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.訂單加入_bt.Location = New System.Drawing.Point(335, 8)
+        Me.訂單加入_bt.Name = "訂單加入_bt"
+        Me.訂單加入_bt.Size = New System.Drawing.Size(50, 50)
+        Me.訂單加入_bt.TabIndex = 1030
+        Me.訂單加入_bt.UseVisualStyleBackColor = True
+        '
         'TabPage3
         '
         Me.TabPage3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -385,30 +382,16 @@ Partial Class 送貨單申請
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.單據_p.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.單據_p.Controls.Add(Me.已審已收_rb)
         Me.單據_p.Controls.Add(Me.未審核_rb)
-        Me.單據_p.Controls.Add(Me.已審未收_rb)
-        Me.單據_p.Controls.Add(Me.已審已收_dgv)
+        Me.單據_p.Controls.Add(Me.已審核_rb)
         Me.單據_p.Controls.Add(Me.未核准_dgv)
-        Me.單據_p.Controls.Add(Me.已審未收_dgv)
+        Me.單據_p.Controls.Add(Me.已審核_dgv)
         Me.單據_p.Controls.Add(Me.重新整理_bt)
         Me.單據_p.Location = New System.Drawing.Point(0, -1)
         Me.單據_p.Name = "單據_p"
         Me.單據_p.Size = New System.Drawing.Size(390, 645)
         Me.單據_p.TabIndex = 5
         '
-        '已審已收_rb
-        '
-        Me.已審已收_rb.AutoSize = True
-        Me.已審已收_rb.ForeColor = System.Drawing.Color.Green
-        Me.已審已收_rb.Location = New System.Drawing.Point(223, 2)
-        Me.已審已收_rb.Name = "已審已收_rb"
-        Me.已審已收_rb.Size = New System.Drawing.Size(112, 20)
-        Me.已審已收_rb.TabIndex = 1951
-        Me.已審已收_rb.TabStop = True
-        Me.已審已收_rb.Text = "已 審 核 已 簽 收"
-        Me.已審已收_rb.UseVisualStyleBackColor = True
-        '
         '未審核_rb
         '
         Me.未審核_rb.AutoSize = True
@@ -421,42 +404,22 @@ Partial Class 送貨單申請
         Me.未審核_rb.Text = "未  審  核"
         Me.未審核_rb.UseVisualStyleBackColor = True
         '
-        '已審未收_rb
+        '已審核_rb
         '
-        Me.已審未收_rb.AutoSize = True
-        Me.已審未收_rb.ForeColor = System.Drawing.Color.Green
-        Me.已審未收_rb.Location = New System.Drawing.Point(95, 2)
-        Me.已審未收_rb.Name = "已審未收_rb"
-        Me.已審未收_rb.Size = New System.Drawing.Size(112, 20)
-        Me.已審未收_rb.TabIndex = 1024
-        Me.已審未收_rb.TabStop = True
-        Me.已審未收_rb.Text = "已 審 核 未 簽 收"
-        Me.已審未收_rb.UseVisualStyleBackColor = True
-        '
-        '已審已收_dgv
-        '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.已審已收_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
-        Me.已審已收_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.已審已收_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.已審已收_dgv.BackgroundColor = System.Drawing.Color.White
-        Me.已審已收_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.已審已收_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.已審已收_dgv.Location = New System.Drawing.Point(2, 28)
-        Me.已審已收_dgv.Name = "已審已收_dgv"
-        Me.已審已收_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.已審已收_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
-        Me.已審已收_dgv.RowTemplate.Height = 24
-        Me.已審已收_dgv.Size = New System.Drawing.Size(385, 612)
-        Me.已審已收_dgv.TabIndex = 1022
+        Me.已審核_rb.AutoSize = True
+        Me.已審核_rb.ForeColor = System.Drawing.Color.Green
+        Me.已審核_rb.Location = New System.Drawing.Point(141, 2)
+        Me.已審核_rb.Name = "已審核_rb"
+        Me.已審核_rb.Size = New System.Drawing.Size(67, 20)
+        Me.已審核_rb.TabIndex = 1024
+        Me.已審核_rb.TabStop = True
+        Me.已審核_rb.Text = "已 審 核"
+        Me.已審核_rb.UseVisualStyleBackColor = True
         '
         '未核准_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.未核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.未核准_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.未核准_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -467,31 +430,56 @@ Partial Class 送貨單申請
         Me.未核准_dgv.Location = New System.Drawing.Point(2, 28)
         Me.未核准_dgv.Name = "未核准_dgv"
         Me.未核准_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.未核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.未核准_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
         Me.未核准_dgv.RowTemplate.Height = 24
         Me.未核准_dgv.Size = New System.Drawing.Size(385, 612)
         Me.未核准_dgv.TabIndex = 1026
         '
-        '已審未收_dgv
+        '已審核_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.已審未收_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
-        Me.已審未收_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.已審核_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        Me.已審核_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.已審未收_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.已審未收_dgv.BackgroundColor = System.Drawing.Color.White
-        Me.已審未收_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.已審未收_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.已審未收_dgv.Location = New System.Drawing.Point(2, 28)
-        Me.已審未收_dgv.Name = "已審未收_dgv"
-        Me.已審未收_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.已審未收_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
-        Me.已審未收_dgv.RowTemplate.Height = 24
-        Me.已審未收_dgv.Size = New System.Drawing.Size(385, 612)
-        Me.已審未收_dgv.TabIndex = 1018
+        Me.已審核_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.已審核_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.已審核_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.已審核_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.已審核_dgv.Location = New System.Drawing.Point(2, 28)
+        Me.已審核_dgv.Name = "已審核_dgv"
+        Me.已審核_dgv.RowHeadersWidth = 5
+        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.已審核_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        Me.已審核_dgv.RowTemplate.Height = 24
+        Me.已審核_dgv.Size = New System.Drawing.Size(385, 612)
+        Me.已審核_dgv.TabIndex = 1018
+        '
+        '重新整理_bt
+        '
+        Me.重新整理_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.重新整理_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.renew
+        Me.重新整理_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.重新整理_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.重新整理_bt.ForeColor = System.Drawing.Color.Black
+        Me.重新整理_bt.Location = New System.Drawing.Point(359, 0)
+        Me.重新整理_bt.Name = "重新整理_bt"
+        Me.重新整理_bt.Size = New System.Drawing.Size(27, 27)
+        Me.重新整理_bt.TabIndex = 1950
+        Me.重新整理_bt.UseVisualStyleBackColor = True
+        '
+        '已簽收_ch
+        '
+        Me.已簽收_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.已簽收_ch.AutoSize = True
+        Me.已簽收_ch.Enabled = False
+        Me.已簽收_ch.Location = New System.Drawing.Point(1162, 105)
+        Me.已簽收_ch.Name = "已簽收_ch"
+        Me.已簽收_ch.Size = New System.Drawing.Size(62, 20)
+        Me.已簽收_ch.TabIndex = 2209
+        Me.已簽收_ch.Text = "已簽收"
+        Me.已簽收_ch.UseVisualStyleBackColor = True
         '
         '客名_tb
         '
@@ -626,16 +614,16 @@ Partial Class 送貨單申請
         Me.車號_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple
         Me.車號_cb.FormattingEnabled = True
         Me.車號_cb.Items.AddRange(New Object() {"2019"})
-        Me.車號_cb.Location = New System.Drawing.Point(956, 76)
+        Me.車號_cb.Location = New System.Drawing.Point(850, 76)
         Me.車號_cb.Name = "車號_cb"
-        Me.車號_cb.Size = New System.Drawing.Size(197, 24)
+        Me.車號_cb.Size = New System.Drawing.Size(131, 24)
         Me.車號_cb.TabIndex = 2032
         '
         'Label9
         '
         Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(895, 80)
+        Me.Label9.Location = New System.Drawing.Point(789, 80)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(55, 16)
         Me.Label9.TabIndex = 2031
@@ -645,17 +633,17 @@ Partial Class 送貨單申請
         '
         Me.申請日期_lb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.申請日期_lb.AutoSize = True
-        Me.申請日期_lb.Location = New System.Drawing.Point(1159, 80)
+        Me.申請日期_lb.Location = New System.Drawing.Point(986, 80)
         Me.申請日期_lb.Name = "申請日期_lb"
         Me.申請日期_lb.Size = New System.Drawing.Size(55, 16)
         Me.申請日期_lb.TabIndex = 2033
-        Me.申請日期_lb.Text = "申請日期"
+        Me.申請日期_lb.Text = "送貨日期"
         '
         '填表日期_dtp
         '
         Me.填表日期_dtp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.填表日期_dtp.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.填表日期_dtp.Location = New System.Drawing.Point(1220, 77)
+        Me.填表日期_dtp.Location = New System.Drawing.Point(1047, 76)
         Me.填表日期_dtp.Name = "填表日期_dtp"
         Me.填表日期_dtp.Size = New System.Drawing.Size(109, 23)
         Me.填表日期_dtp.TabIndex = 2034
@@ -676,14 +664,14 @@ Partial Class 送貨單申請
         Me.備註_tb.Location = New System.Drawing.Point(463, 77)
         Me.備註_tb.Multiline = True
         Me.備註_tb.Name = "備註_tb"
-        Me.備註_tb.Size = New System.Drawing.Size(427, 48)
+        Me.備註_tb.Size = New System.Drawing.Size(324, 48)
         Me.備註_tb.TabIndex = 2035
         '
         '小間距_ch
         '
         Me.小間距_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.小間距_ch.AutoSize = True
-        Me.小間距_ch.Location = New System.Drawing.Point(1187, 106)
+        Me.小間距_ch.Location = New System.Drawing.Point(1002, 105)
         Me.小間距_ch.Name = "小間距_ch"
         Me.小間距_ch.Size = New System.Drawing.Size(39, 20)
         Me.小間距_ch.TabIndex = 2217
@@ -694,7 +682,7 @@ Partial Class 送貨單申請
         '
         Me.大間距_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.大間距_ch.AutoSize = True
-        Me.大間距_ch.Location = New System.Drawing.Point(1272, 106)
+        Me.大間距_ch.Location = New System.Drawing.Point(1087, 105)
         Me.大間距_ch.Name = "大間距_ch"
         Me.大間距_ch.Size = New System.Drawing.Size(39, 20)
         Me.大間距_ch.TabIndex = 2219
@@ -707,7 +695,7 @@ Partial Class 送貨單申請
         Me.中間距_ch.AutoSize = True
         Me.中間距_ch.Checked = True
         Me.中間距_ch.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.中間距_ch.Location = New System.Drawing.Point(1229, 106)
+        Me.中間距_ch.Location = New System.Drawing.Point(1044, 105)
         Me.中間距_ch.Name = "中間距_ch"
         Me.中間距_ch.Size = New System.Drawing.Size(39, 20)
         Me.中間距_ch.TabIndex = 2218
@@ -716,8 +704,8 @@ Partial Class 送貨單申請
         '
         '送貨明細_dgv
         '
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.送貨明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.送貨明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
         Me.送貨明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -728,9 +716,9 @@ Partial Class 送貨單申請
         Me.送貨明細_dgv.Location = New System.Drawing.Point(403, 131)
         Me.送貨明細_dgv.Name = "送貨明細_dgv"
         Me.送貨明細_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.送貨明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle10.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.送貨明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
         Me.送貨明細_dgv.RowTemplate.Height = 24
         Me.送貨明細_dgv.Size = New System.Drawing.Size(929, 546)
         Me.送貨明細_dgv.TabIndex = 2220
@@ -749,16 +737,16 @@ Partial Class 送貨單申請
         Me.指定倉庫_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple
         Me.指定倉庫_cb.FormattingEnabled = True
         Me.指定倉庫_cb.Items.AddRange(New Object() {"2019"})
-        Me.指定倉庫_cb.Location = New System.Drawing.Point(956, 101)
+        Me.指定倉庫_cb.Location = New System.Drawing.Point(850, 101)
         Me.指定倉庫_cb.Name = "指定倉庫_cb"
-        Me.指定倉庫_cb.Size = New System.Drawing.Size(197, 24)
+        Me.指定倉庫_cb.Size = New System.Drawing.Size(131, 24)
         Me.指定倉庫_cb.TabIndex = 2222
         '
         'Label12
         '
         Me.Label12.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(895, 105)
+        Me.Label12.Location = New System.Drawing.Point(789, 105)
         Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(55, 16)
@@ -773,7 +761,7 @@ Partial Class 送貨單申請
         Me.簽收_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.簽收_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.簽收_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.簽收_bt.Location = New System.Drawing.Point(1231, 1)
+        Me.簽收_bt.Location = New System.Drawing.Point(1280, 77)
         Me.簽收_bt.Name = "簽收_bt"
         Me.簽收_bt.Size = New System.Drawing.Size(50, 50)
         Me.簽收_bt.TabIndex = 2221
@@ -786,7 +774,7 @@ Partial Class 送貨單申請
         Me.刪除_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.刪除_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除_bt.Location = New System.Drawing.Point(1281, 1)
+        Me.刪除_bt.Location = New System.Drawing.Point(1280, 1)
         Me.刪除_bt.Name = "刪除_bt"
         Me.刪除_bt.Size = New System.Drawing.Size(50, 50)
         Me.刪除_bt.TabIndex = 2212
@@ -799,7 +787,7 @@ Partial Class 送貨單申請
         Me.儲存_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.儲存_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.儲存_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.儲存_bt.Location = New System.Drawing.Point(1181, 1)
+        Me.儲存_bt.Location = New System.Drawing.Point(1230, 1)
         Me.儲存_bt.Name = "儲存_bt"
         Me.儲存_bt.Size = New System.Drawing.Size(50, 50)
         Me.儲存_bt.TabIndex = 2211
@@ -812,43 +800,44 @@ Partial Class 送貨單申請
         Me.開立訂購單_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.開立訂購單_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.開立訂購單_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.開立訂購單_bt.Location = New System.Drawing.Point(1131, 1)
+        Me.開立訂購單_bt.Location = New System.Drawing.Point(1180, 1)
         Me.開立訂購單_bt.Name = "開立訂購單_bt"
         Me.開立訂購單_bt.Size = New System.Drawing.Size(50, 50)
         Me.開立訂購單_bt.TabIndex = 2210
         Me.開立訂購單_bt.UseVisualStyleBackColor = True
         '
-        '訂單加入_bt
-        '
-        Me.訂單加入_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.訂單加入_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.add_blue_cercle
-        Me.訂單加入_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.訂單加入_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.訂單加入_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.訂單加入_bt.Location = New System.Drawing.Point(335, 8)
-        Me.訂單加入_bt.Name = "訂單加入_bt"
-        Me.訂單加入_bt.Size = New System.Drawing.Size(50, 50)
-        Me.訂單加入_bt.TabIndex = 1030
-        Me.訂單加入_bt.UseVisualStyleBackColor = True
-        '
-        '重新整理_bt
-        '
-        Me.重新整理_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.重新整理_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.renew
-        Me.重新整理_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.重新整理_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.重新整理_bt.ForeColor = System.Drawing.Color.Black
-        Me.重新整理_bt.Location = New System.Drawing.Point(359, 0)
-        Me.重新整理_bt.Name = "重新整理_bt"
-        Me.重新整理_bt.Size = New System.Drawing.Size(27, 27)
-        Me.重新整理_bt.TabIndex = 1950
-        Me.重新整理_bt.UseVisualStyleBackColor = True
+        '出貨_bt
+        '
+        Me.出貨_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.出貨_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Carton_01
+        Me.出貨_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.出貨_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.出貨_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.出貨_bt.Location = New System.Drawing.Point(1230, 77)
+        Me.出貨_bt.Name = "出貨_bt"
+        Me.出貨_bt.Size = New System.Drawing.Size(50, 50)
+        Me.出貨_bt.TabIndex = 2224
+        Me.出貨_bt.UseVisualStyleBackColor = True
+        '
+        '已出貨_ch
+        '
+        Me.已出貨_ch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.已出貨_ch.AutoSize = True
+        Me.已出貨_ch.Enabled = False
+        Me.已出貨_ch.Location = New System.Drawing.Point(1162, 80)
+        Me.已出貨_ch.Name = "已出貨_ch"
+        Me.已出貨_ch.Size = New System.Drawing.Size(62, 20)
+        Me.已出貨_ch.TabIndex = 2225
+        Me.已出貨_ch.Text = "已出貨"
+        Me.已出貨_ch.UseVisualStyleBackColor = True
         '
         '送貨單申請
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1334, 681)
+        Me.Controls.Add(Me.已出貨_ch)
+        Me.Controls.Add(Me.出貨_bt)
         Me.Controls.Add(Me.指定倉庫_cb)
         Me.Controls.Add(Me.Label12)
         Me.Controls.Add(Me.簽收_bt)
@@ -857,6 +846,7 @@ Partial Class 送貨單申請
         Me.Controls.Add(Me.大間距_ch)
         Me.Controls.Add(Me.中間距_ch)
         Me.Controls.Add(Me.Label8)
+        Me.Controls.Add(Me.已簽收_ch)
         Me.Controls.Add(Me.送貨單號_tb)
         Me.Controls.Add(Me.刪除_bt)
         Me.Controls.Add(Me.儲存_bt)
@@ -895,9 +885,8 @@ Partial Class 送貨單申請
         Me.TabPage3.ResumeLayout(False)
         Me.單據_p.ResumeLayout(False)
         Me.單據_p.PerformLayout()
-        CType(Me.已審已收_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.未核准_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.已審未收_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.已審核_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.送貨明細_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
@@ -916,12 +905,10 @@ Partial Class 送貨單申請
     Friend WithEvents TabPage3 As TabPage
     Friend WithEvents 單據_p As Panel
     Friend WithEvents 未審核_rb As RadioButton
-    Friend WithEvents 已審未收_rb As RadioButton
-    Friend WithEvents 已審已收_dgv As DataGridView
+    Friend WithEvents 已審核_rb As RadioButton
     Friend WithEvents 未核准_dgv As DataGridView
-    Friend WithEvents 已審未收_dgv As DataGridView
+    Friend WithEvents 已審核_dgv As DataGridView
     Friend WithEvents 重新整理_bt As Button
-    Friend WithEvents 已審已收_rb As RadioButton
     Friend WithEvents 訂購單號1_tb As TextBox
     Friend WithEvents 客名1_tb As TextBox
     Friend WithEvents 請購單號_lb As Label
@@ -967,4 +954,6 @@ Partial Class 送貨單申請
     Friend WithEvents ToolTip1 As ToolTip
     Friend WithEvents 指定倉庫_cb As ComboBox
     Friend WithEvents Label12 As Label
+    Friend WithEvents 出貨_bt As Button
+    Friend WithEvents 已出貨_ch As CheckBox
 End Class

OW-ERP-SYS/03、倉儲管理系統/送貨單申請.vb

@@ -3,12 +3,13 @@ Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 
 Public Class 送貨單申請
     Dim 訂單 As String
+    Dim EDR As Integer = 0 : Dim ESTR As String
     Private Sub 送貨單申請_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = OW_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
-        開立訂購單_bt.Enabled = True : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False : 訂單加入_bt.Enabled = False : 簽收_bt.Enabled = False
-        未核准_dgv.Visible = True : 已審未收_dgv.Visible = False : 已審已收_dgv.Visible = False
+        開立訂購單_bt.Enabled = True : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False : 訂單加入_bt.Enabled = False : 簽收_bt.Enabled = False : 出貨_bt.Enabled = False
+        未核准_dgv.Visible = True : 已審核_dgv.Visible = False
         小間距_ch.Checked = False : 中間距_ch.Checked = True : 大間距_ch.Checked = False : 未審核_rb.Checked = True
-        車號類別_cb_下拉表單資料載入() : 指定倉庫_cb_下拉表單資料載入() : Set_清單4() : Set_清單1() : Set_清單2() : Set_清單3()
+        車號類別_cb_下拉表單資料載入() : 指定倉庫_cb_下拉表單資料載入() : Set_清單4() : Set_清單1() : Set_清單2()
     End Sub
     Private Sub 車號_cb_Click(sender As Object, e As EventArgs) Handles 車號_cb.Click
         CB選擇清單(車號_cb, 車號_cb.Text)
@@ -39,7 +40,7 @@ Public Class 送貨單申請
         未核准_dgv.ColumnHeadersHeight = 40 : 未核准_dgv.AllowUserToAddRows = False
         SQL_送貨單控制表_未審核()
         da.Fill(ds6) : 未核准_dgv.DataSource = ds6.Tables(0) : conn.Close()
-        For i As Integer = 0 To 14
+        For i As Integer = 0 To 16
             If i = 0 Then
                 未核准_dgv.Columns(i).FillWeight = 50 : 未核准_dgv.Columns(i).ReadOnly = True
             ElseIf i = 5 Then
@@ -52,41 +53,24 @@ Public Class 送貨單申請
         Next
     End Sub
     Private Sub Set_清單2()
-        Dim ds6 As New DataSet : 已審未收_dgv.DataSource = Nothing : ds6.Clear()
-        已審未收_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        已審未收_dgv.ColumnHeadersHeight = 40 : 已審未收_dgv.AllowUserToAddRows = False
-        SQL_送貨單控制表_已審未收()
-        da.Fill(ds6) : 已審未收_dgv.DataSource = ds6.Tables(0) : conn.Close()
-        For i As Integer = 0 To 14
+        Dim ds6 As New DataSet : 已審核_dgv.DataSource = Nothing : ds6.Clear()
+        已審核_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        已審核_dgv.ColumnHeadersHeight = 40 : 已審核_dgv.AllowUserToAddRows = False
+        SQL_送貨單控制表_已審核()
+        da.Fill(ds6) : 已審核_dgv.DataSource = ds6.Tables(0) : conn.Close()
+        For i As Integer = 0 To 16
             If i = 0 Then
-                已審未收_dgv.Columns(i).FillWeight = 50 : 已審未收_dgv.Columns(i).ReadOnly = True
+                已審核_dgv.Columns(i).FillWeight = 50 : 已審核_dgv.Columns(i).ReadOnly = True
             ElseIf i = 5 Then
-                已審未收_dgv.Columns(i).FillWeight = 80 : 已審未收_dgv.Columns(i).ReadOnly = True
+                已審核_dgv.Columns(i).FillWeight = 80 : 已審核_dgv.Columns(i).ReadOnly = True
             ElseIf i = 9 Then
-                已審未收_dgv.Columns(i).FillWeight = 30 : 已審未收_dgv.Columns(i).ReadOnly = True
+                已審核_dgv.Columns(i).FillWeight = 30 : 已審核_dgv.Columns(i).ReadOnly = True
             Else
-                已審未收_dgv.Columns(i).Visible = False
-            End If
-        Next
-    End Sub
-    Private Sub Set_清單3()
-        Dim ds6 As New DataSet : 已審已收_dgv.DataSource = Nothing : ds6.Clear()
-        已審已收_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        已審已收_dgv.ColumnHeadersHeight = 40 : 已審已收_dgv.AllowUserToAddRows = False
-        SQL_送貨單控制表_已審已收()
-        da.Fill(ds6) : 已審已收_dgv.DataSource = ds6.Tables(0) : conn.Close()
-        For i As Integer = 0 To 14
-            If i = 0 Then
-                已審已收_dgv.Columns(i).FillWeight = 50 : 已審已收_dgv.Columns(i).ReadOnly = True
-            ElseIf i = 5 Then
-                已審已收_dgv.Columns(i).FillWeight = 80 : 已審已收_dgv.Columns(i).ReadOnly = True
-            ElseIf i = 9 Then
-                已審已收_dgv.Columns(i).FillWeight = 30 : 已審已收_dgv.Columns(i).ReadOnly = True
-            Else
-                已審已收_dgv.Columns(i).Visible = False
+                已審核_dgv.Columns(i).Visible = False
             End If
         Next
     End Sub
+
     Private Sub Set_清單4()
         Dim ds6 As New DataSet : 訂單清單_dgv.DataSource = Nothing : ds6.Clear()
         訂單清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -147,35 +131,24 @@ Public Class 送貨單申請
         If 未審核_rb.Checked = True Then
             送貨明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 客編_tb.Text = ""
             地址_tb.Text = "" : 電話_tb.Text = "" : 備註_tb.Text = "" : 送貨單號_tb.Text = "" : 指定倉庫_cb.Text = ""
-            物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False
-            開立訂購單_bt.Enabled = True : 刪除_bt.Enabled = True : 儲存_bt.Enabled = True : 訂單加入_bt.Enabled = True : 簽收_bt.Enabled = False
-            未核准_dgv.Visible = True : 已審未收_dgv.Visible = False : 已審已收_dgv.Visible = False
-            未審核_rb.Checked = True : 已審未收_rb.Checked = False : 已審已收_rb.Checked = False
+            物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False : 已出貨_ch.Checked = False
+            開立訂購單_bt.Enabled = True : 刪除_bt.Enabled = True : 儲存_bt.Enabled = True : 訂單加入_bt.Enabled = True : 簽收_bt.Enabled = False : 出貨_bt.Enabled = False
+            未核准_dgv.Visible = True : 已審核_dgv.Visible = False
+            未審核_rb.Checked = True : 已審核_rb.Checked = False
             Set_清單1()
         End If
     End Sub
-    Private Sub 已審未收_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 已審未收_rb.Click
-        If 已審未收_rb.Checked = True Then
+    Private Sub 已審核_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 已審核_rb.Click
+        If 已審核_rb.Checked = True Then
             送貨明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 客編_tb.Text = ""
             地址_tb.Text = "" : 電話_tb.Text = "" : 備註_tb.Text = "" : 送貨單號_tb.Text = "" : 指定倉庫_cb.Text = ""
-            物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False
-            開立訂購單_bt.Enabled = True : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False : 訂單加入_bt.Enabled = False : 簽收_bt.Enabled = True
-            未核准_dgv.Visible = False : 已審未收_dgv.Visible = True : 已審已收_dgv.Visible = False
-            未審核_rb.Checked = False : 已審未收_rb.Checked = True : 已審已收_rb.Checked = False
+            物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False : 已出貨_ch.Checked = False
+            開立訂購單_bt.Enabled = True : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False : 訂單加入_bt.Enabled = False : 簽收_bt.Enabled = False : 出貨_bt.Enabled = False
+            未核准_dgv.Visible = False : 已審核_dgv.Visible = True
+            未審核_rb.Checked = False : 已審核_rb.Checked = True
             Set_清單2()
         End If
     End Sub
-    Private Sub 已審已收_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 已審已收_rb.Click
-        If 已審已收_rb.Checked = True Then
-            送貨明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 客編_tb.Text = ""
-            地址_tb.Text = "" : 電話_tb.Text = "" : 備註_tb.Text = "" : 送貨單號_tb.Text = "" : 指定倉庫_cb.Text = ""
-            物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False
-            開立訂購單_bt.Enabled = True : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False : 訂單加入_bt.Enabled = False : 簽收_bt.Enabled = False
-            未核准_dgv.Visible = False : 已審未收_dgv.Visible = False : 已審已收_dgv.Visible = True
-            未審核_rb.Checked = False : 已審未收_rb.Checked = False : 已審已收_rb.Checked = True
-            Set_清單3()
-        End If
-    End Sub
 
     Private Sub 訂單清單_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 訂單清單_dgv.CellClick
         If e.RowIndex = -1 Then : Else
@@ -191,55 +164,74 @@ Public Class 送貨單申請
             客編_tb.Text = 未核准_dgv(4, e.RowIndex).Value.ToString : 客名_tb.Text = 未核准_dgv(5, e.RowIndex).Value.ToString
             地址_tb.Text = 未核准_dgv(6, e.RowIndex).Value.ToString : 電話_tb.Text = 未核准_dgv(7, e.RowIndex).Value.ToString
             備註_tb.Text = 未核准_dgv(8, e.RowIndex).Value.ToString : 已簽收_ch.Checked = 未核准_dgv(13, e.RowIndex).Value
-            指定倉庫_cb.Text = 未核准_dgv(14, e.RowIndex).Value.ToString
-            If Not String.IsNullOrEmpty(未核准_dgv(10, e.RowIndex).Value.ToString()) Then
-                填表日期_dtp.Value = Convert.ToDateTime(未核准_dgv(10, e.RowIndex).Value.ToString())
+            指定倉庫_cb.Text = 未核准_dgv(14, e.RowIndex).Value.ToString : 已出貨_ch.Checked = 未核准_dgv(15, e.RowIndex).Value
+            If Not String.IsNullOrEmpty(未核准_dgv(16, e.RowIndex).Value.ToString()) Then
+                填表日期_dtp.Value = Convert.ToDateTime(未核准_dgv(16, e.RowIndex).Value.ToString())
             End If
             訂單 = 未核准_dgv(1, e.RowIndex).Value.ToString
-            Set_清單5()
-        End If
-    End Sub
-    Private Sub 已審未收_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 已審未收_dgv.CellClick
-        If e.RowIndex = -1 Then : Else
-            送貨單號_tb.Text = 已審未收_dgv(0, e.RowIndex).Value.ToString : 訂購單號_tb.Text = 已審未收_dgv(1, e.RowIndex).Value.ToString
-            物流_tb.Text = 已審未收_dgv(2, e.RowIndex).Value.ToString : 車號_cb.Text = 已審未收_dgv(3, e.RowIndex).Value.ToString
-            客編_tb.Text = 已審未收_dgv(4, e.RowIndex).Value.ToString : 客名_tb.Text = 已審未收_dgv(5, e.RowIndex).Value.ToString
-            地址_tb.Text = 已審未收_dgv(6, e.RowIndex).Value.ToString : 電話_tb.Text = 已審未收_dgv(7, e.RowIndex).Value.ToString
-            備註_tb.Text = 已審未收_dgv(8, e.RowIndex).Value.ToString : 已簽收_ch.Checked = 已審未收_dgv(13, e.RowIndex).Value
-            指定倉庫_cb.Text = 未核准_dgv(14, e.RowIndex).Value.ToString
-            If Not String.IsNullOrEmpty(已審未收_dgv(10, e.RowIndex).Value.ToString()) Then
-                填表日期_dtp.Value = Convert.ToDateTime(已審未收_dgv(10, e.RowIndex).Value.ToString())
+            If 未核准_dgv(14, e.RowIndex).Value.ToString = "" Then
+                出貨_bt.Enabled = False
+                簽收_bt.Enabled = False
+            Else
+                If 已出貨_ch.Checked = True Then
+                    If 已簽收_ch.Checked = True Then
+                        簽收_bt.Enabled = False
+                    Else
+                        簽收_bt.Enabled = True
+                    End If
+                    出貨_bt.Enabled = False
+                Else
+                    簽收_bt.Enabled = False
+                    出貨_bt.Enabled = True
+                End If
             End If
             Set_清單5()
         End If
     End Sub
-    Private Sub 已審已收_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 已審已收_dgv.CellClick
+    Private Sub 已審核_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 已審核_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            送貨單號_tb.Text = 已審已收_dgv(0, e.RowIndex).Value.ToString : 訂購單號_tb.Text = 已審已收_dgv(1, e.RowIndex).Value.ToString
-            物流_tb.Text = 已審已收_dgv(2, e.RowIndex).Value.ToString : 車號_cb.Text = 已審已收_dgv(3, e.RowIndex).Value.ToString
-            客編_tb.Text = 已審已收_dgv(4, e.RowIndex).Value.ToString : 客名_tb.Text = 已審已收_dgv(5, e.RowIndex).Value.ToString
-            地址_tb.Text = 已審已收_dgv(6, e.RowIndex).Value.ToString : 電話_tb.Text = 已審已收_dgv(7, e.RowIndex).Value.ToString
-            備註_tb.Text = 已審已收_dgv(8, e.RowIndex).Value.ToString : 已簽收_ch.Checked = 已審已收_dgv(13, e.RowIndex).Value
-            指定倉庫_cb.Text = 未核准_dgv(14, e.RowIndex).Value.ToString
-            If Not String.IsNullOrEmpty(已審已收_dgv(10, e.RowIndex).Value.ToString()) Then
-                填表日期_dtp.Value = Convert.ToDateTime(已審已收_dgv(10, e.RowIndex).Value.ToString())
+            送貨單號_tb.Text = 已審核_dgv(0, e.RowIndex).Value.ToString : 訂購單號_tb.Text = 已審核_dgv(1, e.RowIndex).Value.ToString
+            物流_tb.Text = 已審核_dgv(2, e.RowIndex).Value.ToString : 車號_cb.Text = 已審核_dgv(3, e.RowIndex).Value.ToString
+            客編_tb.Text = 已審核_dgv(4, e.RowIndex).Value.ToString : 客名_tb.Text = 已審核_dgv(5, e.RowIndex).Value.ToString
+            地址_tb.Text = 已審核_dgv(6, e.RowIndex).Value.ToString : 電話_tb.Text = 已審核_dgv(7, e.RowIndex).Value.ToString
+            備註_tb.Text = 已審核_dgv(8, e.RowIndex).Value.ToString : 已簽收_ch.Checked = 已審核_dgv(13, e.RowIndex).Value
+            指定倉庫_cb.Text = 已審核_dgv(14, e.RowIndex).Value.ToString : 已出貨_ch.Checked = 已審核_dgv(15, e.RowIndex).Value
+            If Not String.IsNullOrEmpty(已審核_dgv(16, e.RowIndex).Value.ToString()) Then
+                填表日期_dtp.Value = Convert.ToDateTime(已審核_dgv(16, e.RowIndex).Value.ToString())
+            End If
+            If 已審核_dgv(14, e.RowIndex).Value.ToString = "" Then
+                出貨_bt.Enabled = False
+                簽收_bt.Enabled = False
+            Else
+                If 已出貨_ch.Checked = True Then
+                    If 已簽收_ch.Checked = True Then
+                        簽收_bt.Enabled = False
+                    Else
+                        簽收_bt.Enabled = True
+                    End If
+                    出貨_bt.Enabled = False
+                Else
+                    簽收_bt.Enabled = False
+                    出貨_bt.Enabled = True
+                End If
             End If
             Set_清單5()
         End If
     End Sub
+
     Private Sub 重新整理_bt_Click(sender As Object, e As EventArgs) Handles 重新整理_bt.Click
-        If 未審核_rb.Checked = True Then : Set_清單1() : ElseIf 已審未收_rb.Checked = True Then : Set_清單2() : ElseIf 已審已收_rb.Checked = True Then : Set_清單3() : End If
+        If 未審核_rb.Checked = True Then : Set_清單1() : ElseIf 已審核_rb.Checked = True Then : Set_清單2() : End If
     End Sub
     Private Sub Set_日期格式轉換()
         DTP = Format(Today(), "yyyy/MM/dd") : DTP1 = Format(Today(), "yyyyMMdd")
     End Sub
     Private Sub 開立訂購單_bt_Click(sender As Object, e As EventArgs) Handles 開立訂購單_bt.Click
-        刪除_bt.Enabled = True : 儲存_bt.Enabled = True : 訂單加入_bt.Enabled = True
+        刪除_bt.Enabled = True : 儲存_bt.Enabled = True : 訂單加入_bt.Enabled = True : 簽收_bt.Enabled = False : 出貨_bt.Enabled = False
         送貨明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 客編_tb.Text = ""
         地址_tb.Text = "" : 電話_tb.Text = "" : 備註_tb.Text = "" : 送貨單號_tb.Text = "" : 指定倉庫_cb.Text = ""
-        物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False
-        未核准_dgv.Visible = True : 已審未收_dgv.Visible = False : 已審已收_dgv.Visible = False
-        未審核_rb.Checked = True : 已審未收_rb.Checked = False : 已審已收_rb.Checked = False
+        物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False : 已出貨_ch.Checked = False
+        未核准_dgv.Visible = True : 已審核_dgv.Visible = False
+        未審核_rb.Checked = True : 已審核_rb.Checked = False
         Set_日期格式轉換() : Dim NUM1 As Integer
         訂單 = "" : 填表日期_dtp.Value = Format(Today(), "yyyy/MM/dd")
         For i As Integer = 1 To 999
@@ -255,7 +247,7 @@ Public Class 送貨單申請
     End Sub
 
     Private Sub 訂單加入_bt_Click(sender As Object, e As EventArgs) Handles 訂單加入_bt.Click
-        If 已審未收_rb.Checked = True Or 已審已收_rb.Checked = True Then : MsgBox("選擇的單據無法在編輯!!") : Else
+        If 已審核_rb.Checked = True Then : MsgBox("選擇的單據無法在編輯!!") : Else
             If 送貨單號_tb.Text = "" Then : MsgBox("沒有選擇送貨單據!!") : Else
                 If 訂購單號1_tb.Text = "" Then : MsgBox("沒有選擇訂購單據!!") : Else
                     If 訂購單號_tb.Text <> "" Then
@@ -289,27 +281,27 @@ Public Class 送貨單申請
     End Sub
 
     Private Sub 刪除_bt_Click(sender As Object, e As EventArgs) Handles 刪除_bt.Click
-        If 已審未收_rb.Checked = True Or 已審已收_rb.Checked = True Then : MsgBox("選擇的單據無法在編輯!!") : Else
+        If 已審核_rb.Checked = True Then : MsgBox("選擇的單據無法在編輯!!") : Else
             If 送貨單號_tb.Text = "" Then : MsgBox("沒有選擇單據!!") : Else
                 訊息回應 = InputBox("確定要刪除該筆資料? 請輸入大寫 [YES] 繼續執行下面的動作!!")
                 If 訊息回應 = "YES" Then
                     SQL_送貨單控制表_刪除(送貨單號_tb.Text) : SQL_送貨單明細表_刪除(送貨單號_tb.Text) : SQL_訂購單控制表_修改1(訂購單號_tb.Text, "0") : conn.Close()
                     送貨明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 客編_tb.Text = ""
                     地址_tb.Text = "" : 電話_tb.Text = "" : 備註_tb.Text = "" : 送貨單號_tb.Text = "" : 指定倉庫_cb.Text = ""
-                    物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False
+                    物流_tb.Text = "" : 車號_cb.Text = "" : 項次_tb.Text = "" : 已簽收_ch.Checked = False : 已出貨_ch.Checked = False
+                    簽收_bt.Enabled = False : 出貨_bt.Enabled = False : 已出貨_ch.Checked = False : 儲存_bt.Enabled = False
                     Set_清單1() : Set_清單4()
                 End If
             End If
         End If
     End Sub
     Private Sub 儲存_bt_Click(sender As Object, e As EventArgs) Handles 儲存_bt.Click
-        If 已審未收_rb.Checked = True Or 已審已收_rb.Checked = True Then : MsgBox("選擇的單據無法在編輯!!") : Else
+        If 已審核_rb.Checked = True Then : MsgBox("選擇的單據無法在編輯!!") : Else
             If 送貨單號_tb.Text = "" Then : MsgBox("沒有選擇送貨單據!!") : Else
                 If 訂購單號_tb.Text = "" Then : MsgBox("沒有選擇訂購單據!!") : Else
                     If 指定倉庫_cb.Text = "" Then : MsgBox("沒有選擇出庫庫別!!") : Else
-                        存檔() : MsgBox("儲存成功!!") : Set_清單5() : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4()
+                        存檔() : 出貨_bt.Enabled = True : MsgBox("儲存成功!!") : Set_清單5() : Set_清單1() : Set_清單2() : Set_清單4()
                     End If
-
                 End If
             End If
         End If
@@ -331,15 +323,64 @@ Public Class 送貨單申請
         Else
             SQL_訂購單控制表_修改1(訂購單號_tb.Text, "1")
         End If
-        SQL_送貨單控制表_修改(送貨單號_tb.Text, 訂購單號_tb.Text, 客編_tb.Text, 地址_tb.Text, 電話_tb.Text, 備註_tb.Text, 物流_tb.Text, 車號_cb.Text, 指定倉庫_cb.Text)
+
+        SQL_送貨單控制表_修改(送貨單號_tb.Text, 訂購單號_tb.Text, 客編_tb.Text, 地址_tb.Text, 電話_tb.Text, 備註_tb.Text, 物流_tb.Text, 車號_cb.Text, 指定倉庫_cb.Text, 填表日期_dtp.Value.ToString("yyyy/MM/dd"))
     End Sub
 
     Private Sub 簽收_bt_Click(sender As Object, e As EventArgs) Handles 簽收_bt.Click
-        If 未審核_rb.Checked = True Or 已審已收_rb.Checked = True Then : MsgBox("選擇的單據無法在編輯!!") : Else
-            If 送貨單號_tb.Text = "" Then : MsgBox("沒有選擇送貨單據!!") : Else
-                If 訂購單號_tb.Text = "" Then : MsgBox("沒有選擇訂購單據!!") : Else
-                    SQL_送貨單控制表_修改1(送貨單號_tb.Text, "1") : 已簽收_ch.Checked = True : MsgBox("簽收成功!!") : Set_清單1() : Set_清單2() : Set_清單3()
-                End If
+        If 送貨單號_tb.Text = "" Then : MsgBox("沒有選擇送貨單據!!") : Else
+            If 訂購單號_tb.Text = "" Then : MsgBox("沒有選擇訂購單據!!") : Else
+                SQL_送貨單控制表_修改1(送貨單號_tb.Text, "1") : 已簽收_ch.Checked = True : 簽收_bt.Enabled = False : MsgBox("簽收成功!!") : Set_清單1() : Set_清單2()
+            End If
+        End If
+    End Sub
+    Private Sub 出貨_bt_Click(sender As Object, e As EventArgs) Handles 出貨_bt.Click
+        If 送貨單號_tb.Text = "" Then : MsgBox("沒有選擇送貨單據!!") : Else
+            If 訂購單號_tb.Text = "" Then : MsgBox("沒有選擇訂購單據!!") : Else
+                SQL_指定倉儲_資料讀取(指定倉庫_cb.Text)
+                Dim 倉庫級別 As String = ""
+                Dim 倉庫編號 As String = ""
+                If dr.Read() Then
+                    倉庫級別 = dr("倉級") : 倉庫編號 = dr("倉名編號")
+                End If : conn.Close()
+
+                For I As Integer = 0 To 送貨明細_dgv.Rows.Count - 1
+                    Dim 物料編號 As String = 送貨明細_dgv.Rows(I).Cells("料號").Value.ToString().Trim()
+                    Dim 物品名稱 As String = 送貨明細_dgv.Rows(I).Cells("品名").Value.ToString()
+                    Dim 數量 As Double = 送貨明細_dgv.Rows(I).Cells("數量").Value
+                    Dim 庫存量 As Double = 0
+                    SQL_庫存餘額判斷(倉庫編號, 物料編號)
+                    If dr.Read() Then
+                        庫存量 = dr("庫存量")
+                        If 數量 > 庫存量 Then
+                            MGB(物品名稱 & "庫存量不足", 1)
+                            Return
+                        End If
+                    End If : conn.Close()
+                Next
+
+                For I As Integer = 0 To 送貨明細_dgv.Rows.Count - 1
+                    SQL_倉儲明細表_最後一筆資料()
+                    If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
+                    conn.Close()
+                    EDR += 1
+                    If EDR < 10 Then : ESTR = "WH" & "00000000" & EDR
+                    ElseIf EDR > 9 And EDR < 100 Then : ESTR = "WH" & "0000000" & EDR
+                    ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "WH" & "000000" & EDR
+                    ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "WH" & "00000" & EDR
+                    ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "WH" & "0000" & EDR
+                    ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "WH" & "000" & EDR
+                    ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
+                    ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
+                    ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
+                    Dim 數量 As String = 送貨明細_dgv.Rows(I).Cells("數量").Value
+                    Dim 料號 As String = 送貨明細_dgv.Rows(I).Cells("料號").Value
+                    Dim 批號 As String = 送貨明細_dgv.Rows(I).Cells("生產批號").Value
+                    SQL_料驗收與指定入庫_倉儲明細表_新增(ESTR, 送貨單號_tb.Text, 倉庫級別, 倉庫編號, 料號, "0", 數量, "", "送貨出庫", 批號) : conn.Close()
+                Next
+
+                SQL_送貨單控制表_修改2(送貨單號_tb.Text, "1") : 已出貨_ch.Checked = True : 出貨_bt.Enabled = False : 簽收_bt.Enabled = True
+                MsgBox("出貨成功!!") : Set_清單1() : Set_清單2()
             End If
         End If
     End Sub
@@ -361,10 +402,15 @@ Public Class 送貨單申請
     Private Sub 簽收_bt_MouseEnter(sender As Object, e As EventArgs) Handles 簽收_bt.MouseEnter
         ToolTip1.SetToolTip(Me.簽收_bt, "確認簽收")
     End Sub
+    Private Sub 出貨_bt_MouseEnter(sender As Object, e As EventArgs) Handles 出貨_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.出貨_bt, "確認出貨")
+    End Sub
     Private Sub 刪除_bt_MouseEnter(sender As Object, e As EventArgs) Handles 刪除_bt.MouseEnter
         ToolTip1.SetToolTip(Me.刪除_bt, "刪除送貨單")
     End Sub
     Private Sub 訂單加入_bt_MouseEnter(sender As Object, e As EventArgs) Handles 訂單加入_bt.MouseEnter
         ToolTip1.SetToolTip(Me.訂單加入_bt, "訂單加入送貨單")
     End Sub
+
+
 End Class

OW-ERP-SYS/05、技術管理系統/生產排程表.Designer.vb

@@ -23,12 +23,13 @@ Partial Class 生產排程表
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(生產排程表))
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.成品油槽04_cb = New System.Windows.Forms.ComboBox()
         Me.成品油槽03_cb = New System.Windows.Forms.ComboBox()
         Me.成品油槽02_cb = New System.Windows.Forms.ComboBox()
@@ -198,6 +199,7 @@ Partial Class 生產排程表
         Me.新增配方_lb = New System.Windows.Forms.Label()
         Me.配方選擇_dgv = New System.Windows.Forms.DataGridView()
         Me.隱藏1_pl = New System.Windows.Forms.Panel()
+        Me.單位_tb = New System.Windows.Forms.TextBox()
         Me.加入cb_dgv = New System.Windows.Forms.DataGridView()
         Me.生產流水號_tb = New System.Windows.Forms.TextBox()
         Me.排程表組別_tb = New System.Windows.Forms.TextBox()
@@ -338,6 +340,8 @@ Partial Class 生產排程表
         Me.sharedContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.deleteMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.再製選擇_pl = New System.Windows.Forms.Panel()
+        Me.後一天1_bt = New System.Windows.Forms.Button()
+        Me.前一天1_bt = New System.Windows.Forms.Button()
         Me.選擇_lb = New System.Windows.Forms.Label()
         Me.項次_lb = New System.Windows.Forms.Label()
         Me.項次_tb = New System.Windows.Forms.TextBox()
@@ -365,8 +369,7 @@ Partial Class 生產排程表
         Me.新增排程_bt = New System.Windows.Forms.Button()
         Me.儲存_bt = New System.Windows.Forms.Button()
         Me.批次向上_bt = New System.Windows.Forms.Button()
-        Me.後一天1_bt = New System.Windows.Forms.Button()
-        Me.前一天1_bt = New System.Windows.Forms.Button()
+        Me.暫存_dgv = New System.Windows.Forms.DataGridView()
         Me.TableLayoutPanel3.SuspendLayout()
         CType(Me.組別_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.配方選擇_pl.SuspendLayout()
@@ -385,6 +388,7 @@ Partial Class 生產排程表
         CType(Me.再製明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.批次數值2_nud, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.再製清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.暫存_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '成品油槽04_cb
@@ -1730,8 +1734,8 @@ Partial Class 生產排程表
         '
         '組別_dgv
         '
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.組別_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.組別_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.組別_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.組別_dgv.BackgroundColor = System.Drawing.Color.White
         Me.組別_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -1928,8 +1932,8 @@ Partial Class 生產排程表
         '
         '配方選擇_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.配方選擇_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.配方選擇_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.配方選擇_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.配方選擇_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1947,6 +1951,8 @@ Partial Class 生產排程表
         '
         '隱藏1_pl
         '
+        Me.隱藏1_pl.Controls.Add(Me.暫存_dgv)
+        Me.隱藏1_pl.Controls.Add(Me.單位_tb)
         Me.隱藏1_pl.Controls.Add(Me.加入cb_dgv)
         Me.隱藏1_pl.Controls.Add(Me.生產流水號_tb)
         Me.隱藏1_pl.Controls.Add(Me.排程表組別_tb)
@@ -1955,15 +1961,23 @@ Partial Class 生產排程表
         Me.隱藏1_pl.Controls.Add(Me.加入配方_bt)
         Me.隱藏1_pl.Controls.Add(Me.組別_dgv)
         Me.隱藏1_pl.Controls.Add(Me.配方編號_tb)
-        Me.隱藏1_pl.Location = New System.Drawing.Point(1134, 126)
+        Me.隱藏1_pl.Location = New System.Drawing.Point(1164, 126)
         Me.隱藏1_pl.Name = "隱藏1_pl"
         Me.隱藏1_pl.Size = New System.Drawing.Size(149, 370)
         Me.隱藏1_pl.TabIndex = 2075
         '
+        '單位_tb
+        '
+        Me.單位_tb.Location = New System.Drawing.Point(30, 310)
+        Me.單位_tb.Name = "單位_tb"
+        Me.單位_tb.ReadOnly = True
+        Me.單位_tb.Size = New System.Drawing.Size(102, 23)
+        Me.單位_tb.TabIndex = 2188
+        '
         '加入cb_dgv
         '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.加入cb_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.加入cb_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.加入cb_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.加入cb_dgv.BackgroundColor = System.Drawing.Color.White
         Me.加入cb_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -3220,6 +3234,26 @@ Partial Class 生產排程表
         Me.再製選擇_pl.Size = New System.Drawing.Size(1020, 464)
         Me.再製選擇_pl.TabIndex = 2176
         '
+        '後一天1_bt
+        '
+        Me.後一天1_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.後一天1_bt.Location = New System.Drawing.Point(643, 31)
+        Me.後一天1_bt.Name = "後一天1_bt"
+        Me.後一天1_bt.Size = New System.Drawing.Size(100, 23)
+        Me.後一天1_bt.TabIndex = 2193
+        Me.後一天1_bt.Text = "後一日"
+        Me.後一天1_bt.UseVisualStyleBackColor = True
+        '
+        '前一天1_bt
+        '
+        Me.前一天1_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.前一天1_bt.Location = New System.Drawing.Point(541, 31)
+        Me.前一天1_bt.Name = "前一天1_bt"
+        Me.前一天1_bt.Size = New System.Drawing.Size(100, 23)
+        Me.前一天1_bt.TabIndex = 2192
+        Me.前一天1_bt.Text = "前一日"
+        Me.前一天1_bt.UseVisualStyleBackColor = True
+        '
         '選擇_lb
         '
         Me.選擇_lb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -3341,8 +3375,8 @@ Partial Class 生產排程表
         '
         '再製明細_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.再製明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.再製明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.再製明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -3413,8 +3447,8 @@ Partial Class 生產排程表
         '
         '再製清單_dgv
         '
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.再製清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.再製清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
         Me.再製清單_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.再製清單_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -3438,7 +3472,7 @@ Partial Class 生產排程表
         Me.加入再製_bt.Name = "加入再製_bt"
         Me.加入再製_bt.Size = New System.Drawing.Size(89, 50)
         Me.加入再製_bt.TabIndex = 2177
-        Me.加入再製_bt.Text = "排成加入再製"
+        Me.加入再製_bt.Text = "排程加入再製"
         Me.加入再製_bt.UseVisualStyleBackColor = True
         '
         '批次向下_bt
@@ -3521,25 +3555,22 @@ Partial Class 生產排程表
         Me.批次向上_bt.TabIndex = 2067
         Me.批次向上_bt.UseVisualStyleBackColor = True
         '
-        '後一天1_bt
-        '
-        Me.後一天1_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.後一天1_bt.Location = New System.Drawing.Point(643, 31)
-        Me.後一天1_bt.Name = "後一天1_bt"
-        Me.後一天1_bt.Size = New System.Drawing.Size(100, 23)
-        Me.後一天1_bt.TabIndex = 2193
-        Me.後一天1_bt.Text = "後一日"
-        Me.後一天1_bt.UseVisualStyleBackColor = True
-        '
-        '前一天1_bt
-        '
-        Me.前一天1_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.前一天1_bt.Location = New System.Drawing.Point(541, 31)
-        Me.前一天1_bt.Name = "前一天1_bt"
-        Me.前一天1_bt.Size = New System.Drawing.Size(100, 23)
-        Me.前一天1_bt.TabIndex = 2192
-        Me.前一天1_bt.Text = "前一日"
-        Me.前一天1_bt.UseVisualStyleBackColor = True
+        '暫存_dgv
+        '
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.暫存_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.暫存_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.暫存_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.暫存_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.暫存_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.暫存_dgv.Location = New System.Drawing.Point(30, 339)
+        Me.暫存_dgv.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.暫存_dgv.Name = "暫存_dgv"
+        Me.暫存_dgv.ReadOnly = True
+        Me.暫存_dgv.RowHeadersWidth = 5
+        Me.暫存_dgv.RowTemplate.Height = 24
+        Me.暫存_dgv.Size = New System.Drawing.Size(102, 26)
+        Me.暫存_dgv.TabIndex = 2189
         '
         '生產排程表
         '
@@ -3842,6 +3873,7 @@ Partial Class 生產排程表
         CType(Me.再製明細_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.批次數值2_nud, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.再製清單_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.暫存_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -4184,4 +4216,6 @@ Partial Class 生產排程表
     Friend WithEvents 項次_tb As TextBox
     Friend WithEvents 後一天1_bt As Button
     Friend WithEvents 前一天1_bt As Button
+    Friend WithEvents 單位_tb As TextBox
+    Friend WithEvents 暫存_dgv As DataGridView
 End Class

OW-ERP-SYS/05、技術管理系統/生產排程表.vb

@@ -90,9 +90,14 @@ Public Class 生產排程表
 
     Private Sub 更新製程明細(前綴 As String, 生產日期 As String, 批次 As String, 組別 As String)
         SQL_製程明細表_讀取(生產日期, 批次, 組別)
+        Dim 流水號 As String = ""
+        暫存_dgv.DataSource = Nothing
+        Me.Controls("生產數量" & 前綴 & "_cb").ForeColor = Color.Black
+        Me.Controls("生產數量" & 前綴 & "_tb").ForeColor = Color.Black
         If dr.HasRows Then
             Dim 迴圈index As Integer = 0
             While dr.Read()
+                流水號 = dr("生產流水號").ToString()
                 If Me.Controls("品名" & 前綴 & "_cb").Text = "" Then
                     Me.Controls("品名" & 前綴 & "_cb").Text = dr("產品名稱").ToString()
                 Else
@@ -114,28 +119,32 @@ Public Class 生產排程表
 
                 Dim 生產數集合 As String() = dr("生產數量").Split(New Char() {";"c})
                 Dim 各別生產量 As String = 生產數集合(迴圈index).Trim() ' 去除前后空白
-
-                If dr("生產數量").ToString() <> "" AndAlso Convert.ToDouble(各別生產量) > 0 AndAlso dr("淨重").ToString() <> "" AndAlso Convert.ToDouble(dr("淨重")) > 0 Then
-                    Dim 生產數量 As Double : Dim 淨重 As Double
-                    Try
-                        生產數量 = Convert.ToDouble(各別生產量)
-                        淨重 = Convert.ToDouble(dr("淨重").ToString())
-                    Catch ex As FormatException
-                        Console.WriteLine("格式錯誤")
-                    Catch ex As OverflowException
-                        Console.WriteLine("數值超出範圍")
-                    End Try
-                    If Me.Controls("生產數量" & 前綴 & "_tb").Text = "" Then
+                Dim 生產數量 As Double : Dim 淨重 As Double
+                If Not String.IsNullOrEmpty(dr("生產數量").ToString()) AndAlso Double.TryParse(各別生產量, 生產數量) AndAlso 生產數量 > 0 AndAlso
+                    Not String.IsNullOrEmpty(dr("淨重").ToString()) AndAlso Double.TryParse(dr("淨重").ToString(), 淨重) AndAlso 淨重 > 0 Then
+                    ' 計算生產數量與淨重的比值，並設置文本框的值
+                    If String.IsNullOrEmpty(Me.Controls("生產數量" & 前綴 & "_tb").Text) Then
                         Me.Controls("生產數量" & 前綴 & "_tb").Text = (生產數量 * 1000 / 淨重).ToString("0.##")
                     Else
-                        Me.Controls("生產數量" & 前綴 & "_tb").Text = Me.Controls("生產數量" & 前綴 & "_tb").Text & ";" & (生產數量 * 1000 / 淨重).ToString("0.##")
+                        Me.Controls("生產數量" & 前綴 & "_tb").Text &= ";" & (生產數量 * 1000 / 淨重).ToString("0.##")
                     End If
-                Else ' 可以處理或記錄空字符串的情況
+                Else
+                    ' 處理無效的數據或空字符串
                     MGB("生產數量或淨重沒有數值!" & Environment.NewLine & "請輸入正確生產數量 或 將配方資料的淨重填寫完整!", 1)
                 End If
                 迴圈index += 1
             End While
         End If
+        If 流水號 <> "" Then
+            Dim ds1 As New DataSet : 暫存_dgv.DataSource = Nothing : ds1.Clear()
+            SQL_生產製程_再製明細(流水號)
+            da.Fill(ds1) : 暫存_dgv.DataSource = ds1.Tables(0) : conn.Close()
+            If 暫存_dgv.Rows.Count - 1 > 0 Then
+                Me.Controls("生產數量" & 前綴 & "_cb").ForeColor = Color.Red
+                Me.Controls("生產數量" & 前綴 & "_tb").ForeColor = Color.Red
+            End If
+        End If
+
     End Sub
     Private Sub 清除製程CB內容(前綴陣列 As String())
         For Each 前綴 As String In 前綴陣列
@@ -1385,10 +1394,10 @@ Public Class 生產排程表
         SQL_生產製程_再製清單()
         da.Fill(ds1) : 再製清單_dgv.DataSource = ds1.Tables(0) : conn.Close()
         ' 隱藏指定範圍的列
-        再製清單_dgv.Columns(0).Visible = False : 再製清單_dgv.Columns(1).FillWeight = 100 : 再製清單_dgv.Columns(2).FillWeight = 100
-        再製清單_dgv.Columns(3).FillWeight = 50
+        再製清單_dgv.Columns(0).FillWeight = 100 : 再製清單_dgv.Columns(1).Visible = False : 再製清單_dgv.Columns(2).FillWeight = 100
+        再製清單_dgv.Columns(3).FillWeight = 100 : 再製清單_dgv.Columns(4).FillWeight = 50 : 再製清單_dgv.Columns(5).Visible = False
         再製清單_dgv.Columns(1).ReadOnly = True : 再製清單_dgv.Columns(2).ReadOnly = True : 再製清單_dgv.Columns(3).ReadOnly = True
-        料號_tb.Text = "" : 申請數_nud.Text = "0" : 品名_tb.Text = ""
+        料號_tb.Text = "" : 申請數_nud.Text = "0" : 品名_tb.Text = "" : 單位_tb.Text = ""
     End Sub
     Public Sub Set_再製明細()
         Dim ds1 As New DataSet : 再製明細_dgv.DataSource = Nothing : ds1.Clear()
@@ -1416,8 +1425,9 @@ Public Class 生產排程表
 
     Private Sub 再製清單_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 再製清單_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            料號_tb.Text = 再製清單_dgv(0, e.RowIndex).Value.ToString
-            品名_tb.Text = 再製清單_dgv(1, e.RowIndex).Value.ToString
+            料號_tb.Text = 再製清單_dgv(1, e.RowIndex).Value.ToString
+            品名_tb.Text = 再製清單_dgv(2, e.RowIndex).Value.ToString
+            單位_tb.Text = 再製清單_dgv(5, e.RowIndex).Value.ToString
             NUM2 = e.RowIndex
         End If
     End Sub
@@ -1457,7 +1467,7 @@ Public Class 生產排程表
                             If NUM1 < 10 Then : 新項次 = "0" & NUM1 : ElseIf NUM1 > 9 And NUM1 < 100 Then : 新項次 = NUM1 : End If
                             Dim 規格 As String = 再製清單_dgv.Rows(NUM2).Cells("規格1").Value.ToString()
                             Dim 數量 As String = 申請數_nud.Value.ToString()
-                            SQL_再製明細表_新增(流水號_tb.Text, 新項次, 料號_tb.Text, 品名_tb.Text, 規格, 數量, "", 組別_cb.Text)
+                            SQL_再製明細表_新增(流水號_tb.Text, 新項次, 料號_tb.Text, 品名_tb.Text, 規格, 數量, 單位_tb.Text, 組別_cb.Text)
                             conn.Close() : MsgBox("新增完成，資料已在明細上!!") : Set_再製明細() : 申請數_nud.Value = 0
                         End If
                     End If
@@ -1507,4 +1517,16 @@ Public Class 生產排程表
             MessageBox.Show("已達到可選擇的最晚日期。")
         End If
     End Sub
+    Private Sub 加入明細_bt_MouseEnter(sender As Object, e As EventArgs) Handles 加入明細_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.加入明細_bt, "物料加入明細")
+    End Sub
+    Private Sub 刪除退貨單上點選資料_bt_MouseEnter(sender As Object, e As EventArgs) Handles 刪除退貨單上點選資料_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.刪除退貨單上點選資料_bt, "再製明細單項刪除")
+    End Sub
+    Private Sub 明細刪除_bt_MouseEnter(sender As Object, e As EventArgs) Handles 明細刪除_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.明細刪除_bt, "再製明細刪除")
+    End Sub
+    Private Sub 關閉再製_bt_MouseEnter(sender As Object, e As EventArgs) Handles 關閉再製_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.關閉再製_bt, "關閉再製")
+    End Sub
 End Class

OW-ERP-SYS/05、技術管理系統/製程管制紀錄表_一般組.vb

@@ -35,7 +35,7 @@ Public Class 製程管制紀錄表_一般組
         Array.Resize(標籤代號, 3) : Array.Resize(打包帶色, 3) : Array.Resize(打包代數, 3)
         品項 = "1"
         儲存_bt.Enabled = False : 修改_bt.Enabled = False
-        品項1_bt.Enabled = False : 品項2_bt.Enabled = False : 品項3_bt.Enabled = False : 顯示再製_bt.Enabled = False
+        品項1_bt.Enabled = False : 品項2_bt.Enabled = False : 品項3_bt.Enabled = False : 顯示再製_bt.Enabled = False : 顯示再製_bt.ForeColor = Color.Blue
     End Sub
     Private Sub Set_生產排程表_讀取()
         ' 查 生產排程表單 中有無資料
@@ -1326,9 +1326,9 @@ Public Class 製程管制紀錄表_一般組
         再製明細_dgv.EditMode = DataGridViewEditMode.EditOnEnter
         ' 隱藏指定範圍的列
         If 再製明細_dgv.Rows.Count > 0 Then
-            顯示再製_bt.Enabled = True
+            顯示再製_bt.Enabled = True : 顯示再製_bt.ForeColor = Color.Red
         Else
-            顯示再製_bt.Enabled = False
+            顯示再製_bt.Enabled = False : 顯示再製_bt.ForeColor = Color.Blue
         End If
     End Sub
     Private Sub 顯示再製_bt_Click(sender As Object, e As EventArgs) Handles 顯示再製_bt.Click

OW-ERP-SYS/05、技術管理系統/製程管制紀錄表_奶油組.Designer.vb

@@ -23,19 +23,19 @@ Partial Class 製程管制紀錄表_奶油組
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.原料顯示_pl = New System.Windows.Forms.Panel()
         Me.輸入重量_pl = New System.Windows.Forms.Panel()
         Me.投入備註_tb = New System.Windows.Forms.TextBox()
@@ -555,8 +555,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '製程原料油_dgv
         '
-        DataGridViewCellStyle14.BackColor = System.Drawing.Color.White
-        Me.製程原料油_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.White
+        Me.製程原料油_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.製程原料油_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.製程原料油_dgv.BackgroundColor = System.Drawing.Color.White
         Me.製程原料油_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -584,8 +584,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '配方原料油_dgv
         '
-        DataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.配方原料油_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.配方原料油_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.配方原料油_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.配方原料油_dgv.BackgroundColor = System.Drawing.Color.White
         Me.配方原料油_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -600,8 +600,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '配方香料_dgv
         '
-        DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.配方香料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.配方香料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.配方香料_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.配方香料_dgv.BackgroundColor = System.Drawing.Color.White
         Me.配方香料_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -616,8 +616,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '配方乳化劑_dgv
         '
-        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.配方乳化劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.配方乳化劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.配方乳化劑_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.配方乳化劑_dgv.BackgroundColor = System.Drawing.Color.White
         Me.配方乳化劑_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -632,8 +632,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '配方其他_dgv
         '
-        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.配方其他_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
+        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.配方其他_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
         Me.配方其他_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.配方其他_dgv.BackgroundColor = System.Drawing.Color.White
         Me.配方其他_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -648,8 +648,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '配方著色劑_dgv
         '
-        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.配方著色劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
+        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.配方著色劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
         Me.配方著色劑_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.配方著色劑_dgv.BackgroundColor = System.Drawing.Color.White
         Me.配方著色劑_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -664,8 +664,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '製程其他_dgv
         '
-        DataGridViewCellStyle20.BackColor = System.Drawing.Color.White
-        Me.製程其他_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.White
+        Me.製程其他_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
         Me.製程其他_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.製程其他_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -691,8 +691,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '製程香料_dgv
         '
-        DataGridViewCellStyle21.BackColor = System.Drawing.Color.White
-        Me.製程香料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.White
+        Me.製程香料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
         Me.製程香料_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.製程香料_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1183,8 +1183,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '製程乳化劑_dgv
         '
-        DataGridViewCellStyle22.BackColor = System.Drawing.Color.White
-        Me.製程乳化劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.White
+        Me.製程乳化劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
         Me.製程乳化劑_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.製程乳化劑_dgv.BackgroundColor = System.Drawing.Color.White
         Me.製程乳化劑_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -1199,8 +1199,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '製程著色劑_dgv
         '
-        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.製程著色劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.製程著色劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
         Me.製程著色劑_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.製程著色劑_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -2823,8 +2823,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '回收品項_dgv
         '
-        DataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.回收品項_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.回收品項_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
         Me.回收品項_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.回收品項_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -3367,8 +3367,8 @@ Partial Class 製程管制紀錄表_奶油組
         Me.簽名檔_dgv.Name = "簽名檔_dgv"
         Me.簽名檔_dgv.ReadOnly = True
         Me.簽名檔_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle25.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.簽名檔_dgv.RowsDefaultCellStyle = DataGridViewCellStyle25
+        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.簽名檔_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
         Me.簽名檔_dgv.RowTemplate.Height = 24
         Me.簽名檔_dgv.Size = New System.Drawing.Size(150, 111)
         Me.簽名檔_dgv.TabIndex = 1785
@@ -3409,8 +3409,8 @@ Partial Class 製程管制紀錄表_奶油組
         '
         '再製明細_dgv
         '
-        DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.再製明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.再製明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
         Me.再製明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)

OW-ERP-SYS/05、技術管理系統/製程管制紀錄表_奶油組.vb

@@ -43,7 +43,7 @@ Public Class 製程管制紀錄表_奶油組
         Array.Resize(標籤代號, 3) : Array.Resize(打包帶色, 3) : Array.Resize(打包代數, 3)
         品項 = "1"
         儲存_bt.Enabled = False : 修改_bt.Enabled = False
-        品項1_bt.Enabled = False : 品項2_bt.Enabled = False : 品項3_bt.Enabled = False : 顯示再製_bt.Enabled = False
+        品項1_bt.Enabled = False : 品項2_bt.Enabled = False : 品項3_bt.Enabled = False : 顯示再製_bt.Enabled = False : 顯示再製_bt.ForeColor = Color.Blue
     End Sub
     Private Sub Set_生產排程表_讀取()
         ' 查 生產排程表單 中有無資料
@@ -1431,8 +1431,10 @@ Public Class 製程管制紀錄表_奶油組
         ' 隱藏指定範圍的列
         If 再製明細_dgv.Rows.Count > 0 Then
             顯示再製_bt.Enabled = True
+            顯示再製_bt.ForeColor = Color.Red
         Else
             顯示再製_bt.Enabled = False
+            顯示再製_bt.ForeColor = Color.Blue
         End If
     End Sub
     Private Sub 顯示再製_bt_Click(sender As Object, e As EventArgs) Handles 顯示再製_bt.Click

OW-ERP-SYS/06、業務管理系統/訂購單.vb

@@ -9,6 +9,10 @@ Public Class 訂購單
         開立訂購單_bt.Enabled = True : 刪除訂購單上點選資料_bt.Enabled = False : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False
         未核准_dgv.Visible = True : 作廢清單_dgv.Visible = False : 已核准_dgv.Visible = False
         小間距_ch.Checked = False : 中間距_ch.Checked = True : 大間距_ch.Checked = False
+        來電業務_rb.Checked = False : 來電客戶_rb.Checked = False : 運費公司_rb.Checked = False : 運費客戶_rb.Checked = False : 重量公司_rb.Checked = False
+        重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_cb.Checked = False
+        折扣_cb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
+        賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False : 收款天數_tb.Text = "" : 票期天數_tb.Text = ""
         未審核_rb.Checked = True : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5()
     End Sub
 
@@ -147,6 +151,24 @@ Public Class 訂購單
         累計明細_dgv.Columns(4).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
         累計明細_dgv.EditMode = DataGridViewEditMode.EditOnEnter
     End Sub
+    Private Sub 累計明細_dgv_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles 累計明細_dgv.CellEndEdit
+        ' 只對第 1 列的編輯進行檢查
+        If e.ColumnIndex = 2 Then
+            Dim cellValue As String = 累計明細_dgv.Rows(e.RowIndex).Cells(e.ColumnIndex).Value.ToString()
+
+            If String.IsNullOrEmpty(cellValue) Then
+                Exit Sub
+            End If
+
+            ' 使用正則表達式來檢查是否僅包含數字、小數點和符號
+            Dim pattern As String = "^[0-9+\-*/.]*$"
+            If Not System.Text.RegularExpressions.Regex.IsMatch(cellValue, pattern) Then
+                MessageBox.Show("僅允許輸入數字、小數點或符號 (0-9, +, -, *, /, .)")
+                ' 清空或恢復單元格的值
+                累計明細_dgv.Rows(e.RowIndex).Cells(e.ColumnIndex).Value = String.Empty
+            End If
+        End If
+    End Sub
     Private Sub 物料搜尋_bt_Click(sender As Object, e As EventArgs) Handles 物料搜尋_bt.Click
         Set_清單1()
     End Sub
@@ -162,8 +184,8 @@ Public Class 訂購單
             訂購明細_dgv.DataSource = Nothing : 累計明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 項次_tb.Text = "" : 客編_tb.Text = ""
             地址_tb.Text = "" : 電話_tb.Text = "" : 聯絡人_tb.Text = "" : 備註_tb.Text = "" : 收款天數_tb.Text = "" : 票期天數_tb.Text = "" : 項次1_tb.Text = ""
             來電業務_rb.Checked = False : 來電客戶_rb.Checked = False : 運費公司_rb.Checked = False : 運費客戶_rb.Checked = False : 重量公司_rb.Checked = False
-            重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_rb.Checked = False
-            折扣_rb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
+            重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_cb.Checked = False
+            折扣_cb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
             賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False
 
             刪除訂購單上點選資料_bt.Enabled = True : 刪除_bt.Enabled = True : 儲存_bt.Enabled = True : 客戶新增_bt.Enabled = True : 物料新增_bt.Enabled = True
@@ -178,8 +200,8 @@ Public Class 訂購單
             訂購明細_dgv.DataSource = Nothing : 累計明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 項次_tb.Text = "" : 客編_tb.Text = ""
             地址_tb.Text = "" : 電話_tb.Text = "" : 聯絡人_tb.Text = "" : 備註_tb.Text = "" : 收款天數_tb.Text = "" : 票期天數_tb.Text = "" : 項次1_tb.Text = ""
             來電業務_rb.Checked = False : 來電客戶_rb.Checked = False : 運費公司_rb.Checked = False : 運費客戶_rb.Checked = False : 重量公司_rb.Checked = False
-            重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_rb.Checked = False
-            折扣_rb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
+            重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_cb.Checked = False
+            折扣_cb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
             賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False
 
             刪除訂購單上點選資料_bt.Enabled = False : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False : 客戶新增_bt.Enabled = False : 物料新增_bt.Enabled = False
@@ -194,8 +216,8 @@ Public Class 訂購單
             訂購明細_dgv.DataSource = Nothing : 累計明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 項次_tb.Text = "" : 客編_tb.Text = ""
             地址_tb.Text = "" : 電話_tb.Text = "" : 聯絡人_tb.Text = "" : 備註_tb.Text = "" : 收款天數_tb.Text = "" : 票期天數_tb.Text = "" : 項次1_tb.Text = ""
             來電業務_rb.Checked = False : 來電客戶_rb.Checked = False : 運費公司_rb.Checked = False : 運費客戶_rb.Checked = False : 重量公司_rb.Checked = False
-            重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_rb.Checked = False
-            折扣_rb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
+            重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_cb.Checked = False
+            折扣_cb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
             賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False
 
             刪除訂購單上點選資料_bt.Enabled = False : 刪除_bt.Enabled = False : 儲存_bt.Enabled = False : 客戶新增_bt.Enabled = False : 物料新增_bt.Enabled = False
@@ -207,7 +229,7 @@ Public Class 訂購單
     End Sub
     Private Sub 物料清單_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 物料清單_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            料號_tb.Text = 物料清單_dgv(1, e.RowIndex).Value.ToString
+            料號_tb.Text = 物料清單_dgv(4, e.RowIndex).Value.ToString
             品名_tb.Text = 物料清單_dgv(2, e.RowIndex).Value.ToString
             NUM2 = e.RowIndex
         End If
@@ -241,8 +263,8 @@ Public Class 訂購單
             運費公司_rb.Checked = 已核准_dgv(10, e.RowIndex).Value : 運費客戶_rb.Checked = 已核准_dgv(11, e.RowIndex).Value
             重量公司_rb.Checked = 已核准_dgv(12, e.RowIndex).Value : 重量客戶_rb.Checked = 已核准_dgv(13, e.RowIndex).Value
             重量地磅_rb.Checked = 已核准_dgv(14, e.RowIndex).Value : 客戶寄回_rb.Checked = 已核准_dgv(15, e.RowIndex).Value
-            代表收回_rb.Checked = 已核准_dgv(16, e.RowIndex).Value : 傭金_rb.Checked = 已核准_dgv(18, e.RowIndex).Value
-            折扣_rb.Checked = 已核准_dgv(19, e.RowIndex).Value : 現金_rb.Checked = 已核准_dgv(20, e.RowIndex).Value : 匯款_rb.Checked = 已核准_dgv(21, e.RowIndex).Value
+            代表收回_rb.Checked = 已核准_dgv(16, e.RowIndex).Value : 傭金_cb.Checked = 已核准_dgv(18, e.RowIndex).Value
+            折扣_cb.Checked = 已核准_dgv(19, e.RowIndex).Value : 現金_rb.Checked = 已核准_dgv(20, e.RowIndex).Value : 匯款_rb.Checked = 已核准_dgv(21, e.RowIndex).Value
             票期_rb.Checked = 已核准_dgv(22, e.RowIndex).Value : 買_rb.Checked = 已核准_dgv(24, e.RowIndex).Value
             賣_rb.Checked = 已核准_dgv(25, e.RowIndex).Value : 借_rb.Checked = 已核准_dgv(26, e.RowIndex).Value : 還_rb.Checked = 已核准_dgv(27, e.RowIndex).Value
             If Not String.IsNullOrEmpty(已核准_dgv(5, e.RowIndex).Value.ToString()) Then
@@ -262,8 +284,8 @@ Public Class 訂購單
             運費公司_rb.Checked = 未核准_dgv(10, e.RowIndex).Value : 運費客戶_rb.Checked = 未核准_dgv(11, e.RowIndex).Value
             重量公司_rb.Checked = 未核准_dgv(12, e.RowIndex).Value : 重量客戶_rb.Checked = 未核准_dgv(13, e.RowIndex).Value
             重量地磅_rb.Checked = 未核准_dgv(14, e.RowIndex).Value : 客戶寄回_rb.Checked = 未核准_dgv(15, e.RowIndex).Value
-            代表收回_rb.Checked = 未核准_dgv(16, e.RowIndex).Value : 傭金_rb.Checked = 未核准_dgv(18, e.RowIndex).Value
-            折扣_rb.Checked = 未核准_dgv(19, e.RowIndex).Value : 現金_rb.Checked = 未核准_dgv(20, e.RowIndex).Value : 匯款_rb.Checked = 未核准_dgv(21, e.RowIndex).Value
+            代表收回_rb.Checked = 未核准_dgv(16, e.RowIndex).Value : 傭金_cb.Checked = 未核准_dgv(18, e.RowIndex).Value
+            折扣_cb.Checked = 未核准_dgv(19, e.RowIndex).Value : 現金_rb.Checked = 未核准_dgv(20, e.RowIndex).Value : 匯款_rb.Checked = 未核准_dgv(21, e.RowIndex).Value
             票期_rb.Checked = 未核准_dgv(22, e.RowIndex).Value : 買_rb.Checked = 未核准_dgv(24, e.RowIndex).Value
             賣_rb.Checked = 未核准_dgv(25, e.RowIndex).Value : 借_rb.Checked = 未核准_dgv(26, e.RowIndex).Value : 還_rb.Checked = 未核准_dgv(27, e.RowIndex).Value
             If Not String.IsNullOrEmpty(未核准_dgv(5, e.RowIndex).Value.ToString()) Then
@@ -282,8 +304,8 @@ Public Class 訂購單
             運費公司_rb.Checked = 作廢清單_dgv(10, e.RowIndex).Value : 運費客戶_rb.Checked = 作廢清單_dgv(11, e.RowIndex).Value
             重量公司_rb.Checked = 作廢清單_dgv(12, e.RowIndex).Value : 重量客戶_rb.Checked = 作廢清單_dgv(13, e.RowIndex).Value
             重量地磅_rb.Checked = 作廢清單_dgv(14, e.RowIndex).Value : 客戶寄回_rb.Checked = 作廢清單_dgv(15, e.RowIndex).Value
-            代表收回_rb.Checked = 作廢清單_dgv(16, e.RowIndex).Value : 傭金_rb.Checked = 作廢清單_dgv(18, e.RowIndex).Value
-            折扣_rb.Checked = 作廢清單_dgv(19, e.RowIndex).Value : 現金_rb.Checked = 作廢清單_dgv(20, e.RowIndex).Value : 匯款_rb.Checked = 作廢清單_dgv(21, e.RowIndex).Value
+            代表收回_rb.Checked = 作廢清單_dgv(16, e.RowIndex).Value : 傭金_cb.Checked = 作廢清單_dgv(18, e.RowIndex).Value
+            折扣_cb.Checked = 作廢清單_dgv(19, e.RowIndex).Value : 現金_rb.Checked = 作廢清單_dgv(20, e.RowIndex).Value : 匯款_rb.Checked = 作廢清單_dgv(21, e.RowIndex).Value
             票期_rb.Checked = 作廢清單_dgv(22, e.RowIndex).Value : 買_rb.Checked = 作廢清單_dgv(24, e.RowIndex).Value
             賣_rb.Checked = 作廢清單_dgv(25, e.RowIndex).Value : 借_rb.Checked = 作廢清單_dgv(26, e.RowIndex).Value : 還_rb.Checked = 作廢清單_dgv(27, e.RowIndex).Value
             If Not String.IsNullOrEmpty(作廢清單_dgv(5, e.RowIndex).Value.ToString()) Then
@@ -301,8 +323,8 @@ Public Class 訂購單
         訂購明細_dgv.DataSource = Nothing : 累計明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 項次_tb.Text = "" : 客編_tb.Text = ""
         地址_tb.Text = "" : 電話_tb.Text = "" : 聯絡人_tb.Text = "" : 備註_tb.Text = "" : 收款天數_tb.Text = "" : 票期天數_tb.Text = "" : 項次1_tb.Text = ""
         來電業務_rb.Checked = False : 來電客戶_rb.Checked = False : 運費公司_rb.Checked = False : 運費客戶_rb.Checked = False : 重量公司_rb.Checked = False
-        重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_rb.Checked = False
-        折扣_rb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
+        重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_cb.Checked = False
+        折扣_cb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
         賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False
 
         未核准_dgv.Visible = True : 作廢清單_dgv.Visible = False : 已核准_dgv.Visible = False
@@ -365,8 +387,8 @@ Public Class 訂購單
                     訂購明細_dgv.DataSource = Nothing : 累計明細_dgv.DataSource = Nothing : 訂購單號_tb.Text = "" : 客名_tb.Text = "" : 項次_tb.Text = "" : 客編_tb.Text = ""
                     地址_tb.Text = "" : 電話_tb.Text = "" : 聯絡人_tb.Text = "" : 備註_tb.Text = "" : 收款天數_tb.Text = "" : 票期天數_tb.Text = "" : 項次1_tb.Text = ""
                     來電業務_rb.Checked = False : 來電客戶_rb.Checked = False : 運費公司_rb.Checked = False : 運費客戶_rb.Checked = False : 重量公司_rb.Checked = False
-                    重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_rb.Checked = False
-                    折扣_rb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
+                    重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_cb.Checked = False
+                    折扣_cb.Checked = False : 現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
                     賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False
                     Set_清單2() : 訂購明細_dgv.DataSource = Nothing : 累計明細_dgv.DataSource = Nothing
                 End If
@@ -397,8 +419,8 @@ Public Class 訂購單
         Dim 交貨日期 As String = 交貨日期_dtp.Value.ToString("yyyy/MM/dd")
         SQL_訂購單控制表_修改(訂購單號_tb.Text, 交貨日期, 客編_tb.Text, 地址_tb.Text, 電話_tb.Text, 聯絡人_tb.Text, 備註_tb.Text,
                               來電業務_rb.Checked, 來電客戶_rb.Checked, 運費公司_rb.Checked, 運費客戶_rb.Checked, 重量公司_rb.Checked,
-                              重量客戶_rb.Checked, 重量地磅_rb.Checked, 客戶寄回_rb.Checked, 代表收回_rb.Checked, 收款天數_tb.Text, 傭金_rb.Checked,
-                              折扣_rb.Checked, 現金_rb.Checked, 匯款_rb.Checked, 票期_rb.Checked, 票期天數_tb.Text, 買_rb.Checked,
+                              重量客戶_rb.Checked, 重量地磅_rb.Checked, 客戶寄回_rb.Checked, 代表收回_rb.Checked, 收款天數_tb.Text, 傭金_cb.Checked,
+                              折扣_cb.Checked, 現金_rb.Checked, 匯款_rb.Checked, 票期_rb.Checked, 票期天數_tb.Text, 買_rb.Checked,
                               賣_rb.Checked, 借_rb.Checked, 還_rb.Checked)
     End Sub
 
@@ -481,66 +503,59 @@ Public Class 訂購單
     End Sub
     Private Sub 現金_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 現金_rb.Click
         If 現金_rb.Checked = True Then
-            現金_rb.Checked = True : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
-            賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False : 票期天數_tb.Text = ""
+            現金_rb.Checked = True : 匯款_rb.Checked = False : 票期_rb.Checked = False : 票期天數_tb.Text = ""
         End If
     End Sub
     Private Sub 匯款_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 匯款_rb.Click
         If 匯款_rb.Checked = True Then
-            現金_rb.Checked = False : 匯款_rb.Checked = True : 票期_rb.Checked = False : 買_rb.Checked = False
-            賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False : 票期天數_tb.Text = ""
+            現金_rb.Checked = False : 匯款_rb.Checked = True : 票期_rb.Checked = False : 票期天數_tb.Text = ""
         End If
     End Sub
     Private Sub 票期_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 票期_rb.Click
         If 票期_rb.Checked = True Then
-            現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = True : 買_rb.Checked = False
-            賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False : 票期天數_tb.Text = "0"
+            現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = True : 票期天數_tb.Text = "0"
         End If
     End Sub
     Private Sub 買_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 買_rb.Click
         If 買_rb.Checked = True Then
-            現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = True
-            賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False : 票期天數_tb.Text = ""
+            買_rb.Checked = True
+            賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False
         End If
     End Sub
     Private Sub 賣_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 賣_rb.Click
         If 賣_rb.Checked = True Then
-            現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
-            賣_rb.Checked = True : 借_rb.Checked = False : 還_rb.Checked = False : 票期天數_tb.Text = ""
+            買_rb.Checked = False
+            賣_rb.Checked = True : 借_rb.Checked = False : 還_rb.Checked = False
         End If
     End Sub
     Private Sub 借_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 借_rb.Click
         If 借_rb.Checked = True Then
-            現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
-            賣_rb.Checked = False : 借_rb.Checked = True : 還_rb.Checked = False : 票期天數_tb.Text = ""
+            買_rb.Checked = False
+            賣_rb.Checked = False : 借_rb.Checked = True : 還_rb.Checked = False
         End If
     End Sub
     Private Sub 還_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 還_rb.Click
         If 還_rb.Checked = True Then
-            現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
-            賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = True : 票期天數_tb.Text = ""
+            買_rb.Checked = False
+            賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = True
         End If
     End Sub
     Private Sub 客戶寄回_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 客戶寄回_rb.Click
         If 客戶寄回_rb.Checked = True Then
-            收款天數_tb.Text = "0" : 客戶寄回_rb.Checked = True : 代表收回_rb.Checked = False : 傭金_rb.Checked = False : 折扣_rb.Checked = False
+            收款天數_tb.Text = "0" : 客戶寄回_rb.Checked = True : 代表收回_rb.Checked = False
         End If
     End Sub
     Private Sub 代表收回_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 代表收回_rb.Click
         If 代表收回_rb.Checked = True Then
-            收款天數_tb.Text = "0" : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = True : 傭金_rb.Checked = False : 折扣_rb.Checked = False
-        End If
-    End Sub
-    Private Sub 傭金_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 傭金_rb.Click
-        If 傭金_rb.Checked = True Then
-            收款天數_tb.Text = "" : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_rb.Checked = True : 折扣_rb.Checked = False
-        End If
-    End Sub
-    Private Sub 折扣_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 折扣_rb.Click
-        If 折扣_rb.Checked = True Then
-            收款天數_tb.Text = "" : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_rb.Checked = False : 折扣_rb.Checked = True
+            收款天數_tb.Text = "0" : 客戶寄回_rb.Checked = False : 代表收回_rb.Checked = True
         End If
     End Sub
+    'Private Sub 傭金_cb_CheckedChanged(sender As Object, e As EventArgs) Handles 傭金_cb.Click
+    '    傭金_cb.Checked = Not 傭金_cb.Checked
+    'End Sub
+    'Private Sub 折扣_cb_CheckedChanged(sender As Object, e As EventArgs) Handles 折扣_cb.Click
+    '    折扣_cb.Checked = Not 折扣_cb.Checked
+    'End Sub
     Private Sub 運費公司_rb_CheckedChanged(sender As Object, e As EventArgs) Handles 運費公司_rb.Click
         If 運費公司_rb.Checked = True Then
             運費公司_rb.Checked = True : 運費客戶_rb.Checked = False
@@ -602,6 +617,22 @@ Public Class 訂購單
     Private Sub 累計表單項刪除_bt_MouseEnter(sender As Object, e As EventArgs) Handles 累計表單項刪除_bt.MouseEnter
         ToolTip1.SetToolTip(Me.累計表單項刪除_bt, "刪除累計量單上點選資料")
     End Sub
+
+    Private Sub 全關1_bt_Click(sender As Object, e As EventArgs) Handles 全關1_bt.Click
+        運費公司_rb.Checked = False : 運費客戶_rb.Checked = False : 重量公司_rb.Checked = False
+        重量客戶_rb.Checked = False : 重量地磅_rb.Checked = False
+    End Sub
+
+    Private Sub 全關2_bt_Click(sender As Object, e As EventArgs) Handles 全關2_bt.Click
+        客戶寄回_rb.Checked = False : 代表收回_rb.Checked = False : 傭金_cb.Checked = False
+        折扣_cb.Checked = False : 收款天數_tb.Text = ""
+    End Sub
+
+    Private Sub 全關3_bt_Click(sender As Object, e As EventArgs) Handles 全關3_bt.Click
+        現金_rb.Checked = False : 匯款_rb.Checked = False : 票期_rb.Checked = False : 買_rb.Checked = False
+        賣_rb.Checked = False : 借_rb.Checked = False : 還_rb.Checked = False : 票期天數_tb.Text = ""
+    End Sub
+
     Private Sub 累計表刪除_bt_MouseEnter(sender As Object, e As EventArgs) Handles 累計表刪除_bt.MouseEnter
         ToolTip1.SetToolTip(Me.累計表刪除_bt, "刪除累計量單")
     End Sub

OW-ERP-SYS/06、業務管理系統/訂購單審核.Designer.vb

@@ -748,6 +748,7 @@ Partial Class 訂購單審核
         Me.項次_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.項次_tb.Location = New System.Drawing.Point(1116, 59)
         Me.項次_tb.Name = "項次_tb"
+        Me.項次_tb.ReadOnly = True
         Me.項次_tb.Size = New System.Drawing.Size(50, 23)
         Me.項次_tb.TabIndex = 2045
         '

OW-ERP-SYS/0、MyModule/主資料庫/SQL_倉儲系統管理.vb

@@ -2,6 +2,28 @@
 Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 
 Module SQL_倉儲系統管理
+    '---------------------通用-----------------------------------------------------------------------------------------------------------------
+    Friend Sub SQL_庫存餘額判斷(倉名 As String, 料號 As String)
+        ConnOpen()
+        SQL1 = "SELECT
+                    物料規格表.物料料號,
+                    物料規格表.舊編號,
+                    物料規格表.名稱,
+                    物料規格表.規格1 AS 規格,
+                    ISNULL(SUM(CAST(倉儲明細表.入庫 AS float) - CAST(倉儲明細表.出庫 AS float)), 0) AS 庫存量
+                FROM
+                    物料規格表
+                LEFT JOIN 倉儲明細表 ON 物料規格表.物料料號 = 倉儲明細表.料號 AND 倉儲明細表.倉名編號  = N'" & 倉名 & "'
+				WHERE 物料料號 = N'" & 料號 & "'
+
+                GROUP BY
+                    物料規格表.物料料號,
+                    物料規格表.舊編號,
+                    物料規格表.名稱,
+                    物料規格表.規格1"
+        CmdSet_For_dr()
+    End Sub
+
     '---------------------物料資料庫-----------------------------------------------------------------------------------------------------------------
     Friend Sub SQL_物料明細表_讀取()
         ConnOpen()
@@ -608,47 +630,30 @@ Module SQL_倉儲系統管理
     Friend Sub SQL_送貨單控制表_未審核()
         ConnOpen()
         SQL1 = "SELECT   送貨單號, 訂購單號, 物流, 車號, 客戶編號,客戶資料表.客戶名稱, 電話, 送貨單控制表.地址, 備註, 申請人, 申請日期, 核准人, 核准日期, 
-                         已簽收,庫別
+                         已簽收,庫別, 已出貨, 送貨日期
                 FROM     送貨單控制表
 				LEFT OUTER JOIN 客戶資料表 ON 送貨單控制表 .客戶編號 = 客戶資料表.流水號
-                WHERE      (送貨單控制表.核准人 LIKE N'') AND  (送貨單控制表.已簽收 ='0') ORDER BY 送貨單控制表.送貨單號 DESC"
+                WHERE      (送貨單控制表.核准人 LIKE N'')  ORDER BY 送貨單控制表.送貨單號 DESC"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_送貨單控制表_已審核()
         ConnOpen()
         SQL1 = "SELECT   送貨單號, 訂購單號, 物流, 車號, 客戶編號,客戶資料表.客戶名稱, 電話, 送貨單控制表.地址, 備註, 申請人, 申請日期, 核准人, 核准日期, 
-                         已簽收,庫別
+                         已簽收,庫別, 已出貨, 送貨日期
                 FROM     送貨單控制表
 				LEFT OUTER JOIN 客戶資料表 ON 送貨單控制表 .客戶編號 = 客戶資料表.流水號
                 WHERE      (送貨單控制表.核准人 NOT LIKE N'')  ORDER BY 送貨單控制表.送貨單號 DESC"
         CmdSet_For_DGV()
     End Sub
-    Friend Sub SQL_送貨單控制表_已審未收()
-        ConnOpen()
-        SQL1 = "SELECT   送貨單號, 訂購單號, 物流, 車號, 客戶編號,客戶資料表.客戶名稱, 電話, 送貨單控制表.地址, 備註, 申請人, 申請日期, 核准人, 核准日期, 
-                         已簽收,庫別
-                FROM     送貨單控制表
-				LEFT OUTER JOIN 客戶資料表 ON 送貨單控制表 .客戶編號 = 客戶資料表.流水號
-                WHERE      (送貨單控制表.核准人 NOT LIKE N'') AND  (送貨單控制表.已簽收 ='0') ORDER BY 送貨單控制表.送貨單號 DESC"
-        CmdSet_For_DGV()
-    End Sub
-    Friend Sub SQL_送貨單控制表_已審已收()
-        ConnOpen()
-        SQL1 = "SELECT   送貨單號, 訂購單號, 物流, 車號, 客戶編號,客戶資料表.客戶名稱, 電話, 送貨單控制表.地址, 備註, 申請人, 申請日期, 核准人, 核准日期, 
-                         已簽收,庫別
-                FROM     送貨單控制表
-				LEFT OUTER JOIN 客戶資料表 ON 送貨單控制表 .客戶編號 = 客戶資料表.流水號
-                WHERE      (送貨單控制表.核准人 NOT LIKE N'') AND  (送貨單控制表.已簽收 ='1') ORDER BY 送貨單控制表.送貨單號 DESC"
-        CmdSet_For_DGV()
-    End Sub
+
     Friend Sub SQL_送貨單控制表_流水號查詢(單號 As String)
         ConnOpen() : SQL1 = "SELECT TOP (1)  送貨單號 FROM 送貨單控制表 WHERE ( 送貨單號 LIKE N'" & 單號 & "')" : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_送貨單控制表_新增(單號 As String)
         ConnOpen()
         SQL1 = "INSERT INTO 送貨單控制表 (送貨單號, 訂購單號, 物流, 車號, 客戶編號, 電話, 地址, 備註, 申請人, 申請日期, 核准人, 核准日期, 
-                            已簽收) 
-                VALUES (N'" & 單號 & "',N'',N'',N'',N'',N'',N'',N'',N'" & gUserName & "',N'" & DTP & "',N'',N'',N'0')"
+                            已簽收,庫別, 已出貨, 送貨日期) 
+                VALUES (N'" & 單號 & "',N'',N'',N'',N'',N'',N'',N'',N'" & gUserName & "',N'" & DTP & "',N'',N'',N'0',N'',N'0',N'')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_送貨單明細表_新增(單號 As String, 項次 As String, 料號 As String, 品名 As String, 規格 As String, 數量 As String)
@@ -679,10 +684,10 @@ Module SQL_倉儲系統管理
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_送貨單控制表_修改(單號 As String, 訂購單號 As String, 客戶編號 As String, 地址 As String, 電話 As String, 備註 As String,
-                             物流 As String, 車號 As String, 庫別 As String)
+                             物流 As String, 車號 As String, 庫別 As String, 送貨日期 As String)
         ConnOpen()
         SQL1 = "UPDATE 送貨單控制表 SET  訂購單號 = '" & 訂購單號 & "',客戶編號 = '" & 客戶編號 & "',地址 = '" & 地址 & "',電話 = '" & 電話 & "' ,
-                                       備註 = '" & 備註 & "' ,物流 = '" & 物流 & "',車號 = '" & 車號 & "',庫別 = '" & 庫別 & "'
+                                       備註 = '" & 備註 & "' ,物流 = '" & 物流 & "',車號 = '" & 車號 & "',庫別 = '" & 庫別 & "', 送貨日期 = '" & 送貨日期 & "'
                              WHERE 送貨單號 LIKE N'" & 單號 & "'"
         CmdSet_For_dr()
     End Sub
@@ -692,6 +697,12 @@ Module SQL_倉儲系統管理
                              WHERE 送貨單號 LIKE N'" & 單號 & "'"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_送貨單控制表_修改2(單號 As String, 已出貨 As String)
+        ConnOpen()
+        SQL1 = "UPDATE 送貨單控制表 SET  已出貨 = '" & 已出貨 & "'
+                             WHERE 送貨單號 LIKE N'" & 單號 & "'"
+        CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_送貨單核准_核准(單號 As String, 核准人 As String)
         ConnOpen() : SQL1 = "UPDATE 送貨單控制表 SET 核准人 = N'" & 核准人 & "', 核准日期 = N'" & DTP & "' WHERE (送貨單號 = N'" & 單號 & "')" : CmdSet_For_dr()
     End Sub
@@ -718,17 +729,20 @@ Module SQL_倉儲系統管理
 
         SQL1 = "SELECT
                     物料規格表.物料料號,
+                    物料規格表.舊編號,
                     物料規格表.名稱,
-                    物料規格表.規格1,
-                    ISNULL(SUM(CAST(倉儲明細表.入庫 AS float) - CAST(倉儲明細表.出庫 AS float)), 0) AS 庫存量
+                    物料規格表.規格1 AS 規格,
+                    ISNULL(SUM(CAST(倉儲明細表.入庫 AS float) - CAST(倉儲明細表.出庫 AS float)), 0) AS 庫存量,
+                    '' AS 備註
                 FROM
                     物料規格表
                 LEFT JOIN 倉儲明細表 ON 物料規格表.物料料號 = 倉儲明細表.料號 " & SQL2 & " 
 
                 GROUP BY
                     物料規格表.物料料號,
+                    物料規格表.舊編號,
                     物料規格表.名稱,
-                    物料規格表.規格1
+                    物料規格表.規格1 
                 HAVING
                      ISNULL(SUM(CAST(倉儲明細表.入庫 AS float) - CAST(倉儲明細表.出庫 AS float)), 0) " & 符號 & " 0
                 ORDER BY 庫存量 DESC"
@@ -742,4 +756,29 @@ Module SQL_倉儲系統管理
     Friend Sub SQL_物料種類_下拉清單()
         ConnOpen() : SQL1 = "SELECT DISTINCT 種類 FROM 物料規格表 ORDER BY 種類" : CmdSet_For_dr()
     End Sub
+    '---------------------盤營盤損-----------------------------------------------------------------------------------------------------------------
+    Friend Sub SQL_盤營盤損_日期清單()
+        ConnOpen()
+        SQL1 = "SELECT 倉庫作業 AS 作業人員, 作業日期
+                FROM   倉儲明細表
+                WHERE  狀態 IN ('盤營入庫', '盤損出庫')
+                GROUP BY 倉庫作業, 作業日期
+                ORDER BY 作業日期 DESC"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_盤營盤損_日期清單明細(人員 As String, 日期 As String)
+        ConnOpen()
+        SQL1 = "SELECT      資料流水號, 倉儲分區控制表.倉名 AS 庫別, 物料規格表.舊編號,料號, 物料規格表.名稱, 物料規格表.規格1 AS 規格,審核人 AS 庫存量 ,審核日期 AS 盤點量,入庫 AS 盤營數, 出庫 AS 盤損數,倉儲明細表.備註
+                FROM   倉儲明細表
+                LEFT OUTER JOIN 倉儲分區控制表 ON 倉儲明細表.倉級= 倉儲分區控制表.倉級 AND 倉儲明細表.倉名編號= 倉儲分區控制表.倉名編號
+                LEFT OUTER JOIN 物料規格表 ON 倉儲明細表.料號= 物料規格表.物料料號
+                WHERE  狀態 IN ('盤營入庫', '盤損出庫') AND 倉庫作業 = '" & 人員 & "' AND 作業日期 ='" & 日期 & "'"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_盤營盤損_倉儲明細表(流水號 As String, 庫存數 As String, 盤點數 As String)
+        ConnOpen()
+        SQL1 = "UPDATE 倉儲明細表 SET  審核人 = '" & 庫存數 & "' , 審核日期 = '" & 盤點數 & "'
+                             WHERE 資料流水號 LIKE N'" & 流水號 & "'"
+        CmdSet_For_dr()
+    End Sub
 End Module

OW-ERP-SYS/0、MyModule/主資料庫/SQL_技術管理系統.vb

@@ -406,10 +406,10 @@ Module SQL_技術管理系統
     Friend Sub SQL_料號選擇選項_讀取(種類 As String, 關鍵字 As String)
         ConnOpen()
         SQL1 = "SELECT      物料規格表.物料料號 AS 項次, 
-                        物料規格表.物料料號, 
+                        物料規格表.舊編號, 
                         物料規格表.名稱, 
                         物料規格表.規格1, 
-                        物料規格表.舊編號, 
+                        物料規格表.物料料號, 
                         OW空白圖片.圖片 AS 加入
             FROM        物料規格表 
             LEFT OUTER JOIN OW空白圖片 ON 物料規格表.物料料號 = OW空白圖片.選擇
@@ -729,17 +729,21 @@ Module SQL_技術管理系統
     Friend Sub SQL_生產製程_再製清單()
         ConnOpen()
         SQL1 = "SELECT
+                    物料規格表.舊編號,
                     物料規格表.物料料號,
                     物料規格表.名稱,
                     物料規格表.規格1,
-                    ISNULL(SUM(CAST(倉儲明細表.入庫 AS float) - CAST(倉儲明細表.出庫 AS float)), 0) AS 庫存量
+                    ISNULL(SUM(CAST(倉儲明細表.入庫 AS float) - CAST(倉儲明細表.出庫 AS float)), 0) AS 庫存量,
+                    物料規格表.單位
                 FROM
                     物料規格表
                 LEFT JOIN 倉儲明細表 ON 物料規格表.物料料號 = 倉儲明細表.料號 AND 倉儲明細表.倉名編號  LIKE N'%N05%'
                 GROUP BY
+                    物料規格表.舊編號,
                     物料規格表.物料料號,
                     物料規格表.名稱,
-                    物料規格表.規格1
+                    物料規格表.規格1,
+                    物料規格表.單位
                 HAVING
                      ISNULL(SUM(CAST(倉儲明細表.入庫 AS float) - CAST(倉儲明細表.出庫 AS float)), 0) <> 0
                 ORDER BY 庫存量 DESC"