From f2e2c131b1db5ac84e214f2b6dd1a27b816a41cd Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 22 二月 2025 13:41:53 +0800
Subject: [PATCH] 雅达-修改返回类型并增加属性
---
Tiger.Business.MES/iERP/MES_U9C.cs | 7 ++++---
Tiger.Api/Language.db | 0
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs | 12 ++++++++++++
Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs | 4 ++--
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/Tiger.Api/Language.db b/Tiger.Api/Language.db
index fae6579..ca2c5b3 100644
--- a/Tiger.Api/Language.db
+++ b/Tiger.Api/Language.db
Binary files differ
diff --git a/Tiger.Business.MES/iERP/MES_U9C.cs b/Tiger.Business.MES/iERP/MES_U9C.cs
index e3ce128..c1e76dd 100644
--- a/Tiger.Business.MES/iERP/MES_U9C.cs
+++ b/Tiger.Business.MES/iERP/MES_U9C.cs
@@ -259,10 +259,10 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction<BarcodeCreateInput>> U9CCreateBarCodeByAssignQty(BarcodeCreateByAssignQtyInput input)
+ public async Task<ApiAction<List<string>>> U9CCreateBarCodeByAssignQty(BarcodeCreateByAssignQtyInput input)
{
Logger.Interface.Info($"/**\r\n *杩涘叆鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
- var action = new ApiAction<BarcodeCreateInput>();
+ var action = new ApiAction<List<string>>(new List<string>());
try
{
if (input.IsLogin)
@@ -292,9 +292,10 @@
var result = JsonConvert.DeserializeObject<BarcodeCreateByAssignQtyResult>(response.Message);
if (result != null)
{
- if (result.Success)
+ if (result.Success && result.Data.IsSuccess)
{
Logger.Interface.Info($"鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
+ action.Data = result.Data.Data;
}
else
{
diff --git a/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs b/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
index 1ae0373..335588b 100644
--- a/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
+++ b/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
@@ -58,7 +58,7 @@
return SetOutPutMqttMsg(action, input.Locale);
}
var DocLines = Biz.DataSource["YadaU9C"].Client.Ado.SqlQuery<mes_RcvRptDocLine>($"select * from mes_RcvRptDocLine where DocNo = '{input.SN}'");
-
+
var temps = new List<TemplateInput>();
foreach (var item in DocLines)
{
@@ -87,7 +87,7 @@
catch (Exception ex)
{
//action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
- action.CatchExceptionWithLog(ex, Biz.L("WMS.RePrint.Scan.ScanException", input.SN));
+ action.CatchExceptionWithLog(ex, Biz.L("WMS.PrintSemiProdLabel.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
}
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
index 1e6c2af..b9d9f42 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
@@ -123,7 +123,13 @@
public class BarcodeCreateByAssignQtyInput: BarcodeCreateInput
{
+ /// <summary>
+ /// 鍏ュ簱鍗曡鎬绘暟閲�
+ /// </summary>
public int CreateBarCodeItemQty { get; set; }
+ /// <summary>
+ /// 鍖呰瑁呯鏁伴噺
+ /// </summary>
public int LabelQty { get; set; }
}
@@ -131,7 +137,13 @@
{
public string BarCodeRuleID { get; set; }
public List<CreateBarCodeEntitys> CreateBarCodeEntitys { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曡鎬绘暟閲�
+ /// </summary>
public int CreateBarCodeItemQty { get; set; }
+ /// <summary>
+ /// 鍖呰瑁呯鏁伴噺
+ /// </summary>
public int LabelQty { get; set; }
}
--
Gitblit v1.9.3