From e990cf78de3e145f4a4b1493901c8d8caf95e53d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 05 十二月 2024 11:50:48 +0800
Subject: [PATCH] 解绑优化
---
Tiger.Business.MES/iERP/MES_U9C.cs | 68 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/Tiger.Business.MES/iERP/MES_U9C.cs b/Tiger.Business.MES/iERP/MES_U9C.cs
index 4130575..8bf3e4a 100644
--- a/Tiger.Business.MES/iERP/MES_U9C.cs
+++ b/Tiger.Business.MES/iERP/MES_U9C.cs
@@ -72,7 +72,7 @@
// item.Status = "Y";
// if (!ErpProdInBth.IsNullOrEmpty())
// {
- // ErpProdInBth.ORDER_NO = $"XX001-{i}";
+ // ErpProdInBth.ORDER_NO = $"YDRKD241200006";
// ErpProdInBth.IS_HANDLED = "Y";
// ErpProdInBth.HANDLED_DATE = DateTime.Now;
// ErpProdInBths.Add(ErpProdInBth);
@@ -82,7 +82,7 @@
// var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
// if (!d.IsNullOrEmpty())
// {
- // d.ORDER_NO = $"XX001-{i}";
+ // d.ORDER_NO = $"YDRKD241200006";
// d.STATUS = "Y";
// }
// }
@@ -104,7 +104,7 @@
//淇濆瓨鎴愬姛锛岃皟鐢║9C鎺ュ彛
if (IsSuccessed)
{
- var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode=admin{secret}");
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
if (u9CLoginResult.Success)
{
var token = u9CLoginResult.Data;
@@ -126,7 +126,9 @@
StorageType = item.StorageType,
DocState = item.DocState,
}
- }
+ },
+ Remark = "鎺ュ彛鐢熸垚",
+ BusinessDate = DateTime.Now,
}
};
var response = await HttpHelper.PostAsync(RcvRptDocCreateUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", token } });
@@ -147,7 +149,7 @@
}
foreach (var p in input.PrintJsons)
{
- var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS !="P").FirstOrDefault();
+ var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS != "P").FirstOrDefault();
if (!d.IsNullOrEmpty())
{
d.ORDER_NO = result.Data[0].m_code;
@@ -212,68 +214,68 @@
int j = 1;
foreach (var p in printJsons)
{
- BAS_LABEL_TEMP label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == "InstoreTemplate").First();
- foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
+ BAS_LABEL_TEMP label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == "InstoreTemplate").IncludesAllFirstLayer().First();
+ foreach (var v in p.Items.Where(q => q.STATUS != "F" && q.STATUS != "P"))
{
- foreach (var v in p.Items.Where(q=>q.STATUS !="F" && q.STATUS !="P"))
+ foreach (var item in label.Variables)
{
- if (item.VAR_NAME.StartsWith("RcvDoc"))
+ if (item.VAR_NAME == "PageNum")
+ {
+ item.Value = $"绗瑊i}椤�";
+ }
+ if (item.VAR_NAME == "PageSize")
+ {
+ item.Value = $"鍏眥printJsons.Count}椤�";
+ }
+ if (item.VAR_NAME == "BusinessDate")
+ {
+ item.Value = DateTime.Now.ToString("yyyy.MM.dd");
+ }
+ if (item.VAR_NAME == $"RcvDoc{j}")
{
item.Value = v.ORDER_NO;
}
- if (item.VAR_NAME.StartsWith("SoDoc"))
+ if (item.VAR_NAME == $"SoDoc{j}")
{
item.Value = v.SALES_ORDER;
}
- if (item.VAR_NAME.StartsWith("MoDoc"))
+ if (item.VAR_NAME == $"MoDoc{j}")
{
item.Value = v.WORK_ORDER;
}
- if (item.VAR_NAME.StartsWith("ItemCode"))
+ if (item.VAR_NAME == $"ItemCode{j}")
{
item.Value = v.ITEM_CODE;
}
- if (item.VAR_NAME.StartsWith("Description"))
+ if (item.VAR_NAME == $"Description{j}")
{
item.Value = v.ITEM_NAME;
}
- if (item.VAR_NAME.StartsWith("BoxQty"))
+ if (item.VAR_NAME == $"BoxQty{j}")
{
item.Value = v.PLAN_QTY.ToString();
}
- if (item.VAR_NAME.StartsWith("InQty"))
+ if (item.VAR_NAME == $"InQty{j}")
{
item.Value = v.SCAN_QTY.ToString();
}
- if (item.VAR_NAME.StartsWith("RcvQrCode"))
+ if (item.VAR_NAME == $"RcvQrCode{j}")
{
item.Value = v.ORDER_NO.ToString();
}
- if (item.VAR_NAME.StartsWith("SapCode"))
+ if (item.VAR_NAME == $"SapCode{j}")
{
item.Value = v.SapCode;
}
- if (item.VAR_NAME.StartsWith("Seq"))
+ if (item.VAR_NAME == $"Seq{j}")
{
- item.Value = i.ToString();
+ item.Value = j.ToString();
}
- i++;
}
- if (item.VAR_NAME == "PageNum")
- {
- item.Value = j.ToString();
- }
- if (item.VAR_NAME == "PageSize")
- {
- item.Value = printJsons.Count.ToString();
- }
- if (item.VAR_NAME == "BusinessDate")
- {
- item.Value = DateTime.Now.ToString("yyyyy.MM.dd");
- }
+ j++;
}
+ i++;
labels.Add(label);
- j++;
}
return labels;
}
--
Gitblit v1.9.3