|
|
@@ -847,12 +847,12 @@ namespace UAS_MES_NEW.Make
|
|
|
string res = "",wo = "";
|
|
|
if(equiType == "SPI")
|
|
|
{
|
|
|
- res = currItem[1] == "PASS" ? "PASS" : "NG";
|
|
|
+ res = currItem[1];
|
|
|
wo = ma_code.Text;
|
|
|
}
|
|
|
else if (equiType == "AOI")
|
|
|
{
|
|
|
- res = currItem[3] == "PASS" ? "PASS" : "NG";
|
|
|
+ res = currItem[3];
|
|
|
|
|
|
sql.Clear();
|
|
|
sql.Append($"SELECT a.li_code,b.dl_macode FROM line_ipaoi a, deviceline b WHERE a.ipaddress = '{currItem[2]}' AND a.li_code = b.dl_linecode");
|
|
|
@@ -927,14 +927,7 @@ namespace UAS_MES_NEW.Make
|
|
|
|
|
|
param.Add(item.SN);
|
|
|
param.Add(item.work_order);
|
|
|
- if (item.Result == "PASS")
|
|
|
- {
|
|
|
- param.Add(item.Result);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- param.Add(item.Result);
|
|
|
- }
|
|
|
+ param.Add(item.Result == "PASS" ? "OK" :"NG");
|
|
|
param.Add(equiType);
|
|
|
param.Add(item.Details);
|
|
|
param.Add(User.UserCode);
|