|
|
@@ -323,6 +323,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
string json = JsonConvert.SerializeObject(obj, Formatting.Indented);
|
|
|
string returnstr = ToServerReq(json);
|
|
|
dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + json + "',sysdate,'GETEN')", "insert");
|
|
|
+ dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GETEN')", "insert");
|
|
|
JObject deviceObj = JObject.Parse(returnstr);
|
|
|
string WholeDeviceCode = deviceObj["WholeDeviceCode"].ToString();
|
|
|
string SN = deviceObj["SN"].ToString();
|
|
|
@@ -339,7 +340,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
{
|
|
|
dh.ExecuteSql("delete from ZTEDATA where zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒机身标'", "delete");
|
|
|
}
|
|
|
- //dh.ExecuteSql("update makeserial set ms_sncode='" + dev_en_no + "' where ms_id='" + ms_id + "'", "update");
|
|
|
+ dh.ExecuteSql("update makeserial set ms_sncode='" + dev_en_no + "' where ms_id='" + ms_id + "'", "update");
|
|
|
dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,zd_WholeDeviceCode,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,ZD_MAC_START, ZD_MAC_END,ZD_RESERVE3,zd_enno,zd_devicetype,zd_regcode)" +
|
|
|
"values(ZTEDATA_seq.nextval,'" + SN + "','" + WholeDeviceCode + "','" + dev_en_no + "','" + iSN + "','" + makecode + "','彩盒机身标','','" + mac + "','" + mac_start + "','" + mac_end + "','" + reserve3 + "','" + en_no + "','" + device_type + "','" + reg_code + "')", "insert");
|
|
|
return dev_en_no;
|
|
|
@@ -480,7 +481,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
{
|
|
|
dynamic obj = new ExpandoObject();
|
|
|
var expandoDict = obj as IDictionary<string, object>;
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=zd_sn left join make on ma_code=pd_makecode where pd_outboxcode='" + iBox + "'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=ZD_DEV_EN_NO left join make on ma_code=pd_makecode where pd_outboxcode='" + iBox + "'", "select");
|
|
|
string makecode = "";
|
|
|
string po = "";
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
@@ -523,7 +524,11 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
"'" + deviceInfo.Voltage + "','" + deviceInfo.Power + "','" + deviceInfo.OrderNo + "','" + deviceInfo.BigBoxNo + "','" + deviceInfo.DSN[i] + "'," +
|
|
|
"'" + deviceInfo.DevEnNo[i] + "', '" + deviceInfo.Reserve3[i] + "','" + deviceInfo.DeviceId[i] + "','" + deviceInfo.MacStart[i] + "','" + deviceInfo.MacEnd[i] + "','" + deviceInfo.ProductionDate + "',sysdate)", "insert");
|
|
|
}
|
|
|
- Console.WriteLine(json);
|
|
|
+ if (returnstr.Length > 4000)
|
|
|
+ {
|
|
|
+ returnstr = returnstr.Substring(0, 3999);
|
|
|
+ }
|
|
|
+ dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GetOutBoxInfo')", "insert");
|
|
|
}
|
|
|
|
|
|
//获取栈板信息
|
|
|
@@ -551,6 +556,12 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + json + "',sysdate,'GetPalletInfo')", "insert");
|
|
|
|
|
|
string returnstr = ToServerReq(json);
|
|
|
+ if (returnstr.Length > 4000)
|
|
|
+ {
|
|
|
+ returnstr = returnstr.Substring(0, 3999);
|
|
|
+ }
|
|
|
+ dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GetPalletInfo')", "insert");
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public static void GetMingPai_Thailand(string iSN)
|