From 0c0309afae85b72746bd2431c10c7f5982e210e3 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 四月 2025 17:46:44 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/iERP/MES_U9C.cs | 92 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/iERP/MES_U9C.cs b/Tiger.Business.MES/iERP/MES_U9C.cs
index 8b8a297..409c02d 100644
--- a/Tiger.Business.MES/iERP/MES_U9C.cs
+++ b/Tiger.Business.MES/iERP/MES_U9C.cs
@@ -32,10 +32,13 @@
public static string RcvRptDocCreateUrl
{ get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["RcvRptDocCreateUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/u9C/webapi/RcvRptDoc/Create"; 娴嬭瘯
//public static string RcvRptDocCreateUrl
- //{ get; set; } = Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
+ //{ get; set; } = Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
public static string U9CBarcodeCreateUrl
{ get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["U9CBarcodeCreateUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["U9CBarcodeCreateUrl", "U9CUrl"].PARAM_VALUE;
+
+ public static string CreateBarCodeByAssignQtyUrl
+ { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateBarCodeByAssignQty_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateBarCodeByAssignQty", "U9CUrl"].PARAM_VALUE;
/// <summary>
/// 鍏ュ簱鍗曟帴鍙�
@@ -56,10 +59,29 @@
// item.Status = "Y";
// if (!ErpProdInBth.IsNullOrEmpty())
// {
- // ErpProdInBth.ORDER_NO = $"YDRKD24120000{5+i}";
+ // ErpProdInBth.ORDER_NO = $"YDRKD24120000{5 + i}";
// ErpProdInBth.IS_HANDLED = "Y";
// ErpProdInBth.HANDLED_DATE = DateTime.Now;
// }
+ // List<RcvRptDocCreateParam> param = new() {
+ // new() {
+ // CompleteList = new(){
+ // new CompleteList
+ // {
+ // MOKey = new MOKey { DocNo = item.WorkOrder },
+ // Wh = new Wh { Code = item.WhCode },
+ // DescFlexField = new DescFlexField { PrivateDescSeg1 = item.PkgQty.ToString() },
+ // Item = new Item { Code = item.ItemCode },
+ // CompleteQty = item.CompleteQty,
+ // OutputType = item.OutputType,
+ // StorageType = item.StorageType,
+ // DocState = item.DocState,
+ // }
+ // },
+ // Remark = "鎺ュ彛鐢熸垚",
+ // BusinessDate = DateTime.Now,
+ // }
+ // };
// foreach (var p in input.PrintJsons)
// {
// var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
@@ -80,7 +102,7 @@
//{
// action.CatchExceptionWithLog(_dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
// Logger.Interface.Error(action.Message);
- // IsSuccessed = false;
+ // //IsSuccessed = false;
//}
//淇濆瓨鎴愬姛锛岃皟鐢║9C鎺ュ彛
@@ -137,13 +159,14 @@
Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟垚鍔�");
//鏉＄爜涓绘。
- BarcodeCreateInput barcodeCreateInput = new() {
+ BarcodeCreateInput barcodeCreateInput = new()
+ {
RevDocId = result.Data[0].m_iD,
userId = input.userId,
token = token,
IsLogin = false,
};
- U9CBarcodeCreate(barcodeCreateInput);
+ await U9CBarcodeCreate(barcodeCreateInput);
}
else
{
@@ -250,6 +273,65 @@
return action;
}
+ /// <summary>
+ /// 鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<List<string>>> U9CCreateBarCodeByAssignQty(BarcodeCreateByAssignQtyInput input)
+ {
+ Logger.Interface.Info($"/**\r\n *杩涘叆鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ var action = new ApiAction<List<string>>(new List<string>());
+ try
+ {
+ if (input.IsLogin)
+ {
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
+ if (u9CLoginResult.Success)
+ {
+ input.token = u9CLoginResult.Data;
+ Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
+ }
+ }
+ List<BarcodeCreateByAssignQtyParam> param = new() {
+ new() {
+ CreateBarCodeEntitys = new(){
+ new CreateBarCodeEntitys
+ {
+ EntityID = input.RevDocLineId, //鍏ュ簱鍗旾D
+ EntityType="UFIDA.U9.Complete.RCVRpt.RcvRptDocLine"
+ }
+ },
+ BarCodeRuleID = "1002308220305008",
+ CreateBarCodeItemQty = input.CreateBarCodeItemQty,
+ LabelQty = input.LabelQty,
+ }
+ };
+ var response = await HttpHelper.PostAsync(CreateBarCodeByAssignQtyUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });
+ var result = JsonConvert.DeserializeObject<BarcodeCreateByAssignQtyResult>(response.Message);
+ if (result != null)
+ {
+ if (result.Success && result.Data.IsSuccess)
+ {
+ Logger.Interface.Info($"鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
+ action.Data = result.Data.Data;
+ }
+ else
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"{action.Message}; {result.Data.ErrorMessage}");
+ Logger.Interface.Info($"鍗婃垚鍝佺敓鎴愭潯鐮佸け璐�:{result.Data.ErrorMessage}");
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, "鍗婃垚鍝佺敓鎴愭潯鐮佸紓甯�");
+ }
+ Logger.Interface.Info($"/* 鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
+ return action;
+ }
+
private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons)
{
List<BAS_LABEL_TEMP> labels = new List<BAS_LABEL_TEMP>();
--
Gitblit v1.9.3