From 790032df98d586627a771159d5b6c7646e3fff35 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 07 十二月 2024 23:18:29 +0800
Subject: [PATCH] 入库单更新
---
Tiger.Business.MES/iERP/MES_U9C.cs | 112 +++++++++++++++++++++++++-------------------------------
1 files changed, 50 insertions(+), 62 deletions(-)
diff --git a/Tiger.Business.MES/iERP/MES_U9C.cs b/Tiger.Business.MES/iERP/MES_U9C.cs
index 4130575..15eac1f 100644
--- a/Tiger.Business.MES/iERP/MES_U9C.cs
+++ b/Tiger.Business.MES/iERP/MES_U9C.cs
@@ -26,13 +26,13 @@
{
public partial class MES_U9C : IMES_U9C
{
- public static string U9CAuthLoginUrl { get; set; } = Biz.SysParam["U9CAuthLoginUrl_Test", "U9CUrl"].PARAM_VALUE; // "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin?"; 娴嬭瘯
- //public static string U9CAuthLoginUrl { get; set; } = Biz.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
+ public static string U9CAuthLoginUrl { get; set; } = Cache.SysParam["U9CAuthLoginUrl_Test", "U9CUrl"].PARAM_VALUE; // "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin?"; 娴嬭瘯
+ //public static string U9CAuthLoginUrl { get; set; } = Cache.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
public static string secret = "&entcode=02&orgcode=101&clientid=mes&clientsecret=12c8ee7e9bb74ad2a6a0fb3315c8af20";
public static string RcvRptDocCreateUrl
- { get; set; } = Biz.SysParam["RcvRptDocCreateUrl_Test", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/u9C/webapi/RcvRptDoc/Create"; 娴嬭瘯
+ { get; set; } = Cache.SysParam["RcvRptDocCreateUrl_Test", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/u9C/webapi/RcvRptDoc/Create"; 娴嬭瘯
//public static string RcvRptDocCreateUrl
- //{ get; set; } = Biz.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
+ //{ get; set; } = Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
/// <summary>
/// 鍏ュ簱鍗曟帴鍙�
@@ -47,21 +47,6 @@
{
//鍏堜繚瀛樻暟鎹�
bool IsSuccessed = true;
- var db = Biz.Db;
- var dbTran = db.UseTran(() =>
- {
- var s = db.Storageable(input.ErpProdInBths, "U9C_RcvRptDocCreate")
- .WhereColumns(t => new { t.ORDER_NO, t.WORK_ORDER, t.GHOST_ROW })
- .ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Interface.Error(action.Message);
- IsSuccessed = false;
- }
//淇濆瓨鎴愬姛锛岃皟鐢║9C鎺ュ彛-娴嬭瘯鐢�
//int i = 1;
@@ -72,7 +57,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 +67,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";
// }
// }
@@ -93,9 +78,9 @@
//{
// _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
//});
- //if (!dbTran.IsSuccess)
+ //if (!_dbTran.IsSuccess)
//{
- // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // action.CatchExceptionWithLog(_dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
// Logger.Interface.Error(action.Message);
// IsSuccessed = false;
//}
@@ -104,7 +89,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 +111,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,11 +134,11 @@
}
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.IS_HANDLED != "P").FirstOrDefault();
if (!d.IsNullOrEmpty())
{
d.ORDER_NO = result.Data[0].m_code;
- d.STATUS = "Y";
+ d.IS_HANDLED = "Y";
}
}
Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟垚鍔�");
@@ -170,11 +157,11 @@
}
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.IS_HANDLED != "P").FirstOrDefault();
if (!d.IsNullOrEmpty())
{
d.ORDER_NO = result.Data[0].m_code;
- d.STATUS = "F";
+ d.IS_HANDLED = "F";
}
}
Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曞け璐�:{result.Data[0].m_errorMsg}");
@@ -184,11 +171,11 @@
var _db = Biz.Db;
var _dbTran = _db.UseTran(() =>
{
- _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
+ _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
});
- if (!dbTran.IsSuccess)
+ if (!_dbTran.IsSuccess)
{
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ action.CatchExceptionWithLog(_dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
Logger.Interface.Error(action.Message);
IsSuccessed = false;
}
@@ -206,74 +193,75 @@
return action;
}
- private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons) {
+ private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons)
+ {
List<BAS_LABEL_TEMP> labels = new List<BAS_LABEL_TEMP>();
int i = 1;
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.IS_HANDLED != "F" && q.IS_HANDLED != "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();
+ item.Value = v.CartonQty.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