|
|
@@ -593,7 +593,6 @@ namespace UAS_MES_NEW.Make
|
|
|
string macinfo = dt.Rows[0]["pr_macinto"].ToString();
|
|
|
string btinfo = dt.Rows[0]["pr_btinfo"].ToString();
|
|
|
string netinfo = dt.Rows[0]["pr_netinfo"].ToString();
|
|
|
- string softversion = "";
|
|
|
string othid = "";
|
|
|
string mmi1 = "";
|
|
|
string mmi2 = "";
|
|
|
@@ -707,9 +706,9 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
ifrework = dt.Rows[0]["ms_ifrework"].ToString();
|
|
|
string softversioncheck = dh.GetConfig("softversion", "sys").ToString();
|
|
|
- if (softversion != ma_softversion.Text && softversion != "" && softversion != "0")
|
|
|
+ if (version != ma_softversion.Text && version != "" && version != "0")
|
|
|
{
|
|
|
- OperateResult.AppendText("<<序列号：" + ms_sncode.Text + "对应软件版本" + softversion + "与工单维护软件版本" + ma_softversion.Text + "不一致\n", Color.Red);
|
|
|
+ OperateResult.AppendText("<<序列号：" + ms_sncode.Text + "对应软件版本" + version + "与工单维护软件版本" + ma_softversion.Text + "不一致\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
//if (!mmi1.Contains("PASS") || !mmi2.Contains("PASS"))
|
|
|
@@ -778,7 +777,7 @@ namespace UAS_MES_NEW.Make
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- dh.ExecuteSql("update makeserial set MS_SOFTVERSION = '" + softversion + "',ms_othid1 = '" + othid + "',MS_MMI1 = '" + mmi1 + "',MS_MMI2 = '" + mmi2 + "'," +
|
|
|
+ dh.ExecuteSql("update makeserial set MS_SOFTVERSION = '" + version + "',ms_othid1 = '" + othid + "',MS_MMI1 = '" + mmi1 + "',MS_MMI2 = '" + mmi2 + "'," +
|
|
|
"ms_mac = '" + mac + "',ms_bt = '" + bt + "',MS_OPENTIME = '" + opentime + "' where ms_sncode = '" + ms_sncode.Text + "' and ms_makecode = '" + ma_code.Text + "'", "update");
|
|
|
|
|
|
if (US_SKU.Text != "")
|
callm