更新语句的修改

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

@@ -33,6 +33,10 @@
             this.pi_titile_label = new System.Windows.Forms.Label();
             this.pi_title = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.boxqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ungetqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.outqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.label10 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
@@ -53,10 +57,6 @@
             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.boxqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.ungetqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.outqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ConfirmOut = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.NewProdInOut = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ProdDetail = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -111,6 +111,50 @@
             this.panel1.Size = new System.Drawing.Size(169, 195);
             this.panel1.TabIndex = 217;
             // 
+            // boxqty
+            // 
+            this.boxqty.AutoSize = true;
+            this.boxqty.CutLength = null;
+            this.boxqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.boxqty.Location = new System.Drawing.Point(80, 144);
+            this.boxqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.boxqty.Name = "boxqty";
+            this.boxqty.Size = new System.Drawing.Size(0, 21);
+            this.boxqty.TabIndex = 227;
+            // 
+            // getqty
+            // 
+            this.getqty.AutoSize = true;
+            this.getqty.CutLength = null;
+            this.getqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.getqty.Location = new System.Drawing.Point(80, 107);
+            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.getqty.Name = "getqty";
+            this.getqty.Size = new System.Drawing.Size(0, 21);
+            this.getqty.TabIndex = 226;
+            // 
+            // ungetqty
+            // 
+            this.ungetqty.AutoSize = true;
+            this.ungetqty.CutLength = null;
+            this.ungetqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ungetqty.Location = new System.Drawing.Point(80, 60);
+            this.ungetqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ungetqty.Name = "ungetqty";
+            this.ungetqty.Size = new System.Drawing.Size(0, 21);
+            this.ungetqty.TabIndex = 225;
+            // 
+            // outqty
+            // 
+            this.outqty.AutoSize = true;
+            this.outqty.CutLength = null;
+            this.outqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.outqty.Location = new System.Drawing.Point(80, 17);
+            this.outqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.outqty.Name = "outqty";
+            this.outqty.Size = new System.Drawing.Size(0, 21);
+            this.outqty.TabIndex = 224;
+            // 
             // label10
             // 
             this.label10.AutoSize = true;
@@ -257,7 +301,7 @@
             this.Clean.Power = null;
             this.Clean.Size = new System.Drawing.Size(74, 20);
             this.Clean.TabIndex = 224;
-            this.Clean.Text = "清除明细";
+            this.Clean.Text = "取消采集";
             this.Clean.UseVisualStyleBackColor = false;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
@@ -329,50 +373,6 @@
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.ReadOnly = true;
             // 
-            // boxqty
-            // 
-            this.boxqty.AutoSize = true;
-            this.boxqty.CutLength = null;
-            this.boxqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.boxqty.Location = new System.Drawing.Point(80, 144);
-            this.boxqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.boxqty.Name = "boxqty";
-            this.boxqty.Size = new System.Drawing.Size(0, 21);
-            this.boxqty.TabIndex = 227;
-            // 
-            // getqty
-            // 
-            this.getqty.AutoSize = true;
-            this.getqty.CutLength = null;
-            this.getqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.getqty.Location = new System.Drawing.Point(80, 107);
-            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.getqty.Name = "getqty";
-            this.getqty.Size = new System.Drawing.Size(0, 21);
-            this.getqty.TabIndex = 226;
-            // 
-            // ungetqty
-            // 
-            this.ungetqty.AutoSize = true;
-            this.ungetqty.CutLength = null;
-            this.ungetqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ungetqty.Location = new System.Drawing.Point(80, 60);
-            this.ungetqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.ungetqty.Name = "ungetqty";
-            this.ungetqty.Size = new System.Drawing.Size(0, 21);
-            this.ungetqty.TabIndex = 225;
-            // 
-            // outqty
-            // 
-            this.outqty.AutoSize = true;
-            this.outqty.CutLength = null;
-            this.outqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outqty.Location = new System.Drawing.Point(80, 17);
-            this.outqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.outqty.Name = "outqty";
-            this.outqty.Size = new System.Drawing.Size(0, 21);
-            this.outqty.TabIndex = 224;
-            // 
             // ConfirmOut
             // 
             this.ConfirmOut.AllPower = null;

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -571,7 +571,7 @@ namespace UAS_MES.Warehouse
                     return;
                 }
                 List<String> ExeSQL = new List<string>();
-                ExeSQL.Add("update makeserial set ms_iostatus=1 where exists (select 1 from prodiomac where pim_inoutno='" + pi_inoutno.Text + " ' and pim_mac=ms_sncode and pim_prodcode=ms_prodcode and nvl(pim_outboxcode,' ')=' ') and ms_status=2");
+                ExeSQL.Add("update makeserial set ms_iostatus=1 where exists (select 1 from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_mac=ms_sncode and pim_prodcode=ms_prodcode and nvl(pim_outboxcode,' ')=' ') and ms_status=2");
                 ExeSQL.Add("update package set pa_outno = '' where exists (select 1 from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_outboxcode=pa_outboxcode and ((pim_type='PALLET' AND PA_TYPE=3) OR (PIM_TYPE='BOX' AND PA_TYPE IN(1,2)))) AND PA_OUTNO='" + pi_inoutno.Text + "'");
                 ExeSQL.Add("delete from prodiomac where pim_inoutno='" + pi_inoutno.Text + "'");
                 ExeSQL.Add("update prodinout set pi_pdastatus='未备货' where pi_inoutno='" + pi_inoutno.Text + "'");