上料采集原始数据处理,序列号所属工序bom为空时取工单自身工序bom

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -118,7 +118,7 @@ namespace UAS_MES.Make
                         if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, code.Text, User.UserCode, out macode, out Msid, out ErrorMessage) || ListA.Rows.Count > 0)
                         {
                             sql.Clear();
-                            sql.Append("select ma_code,ms_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,ms_bomversion,ms_firstsn from makeserial left join make on ");
+                            sql.Append("select ma_code,ms_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,nvl(ms_bomversion,ma_bomversion) ms_bomversion,ms_firstsn from makeserial left join make on ");
                             sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_id='" + Msid + "'");
                             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -250,7 +250,7 @@ namespace UAS_MES.Make
                         {
                             dt1 = new DataTable();
                             sql.Clear();
-                            sql.Append("select ms_bomversion from makeserial left join make on ma_code=ms_makecode ");
+                            sql.Append("select nvl(ms_bomversion,ma_bomversion) ms_bomversion from makeserial left join make on ma_code=ms_makecode ");
                             sql.Append("left join product on ms_prodcode=pr_code where ms_makecode='" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value + "' order by ms_id desc");
                             dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt1.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -263,7 +263,7 @@ namespace UAS_MES.Make
                 //将录入框的值给序列号
                 sn_code.Text = code.Text;
                 sql.Clear();
-                sql.Append("select ma_prodcode,ma_ecncode,ma_softversion,ms_firstsn,ms_bomversion,ma_qty,ma_code,pr_detail,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
+                sql.Append("select ma_prodcode,ma_ecncode,ma_softversion,ms_firstsn,nvl(ms_bomversion,ma_bomversion) ms_bomversion,ma_qty,ma_code,pr_detail,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
                 sql.Append(",ms_prodcode,ms_makecode,ms_code,ms_stepname  from makeserial left join make on ma_code=ms_makecode ");
                 sql.Append("left join product on ms_prodcode=pr_code where ms_sncode='" + code.Text + "' order by ms_id desc");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");