修改物料名称提示，修改物料完整性限制

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPalletNoWeigh.cs

@@ -298,6 +298,12 @@ namespace UAS_MES_NEW.Packing
                             OperateResult.AppendText("当前序列号下一道工序" + nextstepcode + ",当前资源不允许采集\n", Color.Red);
                             return;
                         }
+                        string Err = "";
+                        if (!LogicHandler.CheckMaterial(sn_code.Text, out Err))
+                        {
+                            OperateResult.AppendText(">>" + Err + "\n", Color.Red);
+                            return;
+                        }
                         PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         //获取序列号信息
                         sql.Clear();

UAS_MES_YDCY/PublicMethod/LogicHandler.cs

@@ -90,7 +90,7 @@ namespace UAS_MES_NEW.PublicMethod
                 string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                 sql.Clear();
-                sql.Append("select wm_concat(sp_soncode) sp_soncode from stepproduct left join product on pr_code=sp_fsoncode where ");
+                sql.Append("select wm_concat(pr_detail) sp_soncode from stepproduct left join product on pr_code=sp_fsoncode where ");
                 sql.Append("sp_bomversion='" + ms_bomversion + "' and sp_craftcode='" + ms_craftcode + "' ");
                 sql.Append("And sp_mothercode ='" + ms_prodcode + "' and sp_tracekind=1 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='" + ms_makecode + "' and cm_fsoncode=");
@@ -114,7 +114,7 @@ namespace UAS_MES_NEW.PublicMethod
                 string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                 sql.Clear();
-                sql.Append("select wm_concat(sp_soncode) sp_soncode from stepproduct left join product on pr_code=sp_fsoncode where ");
+                sql.Append("select wm_concat(pr_detail) sp_soncode from stepproduct left join product on pr_code=sp_fsoncode where ");
                 sql.Append("sp_bomversion='" + ms_bomversion + "' and sp_craftcode='" + ms_craftcode + "' ");
                 sql.Append("And sp_mothercode ='" + ms_prodcode + "' and sp_tracekind=1 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='" + ms_makecode + "' and cm_fsoncode=");