出入库界面修改

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.Designer.cs

@@ -63,7 +63,7 @@
             this.pim_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lnk = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.blank = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
@@ -297,7 +297,7 @@
             this.pim_prodcode,
             this.pr_detail,
             this.pr_spec,
-            this.lnk});
+            this.blank});
             this.InOutDetailDGV.EnableContentClick = true;
             this.InOutDetailDGV.Location = new System.Drawing.Point(9, 66);
             this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
@@ -433,10 +433,10 @@
             // 
             this.pim_outboxcode.DataPropertyName = "pim_outboxcode";
             this.pim_outboxcode.HeaderText = "栈板/箱号";
-            this.pim_outboxcode.MinimumWidth = 120;
+            this.pim_outboxcode.MinimumWidth = 2;
             this.pim_outboxcode.Name = "pim_outboxcode";
             this.pim_outboxcode.ReadOnly = true;
-            this.pim_outboxcode.Width = 120;
+            this.pim_outboxcode.Width = 150;
             // 
             // pim_mac
             // 
@@ -463,15 +463,18 @@
             // 
             this.pr_spec.DataPropertyName = "pr_spec";
             this.pr_spec.HeaderText = "规格";
+            this.pr_spec.MinimumWidth = 200;
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.ReadOnly = true;
+            this.pr_spec.Width = 200;
             // 
-            // lnk
+            // blank
             // 
-            this.lnk.HeaderText = "";
-            this.lnk.MinimumWidth = 2;
-            this.lnk.Name = "lnk";
-            this.lnk.Width = 2;
+            this.blank.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.blank.HeaderText = "";
+            this.blank.MinimumWidth = 2;
+            this.blank.Name = "blank";
+            this.blank.Width = 2;
             // 
             // Warehouse_FinishedProductOut
             // 
@@ -548,6 +551,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pim_prodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lnk;
+        private System.Windows.Forms.DataGridViewTextBoxColumn blank;
     }
 }

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -253,6 +253,11 @@ namespace UAS_MES.Warehouse
                 {
                     if (!cancel.Checked)
                     {
+                        if (dta.Rows[0]["pi_pdastatus"].ToString() == "已出库")
+                        {
+                            OperateResult.AppendText("出货单" + pi_inoutno.Text + "已经出库不允许备货\n", Color.Red);
+                            return;
+                        }
                         if (palletBtn.Checked)
                         {
                             string pa_makecode = "";

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.resx

@@ -174,7 +174,7 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="lnk.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="blank.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="ConfirmOut.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.Designer.cs

@@ -224,9 +224,10 @@
             // 
             this.pr_spec.DataPropertyName = "pr_spec";
             this.pr_spec.HeaderText = "规格";
+            this.pr_spec.MinimumWidth = 200;
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.ReadOnly = true;
-            this.pr_spec.Width = 124;
+            this.pr_spec.Width = 200;
             // 
             // Sp
             //