|
|
@@ -1066,7 +1066,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
{
|
|
|
var authString = $"{username}:{password}";
|
|
|
var base64Auth = Convert.ToBase64String(Encoding.UTF8.GetBytes(authString));
|
|
|
- client.DefaultRequestHeaders.Authorization =new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", base64Auth);
|
|
|
+ client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", base64Auth);
|
|
|
StringBuilder sbText = new StringBuilder();
|
|
|
string json = JsonConvert.SerializeObject(root, Formatting.Indented);
|
|
|
var content = new StringContent(json, Encoding.UTF8, "application/json");
|
|
|
@@ -1275,7 +1275,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
switch (status)
|
|
|
{
|
|
|
case "-1":
|
|
|
- BaseUtil.ShowError("该序号已入库");
|
|
|
+ BaseUtil.ShowError("该序号已入库");
|
|
|
break;
|
|
|
case "-2":
|
|
|
BaseUtil.ShowError("没有写入这个序号的设备");
|
|
|
@@ -1398,7 +1398,7 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
{
|
|
|
dynamic obj = new ExpandoObject();
|
|
|
var expandoDict = obj as IDictionary<string, object>;
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select nvl(pr_outboxinnerqty,0)PACKING_NUM,nvl(notype,1)notype,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 left join product on pr_code=ma_prodcode left join zte_order on batch_no=ma_custpo where pd_outboxcode='" + iBox + "'", "select");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select nvl(pr_outboxinnerqty,0)PACKING_NUM,nvl(ma_notype,1)notype,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 left join product on pr_code=ma_prodcode left join zte_order on batch_no=ma_custpo where pd_outboxcode='" + iBox + "'", "select");
|
|
|
string makecode = "";
|
|
|
string po = "";
|
|
|
int notype = 0;
|
callm