维修上料修改

UAS_MES_YDCY/FunctionCode/Make/Make_FeedingCollectionBadOnly.cs

@@ -408,7 +408,7 @@ namespace UAS_MES_NEW.Make
             sql.Append("sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,replace(wm_concat(sp_prefix),',','|')sp_prefix,max(sp_regex)");
             sql.Append("sp_regex,max(pr_detail)pr_detail,max(substr(pr_spec,0,20))pr_spec from stepproduct left join product on pr_code=sp_fsoncode where ");
             sql.Append("sp_bomversion='" + ma_bomversion.Text + "' and sp_craftcode='" + ms_craftcode.Text + "' and instr('" + ms_paststep + "',sp_stepcode)>0 ");
-            sql.Append("And sp_mothercode ='" + ma_prodcode.Text + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where ");
+            sql.Append("And sp_mothercode ='" + ma_prodcode.Text + "' and sp_tracekind=1  and  nvl(pr_prodtype,' ')<>'包装物料' and not exists(select 1 from craftmaterial where ");
             sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ma_code.Text + "' and cm_fsoncode=");
             sql.Append("sp_fsoncode and cm_status=0 and cm_stepcode=sp_stepcode) group by sp_fsoncode,sp_id order by SP_DETNO asc");
             dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS_MES_YDCY/FunctionCode/Make/Make_Repair67F.cs

@@ -572,20 +572,22 @@ namespace UAS_MES_NEW.Make
             }
             //查询拆解的物料
             sql.Clear();
-            sql.Append("select distinct cm_soncode from craftmaterial left join product on pr_code=cm_fsoncode where cm_sncode in (select '" + firstsn + "' from dual union ");
+            sql.Append("select distinct cm_soncode,pr_detail from craftmaterial left join product on pr_code=cm_fsoncode where cm_sncode in (select '" + firstsn + "' from dual union ");
             sql.Append("select sn from makesnrelation where firstsn='" + firstsn + "') and nvl(pr_prodtype,' ')<>'包装物料' and cm_craftcode='" + cr_code.Text + "' and cm_makecode='" + ms_makecode.Text + "' and cm_status=-1 ");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             ////如果含有序列号物料有被拆解过
             if (dt.Rows.Count > 0)
             {
                 string soncode = "";
+                string prdetail = "";
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
                     soncode += "'" + dt.Rows[i][0].ToString() + "',";
+                    prdetail += "'" + dt.Rows[i][1].ToString() + "',";
                 }
                 //查询对应的上料记录
                 sql.Clear();
-                sql.Append("select cm_soncode from craftmaterial left join product on pr_code=cm_fsoncode where cm_sncode in (select '" + firstsn + "' from dual union  select sn from ");
+                sql.Append("select cm_soncode,pr_detail from craftmaterial left join product on pr_code=cm_fsoncode where cm_sncode in (select '" + firstsn + "' from dual union  select sn from ");
                 sql.Append(" makesnrelation where firstsn='" + firstsn + "')and nvl(pr_prodtype,' ')<>'包装物料' and  cm_status=0 and cm_soncode in (" + soncode.Substring(0, soncode.Length - 1) + ")");
                 DataTable LoadSoncode = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 //查询的结果不相等表示未完成上料
@@ -596,9 +598,10 @@ namespace UAS_MES_NEW.Make
                         if (soncode.Contains(LoadSoncode.Rows[i][0].ToString()))
                         {
                             soncode = soncode.Replace(LoadSoncode.Rows[i][0].ToString(), "");
+                            prdetail = prdetail.Replace(LoadSoncode.Rows[i][1].ToString(), "");
                         }
                     }
-                    OperatResult.AppendText(">>" + soncode.Replace("'", "") + "物料尚未备料，不允许回流\n", Color.Red);
+                    OperatResult.AppendText(">>" + prdetail.Replace("'", "") + "物料尚未备料，不允许回流\n", Color.Red);
                     return;
                 }
             }

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckSH.cs

@@ -333,7 +333,7 @@ namespace UAS_MES_NEW.Make
             {
                 if (dh.getFieldDataByCondition("makecbr", "MC_HASHVALUE", "MC_SNCODE='" + code.Text + "'").ToString() == "")
                 {
-                    OperateResult.AppendText("<<序列号:" + code.Text + "未获取到HashValue,不允许核对\n", Color.Red, code);
+                    OperateResult.AppendText("<<序列号:" + code.Text + "未获取到CRB,不允许核对\n", Color.Red, code);
                     return;
                 }
                 nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();