|
|
@@ -246,10 +246,10 @@ namespace UAS_MES.Make
|
|
|
dtbar = new DataTable();
|
|
|
sql.Clear();
|
|
|
sql.Append("select sp_id,sp_tracekind,sp_barcoderule,sp_prefix,sp_ifuseregex,sp_ifforsn,sp_length,sp_description,sp_soncode,pr_detail,pr_spec,");
|
|
|
- sql.Append("sp_repcode,sp_fsoncode,pr_id,sp_type,case when (sp_type='物料' and sp_soncode=pr_code) then '已采集' else '未采集' end sp_ifpick ,sp_prefix,");
|
|
|
+ sql.Append("sp_repcode,sp_fsoncode,pr_id,sp_type,sp_prefix,");
|
|
|
sql.Append("sp_length,sp_regex,sp_ifforsn from stepproduct left join product on pr_code=sp_soncode where sp_bomversion='" + ma_bomversion + "' and ");
|
|
|
sql.Append("sp_craftcode='" + LabelDataGridView.Rows[i].Cells["cm_craftcode"].Value + "'and sp_mothercode ='" + LabelDataGridView.Rows[i].Cells["cm_maprodcode"].Value + "' and sp_soncode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "' ");
|
|
|
- sql.Append("and((sp_type = '物料')or sp_type <> '物料') order by SP_DETNO asc");
|
|
|
+ sql.Append(" order by SP_DETNO asc");
|
|
|
dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dtbar.Rows.Count > 0)
|
|
|
{
|
