SOP功能集成

UAS_MES_PNE/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -82,7 +82,6 @@ namespace UAS_MES_NEW.Make
             StepCount.LineCode = User.UserLineCode;
             StepCount.Dh = dh;
             StepCount.Start();
-            AutoPrint.Checked = false;
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

UAS_MES_PNE/FunctionCode/Make/Make_RePrintLabel.cs

@@ -180,19 +180,11 @@ namespace UAS_MES_NEW.Make
                 //打印类型为卡通箱
                 else if (CartonBox.Checked)
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_outboxcode='" + inputText.Text + "' or ms_imei2='" + inputText.Text + "' or ms_imei1='" + inputText.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_sncode='" + inputText.Text + "' or ms_imei2='" + inputText.Text + "' or ms_imei1='" + inputText.Text + "' order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         inputText.Text = dt.Rows[0]["ms_outboxcode"].ToString();
                     }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_imei2='" + inputText.Text + "' order by ms_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            inputText.Text = dt.Rows[0]["ms_outboxcode"].ToString();
-                        }
-                    }
                     //查询箱号是否存在
                     dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and pa_type=1", "select");
                     if (dt.Rows.Count == 0)

UAS_MES_PNE/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -413,13 +413,13 @@
             this.Load += new System.EventHandler(this.Query_ExeProgress_Load);
             this.SizeChanged += new System.EventHandler(this.Query_ExeProgress_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_PNE/FunctionCode/Query/Query_ExeProgress.cs

@@ -57,7 +57,7 @@ namespace UAS_MES_NEW.Query
 
         private void Query_ExeProgress_SizeChanged(object sender, EventArgs e)
         {
-            //asc.controlAutoSize(this);
+            asc.controlAutoSize(this);
         }
 
         private void sn_code_KeyDown(object sender, KeyEventArgs e)

UAS_MES_PNE/FunctionCode/Query/Query_SOP.cs

@@ -413,7 +413,7 @@ namespace UAS_MES_NEW.Query
                 // 如果有图片在当前行范围内，将它们添加到最终图像中
                 if (pictures.Count > 0)
                 {
-                    using (Bitmap finalImage = new Bitmap(bitmap.Width + 100, bitmap.Height))
+                    using (Bitmap finalImage = new Bitmap(bitmap.Width, bitmap.Height))
                     using (Graphics g = Graphics.FromImage(finalImage))
                     {
                         // 绘制Excel内容