BUG调整

UAS_MES_YD/App.config

@@ -72,7 +72,7 @@
   <applicationSettings>
     <UAS_MES_NEW.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_YD;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=81.71.42.91)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=81.71.42.91)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES_NEW.Properties.Settings>
   </applicationSettings>

UAS_MES_YD/FunctionCode/Make/Make_Repair.cs

@@ -594,7 +594,7 @@ namespace UAS_MES_NEW.Make
                     SQLS.Add("update makebad set mb_status=-1 where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ms_makecode.Text + "'");
                     //取消最近拆解部件
                     SQLS.Add("update craftmaterial set cm_lastdeco=0 where cm_sncode='" + ms_sncode.Text + "' and cm_makecode='" + ms_makecode.Text + "' and nvl(cm_lastdeco,0)<>0");
-                    SQLS.Add("update MakeBadCount set mbc_status=-1 where mbc_sncode='" + ms_sncode.Text + "'");
+                   // SQLS.Add("update MakeBadCount set mbc_status=-1 where mbc_sncode='" + ms_sncode.Text + "'");
                     dh.ExecuteSQLTran(SQLS.ToArray());
                     LogicHandler.InsertMakeProcess(ms_sncode.Text, ms_makecode.Text, User.UserSourceCode, "回流工序", "完成维修回流", User.UserCode);
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "回流工序", "完成维修回流", ms_sncode.Text, ms_checkno.Text);

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_FinishedProductIn.Designer.cs

@@ -28,19 +28,599 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.valueLabel1 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.richTextAutoBottom1 = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.richTextAutoBottom2 = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.searchTextBox1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.valueLabel2 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.valueLabel3 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.textBox2 = new System.Windows.Forms.TextBox();
+            this.searchTextBox2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.bigboxBtn = new System.Windows.Forms.RadioButton();
+            this.serBtn = new System.Windows.Forms.RadioButton();
+            this.palletBtn = new System.Windows.Forms.RadioButton();
+            this.searchTextBox3 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.valueLabel4 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.valueLabel5 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.valueLabel6 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.valueLabel7 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.valueLabel8 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.valueLabel9 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.valueLabel10 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.valueLabel11 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.dataGridView2 = new System.Windows.Forms.DataGridView();
+            this.valueLabel12 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.textBox3 = new System.Windows.Forms.TextBox();
+            this.searchTextBox4 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.valueLabel13 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.radioButton3 = new System.Windows.Forms.RadioButton();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.valueLabel14 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.valueLabel15 = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.checkBox1 = new System.Windows.Forms.CheckBox();
+            this.checkBox2 = new System.Windows.Forms.CheckBox();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
             this.SuspendLayout();
             // 
-            // 完工入库
+            // valueLabel1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.valueLabel1.AutoSize = true;
+            this.valueLabel1.CutLength = null;
+            this.valueLabel1.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel1.Location = new System.Drawing.Point(52, 27);
+            this.valueLabel1.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel1.Name = "valueLabel1";
+            this.valueLabel1.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel1.TabIndex = 1;
+            this.valueLabel1.Text = "岗位资源";
+            // 
+            // richTextAutoBottom1
+            // 
+            this.richTextAutoBottom1.Location = new System.Drawing.Point(-43, -88);
+            this.richTextAutoBottom1.Name = "richTextAutoBottom1";
+            this.richTextAutoBottom1.Size = new System.Drawing.Size(100, 96);
+            this.richTextAutoBottom1.TabIndex = 2;
+            this.richTextAutoBottom1.Text = "";
+            // 
+            // richTextAutoBottom2
+            // 
+            this.richTextAutoBottom2.Location = new System.Drawing.Point(59, 374);
+            this.richTextAutoBottom2.Name = "richTextAutoBottom2";
+            this.richTextAutoBottom2.Size = new System.Drawing.Size(521, 152);
+            this.richTextAutoBottom2.TabIndex = 3;
+            this.richTextAutoBottom2.Text = "SN:12345采集成功";
+            this.richTextAutoBottom2.TextChanged += new System.EventHandler(this.richTextAutoBottom2_TextChanged);
+            // 
+            // searchTextBox1
+            // 
+            this.searchTextBox1.AllPower = null;
+            this.searchTextBox1.Caller = null;
+            this.searchTextBox1.Condition = null;
+            this.searchTextBox1.DBTitle = null;
+            this.searchTextBox1.Font = new System.Drawing.Font("宋体", 14F);
+            this.searchTextBox1.FormName = null;
+            this.searchTextBox1.Location = new System.Drawing.Point(244, 90);
+            this.searchTextBox1.Name = "searchTextBox1";
+            this.searchTextBox1.Power = null;
+            this.searchTextBox1.ReturnData = null;
+            this.searchTextBox1.SelectField = null;
+            this.searchTextBox1.SetValueField = null;
+            this.searchTextBox1.Size = new System.Drawing.Size(336, 38);
+            this.searchTextBox1.TabIndex = 4;
+            this.searchTextBox1.TableName = null;
+            this.searchTextBox1.TextBoxEnable = false;
+            // 
+            // valueLabel2
+            // 
+            this.valueLabel2.AutoSize = true;
+            this.valueLabel2.CutLength = null;
+            this.valueLabel2.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel2.Location = new System.Drawing.Point(52, 90);
+            this.valueLabel2.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel2.Name = "valueLabel2";
+            this.valueLabel2.Size = new System.Drawing.Size(131, 38);
+            this.valueLabel2.TabIndex = 5;
+            this.valueLabel2.Text = "工单号";
+            // 
+            // valueLabel3
+            // 
+            this.valueLabel3.AutoSize = true;
+            this.valueLabel3.CutLength = null;
+            this.valueLabel3.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel3.Location = new System.Drawing.Point(52, 314);
+            this.valueLabel3.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel3.Name = "valueLabel3";
+            this.valueLabel3.Size = new System.Drawing.Size(55, 38);
+            this.valueLabel3.TabIndex = 7;
+            this.valueLabel3.Text = "SN";
+            // 
+            // textBox2
+            // 
+            this.textBox2.Location = new System.Drawing.Point(244, 317);
+            this.textBox2.Name = "textBox2";
+            this.textBox2.Size = new System.Drawing.Size(316, 35);
+            this.textBox2.TabIndex = 6;
+            // 
+            // searchTextBox2
+            // 
+            this.searchTextBox2.AllPower = null;
+            this.searchTextBox2.Caller = null;
+            this.searchTextBox2.Condition = null;
+            this.searchTextBox2.DBTitle = null;
+            this.searchTextBox2.Font = new System.Drawing.Font("宋体", 14F);
+            this.searchTextBox2.FormName = null;
+            this.searchTextBox2.Location = new System.Drawing.Point(244, 27);
+            this.searchTextBox2.Name = "searchTextBox2";
+            this.searchTextBox2.Power = null;
+            this.searchTextBox2.ReturnData = null;
+            this.searchTextBox2.SelectField = null;
+            this.searchTextBox2.SetValueField = null;
+            this.searchTextBox2.Size = new System.Drawing.Size(336, 38);
+            this.searchTextBox2.TabIndex = 8;
+            this.searchTextBox2.TableName = null;
+            this.searchTextBox2.TextBoxEnable = true;
+            this.searchTextBox2.Load += new System.EventHandler(this.searchTextBox2_Load);
+            // 
+            // bigboxBtn
+            // 
+            this.bigboxBtn.AutoSize = true;
+            this.bigboxBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.bigboxBtn.Location = new System.Drawing.Point(799, 192);
+            this.bigboxBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.bigboxBtn.Name = "bigboxBtn";
+            this.bigboxBtn.Size = new System.Drawing.Size(113, 45);
+            this.bigboxBtn.TabIndex = 234;
+            this.bigboxBtn.Text = "箱号";
+            this.bigboxBtn.UseVisualStyleBackColor = true;
+            // 
+            // serBtn
+            // 
+            this.serBtn.AutoSize = true;
+            this.serBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.serBtn.Location = new System.Drawing.Point(957, 189);
+            this.serBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.serBtn.Name = "serBtn";
+            this.serBtn.Size = new System.Drawing.Size(209, 45);
+            this.serBtn.TabIndex = 233;
+            this.serBtn.Text = "单台序列号";
+            this.serBtn.UseVisualStyleBackColor = true;
+            // 
+            // palletBtn
+            // 
+            this.palletBtn.AutoSize = true;
+            this.palletBtn.Checked = true;
+            this.palletBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.palletBtn.Location = new System.Drawing.Point(619, 193);
+            this.palletBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.palletBtn.Name = "palletBtn";
+            this.palletBtn.Size = new System.Drawing.Size(145, 45);
+            this.palletBtn.TabIndex = 232;
+            this.palletBtn.TabStop = true;
+            this.palletBtn.Text = "栈板号";
+            this.palletBtn.UseVisualStyleBackColor = true;
+            // 
+            // searchTextBox3
+            // 
+            this.searchTextBox3.AllPower = null;
+            this.searchTextBox3.Caller = null;
+            this.searchTextBox3.Condition = null;
+            this.searchTextBox3.DBTitle = null;
+            this.searchTextBox3.Font = new System.Drawing.Font("宋体", 14F);
+            this.searchTextBox3.FormName = null;
+            this.searchTextBox3.Location = new System.Drawing.Point(802, 37);
+            this.searchTextBox3.Name = "searchTextBox3";
+            this.searchTextBox3.Power = null;
+            this.searchTextBox3.ReturnData = null;
+            this.searchTextBox3.SelectField = null;
+            this.searchTextBox3.SetValueField = null;
+            this.searchTextBox3.Size = new System.Drawing.Size(336, 38);
+            this.searchTextBox3.TabIndex = 236;
+            this.searchTextBox3.TableName = null;
+            this.searchTextBox3.TextBoxEnable = false;
+            // 
+            // valueLabel4
+            // 
+            this.valueLabel4.AutoSize = true;
+            this.valueLabel4.CutLength = null;
+            this.valueLabel4.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel4.Location = new System.Drawing.Point(627, 37);
+            this.valueLabel4.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel4.Name = "valueLabel4";
+            this.valueLabel4.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel4.TabIndex = 235;
+            this.valueLabel4.Text = "入库单号";
+            // 
+            // valueLabel5
+            // 
+            this.valueLabel5.AutoSize = true;
+            this.valueLabel5.CutLength = null;
+            this.valueLabel5.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel5.Location = new System.Drawing.Point(612, 302);
+            this.valueLabel5.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel5.Name = "valueLabel5";
+            this.valueLabel5.Size = new System.Drawing.Size(131, 38);
+            this.valueLabel5.TabIndex = 238;
+            this.valueLabel5.Text = "录入框";
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(804, 305);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(316, 35);
+            this.textBox1.TabIndex = 237;
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column1,
+            this.Column2,
+            this.Column3});
+            this.dataGridView1.Location = new System.Drawing.Point(619, 359);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.RowTemplate.Height = 37;
+            this.dataGridView1.Size = new System.Drawing.Size(526, 318);
+            this.dataGridView1.TabIndex = 239;
+            // 
+            // valueLabel6
+            // 
+            this.valueLabel6.AutoSize = true;
+            this.valueLabel6.CutLength = null;
+            this.valueLabel6.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel6.Location = new System.Drawing.Point(627, 90);
+            this.valueLabel6.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel6.Name = "valueLabel6";
+            this.valueLabel6.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel6.TabIndex = 240;
+            this.valueLabel6.Text = "产品编号";
+            // 
+            // valueLabel7
+            // 
+            this.valueLabel7.AutoSize = true;
+            this.valueLabel7.CutLength = null;
+            this.valueLabel7.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel7.Location = new System.Drawing.Point(627, 144);
+            this.valueLabel7.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel7.Name = "valueLabel7";
+            this.valueLabel7.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel7.TabIndex = 241;
+            this.valueLabel7.Text = "产品名称";
+            // 
+            // valueLabel8
+            // 
+            this.valueLabel8.AutoSize = true;
+            this.valueLabel8.CutLength = null;
+            this.valueLabel8.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel8.Location = new System.Drawing.Point(52, 257);
+            this.valueLabel8.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel8.Name = "valueLabel8";
+            this.valueLabel8.Size = new System.Drawing.Size(131, 38);
+            this.valueLabel8.TabIndex = 242;
+            this.valueLabel8.Text = "已采集";
+            // 
+            // valueLabel9
+            // 
+            this.valueLabel9.AutoSize = true;
+            this.valueLabel9.CutLength = null;
+            this.valueLabel9.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel9.Location = new System.Drawing.Point(314, 257);
+            this.valueLabel9.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel9.Name = "valueLabel9";
+            this.valueLabel9.Size = new System.Drawing.Size(131, 38);
+            this.valueLabel9.TabIndex = 243;
+            this.valueLabel9.Text = "待采集";
+            // 
+            // Column1
+            // 
+            this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.Column1.HeaderText = "产品编号";
+            this.Column1.Name = "Column1";
+            this.Column1.Width = 151;
+            // 
+            // Column2
+            // 
+            this.Column2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.Column2.HeaderText = "入库数量";
+            this.Column2.Name = "Column2";
+            this.Column2.Width = 151;
+            // 
+            // Column3
+            // 
+            this.Column3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.Column3.HeaderText = "已采集数量";
+            this.Column3.Name = "Column3";
+            this.Column3.Width = 175;
+            // 
+            // valueLabel10
+            // 
+            this.valueLabel10.AutoSize = true;
+            this.valueLabel10.CutLength = null;
+            this.valueLabel10.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel10.Location = new System.Drawing.Point(1275, 148);
+            this.valueLabel10.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel10.Name = "valueLabel10";
+            this.valueLabel10.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel10.TabIndex = 263;
+            this.valueLabel10.Text = "产品名称";
+            // 
+            // valueLabel11
+            // 
+            this.valueLabel11.AutoSize = true;
+            this.valueLabel11.CutLength = null;
+            this.valueLabel11.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel11.Location = new System.Drawing.Point(1275, 94);
+            this.valueLabel11.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel11.Name = "valueLabel11";
+            this.valueLabel11.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel11.TabIndex = 262;
+            this.valueLabel11.Text = "产品编号";
+            // 
+            // dataGridView2
+            // 
+            this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3});
+            this.dataGridView2.Location = new System.Drawing.Point(1282, 359);
+            this.dataGridView2.Name = "dataGridView2";
+            this.dataGridView2.RowTemplate.Height = 37;
+            this.dataGridView2.Size = new System.Drawing.Size(526, 318);
+            this.dataGridView2.TabIndex = 261;
+            // 
+            // valueLabel12
+            // 
+            this.valueLabel12.AutoSize = true;
+            this.valueLabel12.CutLength = null;
+            this.valueLabel12.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel12.Location = new System.Drawing.Point(1275, 302);
+            this.valueLabel12.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel12.Name = "valueLabel12";
+            this.valueLabel12.Size = new System.Drawing.Size(131, 38);
+            this.valueLabel12.TabIndex = 260;
+            this.valueLabel12.Text = "录入框";
+            // 
+            // textBox3
+            // 
+            this.textBox3.Location = new System.Drawing.Point(1467, 305);
+            this.textBox3.Name = "textBox3";
+            this.textBox3.Size = new System.Drawing.Size(316, 35);
+            this.textBox3.TabIndex = 259;
+            // 
+            // searchTextBox4
+            // 
+            this.searchTextBox4.AllPower = null;
+            this.searchTextBox4.Caller = null;
+            this.searchTextBox4.Condition = null;
+            this.searchTextBox4.DBTitle = null;
+            this.searchTextBox4.Font = new System.Drawing.Font("宋体", 14F);
+            this.searchTextBox4.FormName = null;
+            this.searchTextBox4.Location = new System.Drawing.Point(1447, 41);
+            this.searchTextBox4.Name = "searchTextBox4";
+            this.searchTextBox4.Power = null;
+            this.searchTextBox4.ReturnData = null;
+            this.searchTextBox4.SelectField = null;
+            this.searchTextBox4.SetValueField = null;
+            this.searchTextBox4.Size = new System.Drawing.Size(336, 38);
+            this.searchTextBox4.TabIndex = 258;
+            this.searchTextBox4.TableName = null;
+            this.searchTextBox4.TextBoxEnable = false;
+            // 
+            // valueLabel13
+            // 
+            this.valueLabel13.AutoSize = true;
+            this.valueLabel13.CutLength = null;
+            this.valueLabel13.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel13.Location = new System.Drawing.Point(1260, 41);
+            this.valueLabel13.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel13.Name = "valueLabel13";
+            this.valueLabel13.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel13.TabIndex = 257;
+            this.valueLabel13.Text = "出库单号";
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.radioButton1.Location = new System.Drawing.Point(1447, 193);
+            this.radioButton1.Margin = new System.Windows.Forms.Padding(4);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(113, 45);
+            this.radioButton1.TabIndex = 256;
+            this.radioButton1.Text = "箱号";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.radioButton2.Location = new System.Drawing.Point(1605, 193);
+            this.radioButton2.Margin = new System.Windows.Forms.Padding(4);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(209, 45);
+            this.radioButton2.TabIndex = 255;
+            this.radioButton2.Text = "单台序列号";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton3
+            // 
+            this.radioButton3.AutoSize = true;
+            this.radioButton3.Checked = true;
+            this.radioButton3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.radioButton3.Location = new System.Drawing.Point(1267, 193);
+            this.radioButton3.Margin = new System.Windows.Forms.Padding(4);
+            this.radioButton3.Name = "radioButton3";
+            this.radioButton3.Size = new System.Drawing.Size(145, 45);
+            this.radioButton3.TabIndex = 254;
+            this.radioButton3.TabStop = true;
+            this.radioButton3.Text = "栈板号";
+            this.radioButton3.UseVisualStyleBackColor = true;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn1.HeaderText = "产品编号";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 151;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn2.HeaderText = "出库数量";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 151;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn3.HeaderText = "已采集数量";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 175;
+            // 
+            // valueLabel14
+            // 
+            this.valueLabel14.AutoSize = true;
+            this.valueLabel14.CutLength = null;
+            this.valueLabel14.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel14.Location = new System.Drawing.Point(52, 202);
+            this.valueLabel14.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel14.Name = "valueLabel14";
+            this.valueLabel14.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel14.TabIndex = 265;
+            this.valueLabel14.Text = "产品名称";
+            // 
+            // valueLabel15
+            // 
+            this.valueLabel15.AutoSize = true;
+            this.valueLabel15.CutLength = null;
+            this.valueLabel15.Font = new System.Drawing.Font("宋体", 14F);
+            this.valueLabel15.Location = new System.Drawing.Point(52, 148);
+            this.valueLabel15.MaximumSize = new System.Drawing.Size(200, 0);
+            this.valueLabel15.Name = "valueLabel15";
+            this.valueLabel15.Size = new System.Drawing.Size(169, 38);
+            this.valueLabel15.TabIndex = 264;
+            this.valueLabel15.Text = "产品编号";
+            // 
+            // checkBox1
+            // 
+            this.checkBox1.AutoSize = true;
+            this.checkBox1.Location = new System.Drawing.Point(619, 257);
+            this.checkBox1.Name = "checkBox1";
+            this.checkBox1.Size = new System.Drawing.Size(138, 28);
+            this.checkBox1.TabIndex = 266;
+            this.checkBox1.Text = "取消入库";
+            this.checkBox1.UseVisualStyleBackColor = true;
+            // 
+            // checkBox2
+            // 
+            this.checkBox2.AutoSize = true;
+            this.checkBox2.Location = new System.Drawing.Point(1282, 257);
+            this.checkBox2.Name = "checkBox2";
+            this.checkBox2.Size = new System.Drawing.Size(138, 28);
+            this.checkBox2.TabIndex = 267;
+            this.checkBox2.Text = "取消出库";
+            this.checkBox2.UseVisualStyleBackColor = true;
+            // 
+            // Warehouse_FinishedProductIn
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1103, 651);
-            this.Name = "完工入库";
-            this.Text = "完工入库";
+            this.ClientSize = new System.Drawing.Size(1862, 1042);
+            this.Controls.Add(this.checkBox2);
+            this.Controls.Add(this.checkBox1);
+            this.Controls.Add(this.valueLabel14);
+            this.Controls.Add(this.valueLabel15);
+            this.Controls.Add(this.valueLabel10);
+            this.Controls.Add(this.valueLabel11);
+            this.Controls.Add(this.dataGridView2);
+            this.Controls.Add(this.valueLabel12);
+            this.Controls.Add(this.textBox3);
+            this.Controls.Add(this.searchTextBox4);
+            this.Controls.Add(this.valueLabel13);
+            this.Controls.Add(this.radioButton1);
+            this.Controls.Add(this.radioButton2);
+            this.Controls.Add(this.radioButton3);
+            this.Controls.Add(this.valueLabel9);
+            this.Controls.Add(this.valueLabel8);
+            this.Controls.Add(this.valueLabel7);
+            this.Controls.Add(this.valueLabel6);
+            this.Controls.Add(this.dataGridView1);
+            this.Controls.Add(this.valueLabel5);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.searchTextBox3);
+            this.Controls.Add(this.valueLabel4);
+            this.Controls.Add(this.bigboxBtn);
+            this.Controls.Add(this.serBtn);
+            this.Controls.Add(this.palletBtn);
+            this.Controls.Add(this.searchTextBox2);
+            this.Controls.Add(this.valueLabel3);
+            this.Controls.Add(this.textBox2);
+            this.Controls.Add(this.valueLabel2);
+            this.Controls.Add(this.searchTextBox1);
+            this.Controls.Add(this.richTextAutoBottom2);
+            this.Controls.Add(this.richTextAutoBottom1);
+            this.Controls.Add(this.valueLabel1);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Name = "Warehouse_FinishedProductIn";
+            this.Text = "SN采集过站";
+            this.Load += new System.EventHandler(this.Warehouse_FinishedProductIn_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
+        private CustomControl.ValueLabel.ValueLabel valueLabel1;
+        private CustomControl.RichText.RichTextAutoBottom richTextAutoBottom1;
+        private CustomControl.RichText.RichTextAutoBottom richTextAutoBottom2;
+        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox1;
+        private CustomControl.ValueLabel.ValueLabel valueLabel2;
+        private CustomControl.ValueLabel.ValueLabel valueLabel3;
+        private System.Windows.Forms.TextBox textBox2;
+        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox2;
+        private System.Windows.Forms.RadioButton bigboxBtn;
+        private System.Windows.Forms.RadioButton serBtn;
+        private System.Windows.Forms.RadioButton palletBtn;
+        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox3;
+        private CustomControl.ValueLabel.ValueLabel valueLabel4;
+        private CustomControl.ValueLabel.ValueLabel valueLabel5;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.DataGridView dataGridView1;
+        private CustomControl.ValueLabel.ValueLabel valueLabel6;
+        private CustomControl.ValueLabel.ValueLabel valueLabel7;
+        private CustomControl.ValueLabel.ValueLabel valueLabel8;
+        private CustomControl.ValueLabel.ValueLabel valueLabel9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private CustomControl.ValueLabel.ValueLabel valueLabel10;
+        private CustomControl.ValueLabel.ValueLabel valueLabel11;
+        private System.Windows.Forms.DataGridView dataGridView2;
+        private CustomControl.ValueLabel.ValueLabel valueLabel12;
+        private System.Windows.Forms.TextBox textBox3;
+        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox4;
+        private CustomControl.ValueLabel.ValueLabel valueLabel13;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private CustomControl.ValueLabel.ValueLabel valueLabel14;
+        private CustomControl.ValueLabel.ValueLabel valueLabel15;
+        private System.Windows.Forms.CheckBox checkBox1;
+        private System.Windows.Forms.CheckBox checkBox2;
     }
 }

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_FinishedProductIn.cs

@@ -15,5 +15,20 @@ namespace UAS_MES_NEW.Warehouse
         {
             InitializeComponent();
         }
+
+        private void richTextAutoBottom2_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void Warehouse_FinishedProductIn_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void searchTextBox2_Load(object sender, EventArgs e)
+        {
+
+        }
     }
 }

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_FinishedProductIn.resx

@@ -117,4 +117,40 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -783,22 +783,6 @@ namespace UAS_MES_NEW.Warehouse
                     sql.Append("and ms_outno is null group by ms_prodcode,ms_salecode) left join (select pd_ordercode,pd_prodcode,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode=pd_prodcode),0)ungetqty");
                     sql.Append(" from (select pd_ordercode,pd_prodcode,sum(pd_outqty)outqty from prodiodetail where pd_piid=" + pi_id.Text + " group by pd_prodcode,pd_ordercode))  on 1=1 where ms_prodcode<>pd_prodcode or ms_salecode<>pd_ordercode  or (cn>nvl(ungetqty,0))");
                     DataTable dtAA = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    //if (dtAA.Rows.Count > 0)
-                    //{
-                    //    //string badmessgae = "";
-                    //    //for (int i = 0; i < dtAA.Rows.Count; i++)
-                    //    //{
-                    //    //    badmessgae += "产品号:" + dtAA.Rows[i]["ms_prodcode"].ToString() + "，订单号:" + dtAA.Rows[i]["ms_salecode"].ToString() + "，数量:" + dtAA.Rows[i]["cn"].ToString() + "\n";
-                    //    //}
-                    //    //OperateResult.AppendText(type + input.Text + "内的序列号中的产品+订单不在出货单中或者所装的序列号的数量大于剩余出货数，" + badmessgae, Color.Red, input);
-                    //    //return false;
-                    //}
-                    //else
-                    //{
-                    //    //插入prodiomac表
-                    //    insertprodiomac(type);
-                    //    return true;
-                    //}
                     insertprodiomac(type);
                     return true;
                 }
@@ -809,24 +793,6 @@ namespace UAS_MES_NEW.Warehouse
                     sql.Append("and ms_outno is null group by ms_prodcode) left join (select pd_prodcode,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode=pd_prodcode),0)ungetqty");
                     sql.Append(" from (select pd_prodcode,sum(pd_outqty)outqty from prodiodetail where pd_piid=" + pi_id.Text + " group by pd_prodcode))  on 1=1 where ms_prodcode<>pd_prodcode   or (cn>nvl(ungetqty,0))");
                     DataTable dtAA = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    //if (dtAA.Rows.Count > 0)
-                    //{
-                    //    //string badmessgae = "";
-                    //    //for (int i = 0; i < dtAA.Rows.Count; i++)
-                    //    //{
-                    //    //    badmessgae += "产品号:" + dtAA.Rows[i]["ms_prodcode"].ToString() + "，数量:" + dtAA.Rows[i]["cn"].ToString() + "\n";
-                    //    //}
-                    //    //OperateResult.AppendText(type + input.Text + "内的序列号中的产品不在出货单中或者所装的序列号的数量大于剩余出货数，" + badmessgae, Color.Red, input);
-                    //    //return false;
-                    //    insertprodiomac(type);
-                    //    return true;
-                    //}
-                    //else
-                    //{
-                    //    //插入prodiomac表
-                    //    insertprodiomac(type);
-                    //    return true;
-                    //}
                     insertprodiomac(type);
                     return true;
                 }

UAS_MES_YD/Properties/Settings.Designer.cs

@@ -121,9 +121,9 @@ namespace UAS_MES_NEW.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_YD;Pooling=fa" +
-            "lse;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=81.71.42" +
-            ".91)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false" +
+            ";Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=81.71.42.91" +
+            ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS_MES_YD/Properties/Settings.settings

@@ -27,7 +27,7 @@
       <Value Profile="(Default)">ftp://10.8.0.82|vsftpd|vsftpd</Value>
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_YD;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=81.71.42.91)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=81.71.42.91)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
   </Settings>
 </SettingsFile>