|
|
@@ -398,7 +398,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
expandoDict[enNoKey] = enNoValue;
|
|
|
makecode = dt.Rows[i]["pd_makecode"].ToString();
|
|
|
po = dt.Rows[i]["po_sn"].ToString();
|
|
|
- notype= dt.Rows[i]["NOTYPE"].ToString();
|
|
|
+ notype = dt.Rows[i]["NOTYPE"].ToString();
|
|
|
}
|
|
|
obj.request = "Q_wai_xiang";
|
|
|
obj.packing_num = dt.Rows.Count;
|
|
|
@@ -446,7 +446,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
//获取栈板信息
|
|
|
public static void GetPalletInfo(string iBox)
|
|
|
{
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select po_sn,sc_linecode,ma_custpo,pa_zxcode,pa_outboxcode,pa_makecode from package left join source on pa_sccode=sc_code left join make on pa_makecode=ma_code left join ZTE_ORDER on ma_custpo=BATCH_NO where pa_mothercode='" + iBox + "' and RESERVE9='"+User.UserLineCode+"'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select po_sn,sc_linecode,ma_custpo,pa_zxcode,pa_outboxcode,pa_makecode from package left join source on pa_sccode=sc_code left join make on pa_makecode=ma_code left join ZTE_ORDER on ma_custpo=BATCH_NO where pa_mothercode='" + iBox + "' and RESERVE9='" + User.UserLineCode + "'", "select");
|
|
|
dynamic obj = new ExpandoObject();
|
|
|
var expandoDict = obj as IDictionary<string, object>;
|
|
|
string po = "";
|
|
|
@@ -484,31 +484,74 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
JObject deviceObj = JObject.Parse(returnstr);
|
|
|
string pallet_no = deviceObj["pallet_no"].ToString();
|
|
|
string palltecode = deviceObj["pallet_no"].ToString();
|
|
|
- dh.ExecuteSql("update package set pa_zxcode ='" + palltecode + "',pa_detno='"+ pallet_no + "' where pa_outboxcode='" + iBox + "'", "update");
|
|
|
+ dh.ExecuteSql("update package set pa_zxcode ='" + palltecode + "',pa_detno='" + pallet_no + "' where pa_outboxcode='" + iBox + "'", "update");
|
|
|
dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GetPalletInfo')", "insert");
|
|
|
}
|
|
|
|
|
|
+ public static void SendPowerCode(string iSN)
|
|
|
+ {
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select NOTYPE,cm_barcode,pr_detail,ms_code from craftmaterial left join makeserial on ms_sncode=cm_sncode and ms_makecode=cm_makecode left join make on ma_code=cm_makecode left join ZTE_ORDER on ma_custpo=batch_no left join product on cm_fsoncode=pr_code where cm_sncode='" + iSN + "' and cm_status=0", "select");
|
|
|
+ dynamic obj = new ExpandoObject();
|
|
|
+ var expandoDict = obj as IDictionary<string, object>;
|
|
|
+ string part_sn = "";
|
|
|
+ string part_ar = "";
|
|
|
+ string SN = "";
|
|
|
+ string notype = "";
|
|
|
+ for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
+ {
|
|
|
+ if (dt.Rows[i]["pr_detail"].ToString().Contains("电源"))
|
|
|
+ {
|
|
|
+ part_sn = dt.Rows[i]["cm_barcode"].ToString();
|
|
|
+ }
|
|
|
+ if (dt.Rows[i]["pr_detail"].ToString().Contains("报警器"))
|
|
|
+ {
|
|
|
+ part_ar = dt.Rows[i]["cm_barcode"].ToString();
|
|
|
+ }
|
|
|
+ SN = dt.Rows[i]["ms_code"].ToString();
|
|
|
+ notype = dt.Rows[i]["notype"].ToString();
|
|
|
+ }
|
|
|
+ obj.request = "bindSN";
|
|
|
+ obj.noType = notype;
|
|
|
+ obj.User = "test";
|
|
|
+ obj.password = "123456";
|
|
|
+ obj.tool_name = "zte";
|
|
|
+ obj.part_sn = part_sn;
|
|
|
+ obj.part_ar = part_ar;
|
|
|
+ obj.SN = SN;
|
|
|
+ string json = JsonConvert.SerializeObject(obj, Formatting.Indented);
|
|
|
+ dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + json + "',sysdate,'SendPowerCode')", "insert");
|
|
|
+
|
|
|
+ string returnstr = ToServerReq(json);
|
|
|
+ if (returnstr.Length > 1000)
|
|
|
+ {
|
|
|
+ returnstr = returnstr.Substring(0, 1000);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//发送外箱号数据，打印前获取
|
|
|
public static async void SendBoxData(string iBox)
|
|
|
{
|
|
|
- string sn = dh.getFieldDataByCondition("packagedetail", "replace(wm_concat(pd_barcode),',','-')", "pd_outboxcode='" + iBox + "'").ToString();
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select pr_code,pr_custmachinetype,ms_makecode from makeserial left join product on ms_prodcode=pr_code where ms_outboxcode ='" + iBox + "' order by ms_id desc", "select");
|
|
|
- string pr_custmachinetype = "";
|
|
|
- string makecode = "";
|
|
|
+ string sn = dh.getFieldDataByCondition("packagedetail left join ztedata on pd_barcode=ZD_DEV_EN_NO and pd_makecode=zd_makecode ", "replace(wm_concat(replace(ZD_MAC_START,'-','')),',','-')", "pd_outboxcode='" + iBox + "' and zd_type='BOX'").ToString();
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select ZD_BIG_BOX_NO,pr_code,PRODUCT_MODE,ms_makecode,po_sn from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join zte_order on ma_custpo=batch_no left join ztedata on ZD_DEV_EN_NO=ms_sncode and zd_makecode=ms_makecode where ms_outboxcode ='" + iBox + "' and zd_type='BOX' order by ms_id desc", "select");
|
|
|
+ string PRODUCT_MODE = "";
|
|
|
+ string po_sn = "";
|
|
|
string pr_code = "";
|
|
|
+ string ZD_BIG_BOX_NO = "";
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
- pr_custmachinetype = dt.Rows[0]["pr_custmachinetype"].ToString();
|
|
|
- makecode = dt.Rows[0]["ms_makecode"].ToString();
|
|
|
+ PRODUCT_MODE = dt.Rows[0]["PRODUCT_MODE"].ToString();
|
|
|
+ po_sn = dt.Rows[0]["po_sn"].ToString();
|
|
|
pr_code = dt.Rows[0]["pr_code"].ToString();
|
|
|
+ ZD_BIG_BOX_NO = dt.Rows[0]["ZD_BIG_BOX_NO"].ToString();
|
|
|
+
|
|
|
}
|
|
|
var root = new RootObject
|
|
|
{
|
|
|
ProductModuleType = "整机",
|
|
|
ProductMainClass = "固网_CPE",
|
|
|
ProductMediumClass = "CPE",
|
|
|
- ProductSubClass = pr_custmachinetype,
|
|
|
- Task = makecode,
|
|
|
+ ProductSubClass = PRODUCT_MODE,
|
|
|
+ Task = po_sn,
|
|
|
ProcessType = "生产过程",
|
|
|
UserId = User.UserName,
|
|
|
BindList = new List<BindItem>()
|
|
|
@@ -516,13 +559,13 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
root.BindList.Add(new BindItem
|
|
|
{
|
|
|
BindKey = "cartonSn",
|
|
|
- BindValue = iBox,
|
|
|
+ BindValue = ZD_BIG_BOX_NO,
|
|
|
KeyType = "macbox",
|
|
|
KeyValue = sn,
|
|
|
HashType = "SHA256",
|
|
|
HashKey = ComputeSha256Hash(sn)
|
|
|
});
|
|
|
- dt = (DataTable)dh.ExecuteSql("select pd_barcode from packagedetail where pd_outboxcode='" + iBox + "'", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select pd_barcode,replace(ZD_MAC_START,'-','')ZD_MAC_START from packagedetail left join ztedata on pd_barcode=ZD_DEV_EN_NO and pd_makecode=zd_makecode where pd_outboxcode='" + iBox + "' and zd_type='BOX'", "select");
|
|
|
DataTable dt1 = (DataTable)dh.ExecuteSql("select pid_sql,pid_item,pid_value,pid_valuetype from productitem left join productitemdetail on pid_piid=pi_id where pi_prodcode='" + pr_code + "'", "select");
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
|
@@ -533,7 +576,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
root.BindList.Add(new BindItem
|
|
|
{
|
|
|
BindKey = "mac",
|
|
|
- BindValue = dt.Rows[i]["pd_barcode"].ToString(),
|
|
|
+ BindValue = dt.Rows[i]["ZD_MAC_START"].ToString(),
|
|
|
KeyType = dt1.Rows[j]["pid_item"].ToString(),
|
|
|
KeyValue = dt1.Rows[j]["pid_item"].ToString(),
|
|
|
HashType = "SHA256",
|
|
|
@@ -565,11 +608,11 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
root.BindList.Add(new BindItem
|
|
|
{
|
|
|
BindKey = "mac",
|
|
|
- BindValue = dt.Rows[i]["pd_barcode"].ToString(),
|
|
|
+ BindValue = dt.Rows[i]["ZD_MAC_START"].ToString(),
|
|
|
KeyType = dt1.Rows[j]["pid_item"].ToString(),
|
|
|
KeyValue = value,
|
|
|
HashType = "NON-HASH",
|
|
|
- HashKey = dt1.Rows[j]["pid_item"].ToString(),
|
|
|
+ HashKey = value,
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
@@ -587,11 +630,12 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
StringBuilder sbText = new StringBuilder();
|
|
|
string json = JsonConvert.SerializeObject(root, Formatting.Indented);
|
|
|
var content = new StringContent(json, Encoding.UTF8, "application/json");
|
|
|
+ await Console.Out.WriteLineAsync(json);
|
|
|
|
|
|
var response = await client.PostAsync("https://172.30.30.10:29001/api/mds-web-outservice/v1/api/rest/mds/saveFmKeyHashcodeInfoBatch", content);
|
|
|
if (response.IsSuccessStatusCode)
|
|
|
{
|
|
|
-
|
|
|
+ dh.ExecuteSql("update packagedetail set pd_issuccess=-1 where pd_outboxcode='" + iBox + "'", "update");
|
|
|
}
|
|
|
else
|
|
|
{
|
callm