|
|
@@ -100,21 +100,13 @@ namespace UAS_MES.Make
|
|
|
if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
|
|
|
{
|
|
|
string Msid;
|
|
|
- if (ma_code.Text == "")
|
|
|
- {
|
|
|
- if (!LogicHandler.GetMakeInfo(code.Text, out macode, out ErrorMessage))
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
- if (ma_code.Text != macode || ListA.Rows.Count == 0)
|
|
|
+ if (ListA.Rows.Count == 0)
|
|
|
{
|
|
|
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,ma_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,ma_bomversion from makeserial left join make on ");
|
|
|
- sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_sncode='" + code.Text + "' and ms_makecode='" + ma_code.Text + "'");
|
|
|
+ sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_id='" + Msid + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|