打印条码前缀

UAS_MES_JC/FunctionCode/Make/Make_Decompose_Ex.cs

@@ -76,6 +76,7 @@ namespace UAS_MES_NEW.Make
                 deccount.Text = count + "";
                 if (ms_id != "")
                 {
+                    bool finddata = false;
                     if (LabelDataGridView.Rows.Count > 0)
                     {
                         for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
@@ -83,16 +84,27 @@ namespace UAS_MES_NEW.Make
                             if (LabelDataGridView.Rows[i].Cells["cm_barcode"].Value.ToString() == sn_code.Text)
                             {
                                 LabelDataGridView.Rows[i].Cells["Choose"].Value = true;
-                                return;
+                                LabelDataGridView.Rows[i].ReadOnly = false;
+                                LabelDataGridView.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+                                finddata = true;
+                            }
+                            else
+                            {
+                                LabelDataGridView.Rows[i].DefaultCellStyle.ForeColor = Color.Black;
+                                LabelDataGridView.Rows[i].Cells["Choose"].Value = false;
+                                LabelDataGridView.Rows[i].ReadOnly = true;
                             }
                         }
                     }
-                    BaseUtil.CleanForm(this);
-                    sql.Clear();
-                    sql.Append("select ms_id,ms_status,ms_makecode,ms_prodcode,pr_detail pr_name,ms_sncode,ms_firstsn,ms_craftcode,ms_craftname,ms_wccode from makeserial left join product on pr_code=ms_prodcode where ms_id='" + ms_id + "'");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    BaseUtil.SetFormValue(this.Controls, dt);
-                    LoadData(ms_sncode.Text, sender, e);
+                    if (!finddata)
+                    {
+                        BaseUtil.CleanForm(this);
+                        sql.Clear();
+                        sql.Append("select ms_id,ms_status,ms_makecode,ms_prodcode,pr_detail pr_name,ms_sncode,ms_firstsn,ms_craftcode,ms_craftname,ms_wccode from makeserial left join product on pr_code=ms_prodcode where ms_id='" + ms_id + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        BaseUtil.SetFormValue(this.Controls, dt);
+                        LoadData(ms_sncode.Text, sender, e);
+                    }
                 }
                 else
                 {
@@ -103,7 +115,14 @@ namespace UAS_MES_NEW.Make
                             if (LabelDataGridView.Rows[i].Cells["cm_barcode"].Value.ToString() == sn_code.Text)
                             {
                                 LabelDataGridView.Rows[i].Cells["Choose"].Value = true;
-                                return;
+                                LabelDataGridView.Rows[i].ReadOnly = false;
+                                LabelDataGridView.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+                            }
+                            else
+                            {
+                                LabelDataGridView.Rows[i].DefaultCellStyle.ForeColor = Color.Black;
+                                LabelDataGridView.Rows[i].Cells["Choose"].Value = false;
+                                LabelDataGridView.Rows[i].ReadOnly = true;
                             }
                         }
                     }
@@ -369,6 +388,7 @@ namespace UAS_MES_NEW.Make
                                 if (dt.Rows.Count > 0)
                                 {
                                     string makecode = (String)dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode = '" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_prodcode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
+                                    string wccode = (String)dh.getFieldDataByCondition("makeserial", "ms_wccode", "ms_sncode = '" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_prodcode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
                                     string mss_id = dt.Rows[0]["ms_id"].ToString();
                                     ////MakeBad表插入物料批号不良信息
                                     sql.Clear();
@@ -376,10 +396,26 @@ namespace UAS_MES_NEW.Make
                                     sql.Append("values (MakeBad_seq.nextval,'" + User.UserCode + "',sysdate,'" + User.CurrentStepCode + "','" + User.UserSourceCode + "',:bg_code ,'" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "',");
                                     sql.Append(":bc_code,'" + makecode + "')");
                                     dh.BatchInsert(sql.GetString(), new string[] { "bg_code", "bc_code" }, bgcode, bccode);
-                                    //更新子件序列号为待维修                               
-                                    sql.Clear();
-                                    sql.Append("update makeserial set ms_status=3 ,ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
-                                    dh.ExecuteSql(sql.GetString(), "update");
+                                    if (wccode == "单板")
+                                    {
+                                        //更新子件序列号为待维修                               
+                                        sql.Clear();
+                                        sql.Append("update makeserial set ms_status=1 ,ms_nextstepcode='单板测试',ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                        dh.ExecuteSql(sql.GetString(), "update");
+                                    }
+                                    else if (wccode == "模块")
+                                    {
+                                        //更新子件序列号为待维修                               
+                                        sql.Clear();
+                                        sql.Append("update makeserial set ms_status=1 ,ms_nextstepcode='模块测试',ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                        dh.ExecuteSql(sql.GetString(), "update");
+                                    }
+                                    else
+                                    {
+                                        sql.Clear();
+                                        sql.Append("update makeserial set ms_status=3,ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                        dh.ExecuteSql(sql.GetString(), "update");
+                                    }
                                 }
                                 //没有生产信息，判定为采购件，则将不良信息插入不良零件表中MAKEBADRSPART
                                 else

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -504,13 +504,13 @@
             this.SizeChanged += new System.EventHandler(this.Query_ExeProgress_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CraftMaterial)).EndInit();
             ((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_JC/FunctionCode/Query/Query_ExeProgress.cs

@@ -58,7 +58,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_JC/FunctionCode/Query/Query_SN.cs

@@ -139,21 +139,28 @@ namespace UAS_MES_NEW.Query
                 MessageBox.Show("工单号不存在");
                 return;
             }
-            DataTable dt = (DataTable)dh.ExecuteSql("select '机柜' pr_exbarcode,pr_spec3_user,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select '机柜' pr_exbarcode,pr_spec3_user,ma_qty,pr_prefix from make left join product on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'", "select");
             string pr_exbarcode = "";
             string ma_qty = "";
             string pr_spec3_user = "";
+            string pr_prefix = "";
             if (dt.Rows.Count > 0)
             {
                 pr_exbarcode = dt.Rows[0]["pr_exbarcode"].ToString();
                 pr_spec3_user = dt.Rows[0]["pr_spec3_user"].ToString();
                 ma_qty = dt.Rows[0]["ma_qty"].ToString();
+                pr_prefix = dt.Rows[0]["pr_prefix"].ToString();
             }
             if (pr_spec3_user == "")
             {
                 MessageBox.Show("未维护产品资料信息");
                 return;
             }
+            if (pr_prefix == "")
+            {
+                MessageBox.Show("未维护前缀信息");
+                return;
+            }
             if (dh.getRowCount("makesnlist", "msl_makecode='" + ma_code.Text + "'") + PrintNum.Value > int.Parse(ma_qty))
             {
                 MessageBox.Show("工单号" + ma_code.Text + "生产序列号超出工单数");

UAS_MES_JC/FunctionCode/Query/Query_SN1.cs

@@ -139,14 +139,21 @@ namespace UAS_MES_NEW.Query
                 MessageBox.Show("工单号不存在");
                 return;
             }
-            DataTable dt = (DataTable)dh.ExecuteSql("select '模块' pr_exbarcode,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select '模块' pr_exbarcode,ma_qty,pr_prefix from make left join product on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'", "select");
             string pr_exbarcode = "";
             string ma_qty = "";
+            string pr_prefix="";
             if (dt.Rows.Count > 0)
             {
                 pr_exbarcode = dt.Rows[0]["pr_exbarcode"].ToString();
+                pr_prefix = dt.Rows[0]["pr_prefix"].ToString();
                 ma_qty = dt.Rows[0]["ma_qty"].ToString();
             }
+            if (pr_prefix == "")
+            {
+                MessageBox.Show("未维护前缀信息");
+                return;
+            }
             if (dh.getRowCount("makesnlist", "msl_makecode='" + ma_code.Text + "'") + PrintNum.Value > int.Parse(ma_qty))
             {
                 MessageBox.Show("工单号" + ma_code.Text + "生产序列号超出工单数");