From 7669bf01b27e194873a62fe1a101412485cdbe42 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期四, 13 十一月 2025 14:47:29 +0800
Subject: [PATCH] 添加AGV的响应
---
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb | 0
StandardPda/MES.Service/service/Warehouse/XbRackingTaskSyxtLogManager.cs | 134 +++++++++
StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
StandardPda/MES.Service/Dto/service/TaskCompleteReportDto.cs | 27 +
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache | 2
StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
StandardPda/MES.Service/Dto/service/TaskErrorReportDto.cs | 32 ++
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache | 2
StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll | 0
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll | 0
StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll | 0
StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache | 2
StandardPda/MES.Service/Modes/XbRackingTaskSyxtLog.cs | 81 ++--
StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe | 0
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll | 0
StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache | 2
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs | 2
StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll | 0
StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml | 94 ++++--
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs | 2
StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json | 3
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache | 0
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb | 0
StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml | 94 ++++--
StandardPda/MES.Service/Dto/service/RackingTaskResponse.cs | 49 +++
StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll | 0
StandardPda/MESApplication/Controllers/Warehouse/XbRackingTaskSyxtLogController.cs | 276 +++++++++++++++++++
32 files changed, 696 insertions(+), 106 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/RackingTaskResponse.cs b/StandardPda/MES.Service/Dto/service/RackingTaskResponse.cs
new file mode 100644
index 0000000..57df0a8
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/RackingTaskResponse.cs
@@ -0,0 +1,49 @@
+namespace MES.Service.Dto.service;
+
+/// <summary>
+/// 绔嬩綋浠撳簱浠诲姟鍝嶅簲绫�
+/// </summary>
+public class RackingTaskResponse
+{
+ /// <summary>
+ /// 杩斿洖鐘舵�侊細200浠ｈ〃鎴愬姛锛�500浠ｈ〃澶辫触
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 娑堟伅鍐呭
+ /// </summary>
+ public string? JsonMessage { get; set; }
+
+ /// <summary>
+ /// 鍙嶉缁撴灉琛ュ厖璇存槑
+ /// </summary>
+ public string? CodeMessage { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鎴愬姛鍝嶅簲
+ /// </summary>
+ public static RackingTaskResponse Success()
+ {
+ return new RackingTaskResponse
+ {
+ Code = "200",
+ JsonMessage = null,
+ CodeMessage = null
+ };
+ }
+
+ /// <summary>
+ /// 鍒涘缓澶辫触鍝嶅簲
+ /// </summary>
+ /// <param name="codeMessage">閿欒娑堟伅</param>
+ public static RackingTaskResponse Fail(string codeMessage)
+ {
+ return new RackingTaskResponse
+ {
+ Code = "500",
+ JsonMessage = null,
+ CodeMessage = codeMessage
+ };
+ }
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/service/TaskCompleteReportDto.cs b/StandardPda/MES.Service/Dto/service/TaskCompleteReportDto.cs
new file mode 100644
index 0000000..bf3711f
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/TaskCompleteReportDto.cs
@@ -0,0 +1,27 @@
+namespace MES.Service.Dto.service;
+
+/// <summary>
+/// 浠诲姟瀹屾垚涓婃姤璇锋眰鍙傛暟
+/// </summary>
+public class TaskCompleteReportDto
+{
+ /// <summary>
+ /// 浠诲姟绫诲瀷锛�1-鐗╂枡鍑哄簱 / 2-鐗╂枡鍏ュ簱 / 3-绌烘墭鐩樺嚭搴� / 7-鑵炬尓搴撲綅
+ /// </summary>
+ public string TaskType { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙凤紙浣滀笟缂栧彿锛夛紝鍏ㄥ眬鍞竴锛岀敤浜庨槻閲�
+ /// </summary>
+ public string TaskCode { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏缂栫爜
+ /// </summary>
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 搴撲綅缂栫爜锛屾牸寮忓"010203"锛屼唬琛�1鎺�2灞�3鍒�
+ /// </summary>
+ public string? LocCode { get; set; }
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/service/TaskErrorReportDto.cs b/StandardPda/MES.Service/Dto/service/TaskErrorReportDto.cs
new file mode 100644
index 0000000..83b879a
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/TaskErrorReportDto.cs
@@ -0,0 +1,32 @@
+namespace MES.Service.Dto.service;
+
+/// <summary>
+/// 寮傚父浠诲姟涓婃姤璇锋眰鍙傛暟
+/// </summary>
+public class TaskErrorReportDto
+{
+ /// <summary>
+ /// 浠诲姟绫诲瀷锛�1-鐗╂枡鍑哄簱 / 2-鐗╂枡鍏ュ簱 / 3-绌烘墭鐩樺嚭搴� / 7-鑵炬尓搴撲綅
+ /// </summary>
+ public string TaskType { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙凤紙浣滀笟缂栧彿锛夛紝鍏ㄥ眬鍞竴锛岀敤浜庨槻閲�
+ /// </summary>
+ public string? TaskCode { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏缂栫爜
+ /// </summary>
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 寮傚父浠ｇ爜
+ /// </summary>
+ public string ErrorCode { get; set; }
+
+ /// <summary>
+ /// 寮傚父鎻忚堪锛屽"鍏ュ簱鏈鍑篗ES鍏ュ簱浠诲姟"
+ /// </summary>
+ public string ErrorMessage { get; set; }
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/XbRackingTaskSyxtLog.cs b/StandardPda/MES.Service/Modes/XbRackingTaskSyxtLog.cs
index cc8240e..67853a5 100644
--- a/StandardPda/MES.Service/Modes/XbRackingTaskSyxtLog.cs
+++ b/StandardPda/MES.Service/Modes/XbRackingTaskSyxtLog.cs
@@ -11,115 +11,114 @@
/// <summary>
/// 涓婚敭ID
/// </summary>
- [SugarColumn(IsPrimaryKey = true, IsNullable = false,
- ColumnDataType = "NUMBER(20)")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
- [SugarColumn(IsNullable = true, Length = 30, ColumnDataType = "VARCHAR2")]
- public string CreateBy { get; set; }
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string? CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDataType = "DATE")]
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
/// 浠诲姟鍙�
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string TaskCode { get; set; }
+ [SugarColumn(ColumnName = "TASKCODE")]
+ public string? TaskCode { get; set; }
/// <summary>
/// 浠诲姟涓嬪彂绫诲瀷
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string TaskType { get; set; }
+ [SugarColumn(ColumnName = "TASKTYPE")]
+ public string? TaskType { get; set; }
/// <summary>
/// 鎵樼洏
/// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDataType = "VARCHAR2")]
- public string PalletCode { get; set; }
+ [SugarColumn(ColumnName = "PALLETCODE")]
+ public string? PalletCode { get; set; }
/// <summary>
/// 璐х墿绫诲瀷
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDataType = "NUMBER(20)")]
+ [SugarColumn(ColumnName = "WIDTHTYPE")]
public decimal? WidthType { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
- [SugarColumn(IsNullable = true, Length = 100, ColumnDataType = "VARCHAR2")]
- public string MaterialName { get; set; }
+ [SugarColumn(ColumnName = "MATERIALNAME")]
+ public string? MaterialName { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string MaterialCode { get; set; }
+ [SugarColumn(ColumnName = "MATERIALCODE")]
+ public string? MaterialCode { get; set; }
/// <summary>
/// 鎵瑰彿
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string BatchNo { get; set; }
+ [SugarColumn(ColumnName = "BATCHNO")]
+ public string? BatchNo { get; set; }
/// <summary>
/// 鏁伴噺
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDataType = "NUMBER(20)")]
+ [SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
/// <summary>
/// 浠诲姟涓嬪彂鎺ユ敹鏁版嵁
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDataType = "CLOB")]
- public string WarehousingJson { get; set; }
+ [SugarColumn(ColumnName = "WAREHOUSINGJSON")]
+ public string? WarehousingJson { get; set; }
/// <summary>
/// 宸ヤ綅鐐�
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string Station { get; set; }
+ [SugarColumn(ColumnName = "STATION")]
+ public string? Station { get; set; }
/// <summary>
- /// 浠诲姟涓婃姤绫诲瀷
+ /// 200浠ｈ〃鎴愬姛500浠ｈ〃澶辫触
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string TaskReporting { get; set; }
+ [SugarColumn(ColumnName = "CODE")]
+ public string? Code { get; set; }
/// <summary>
- /// 搴撲綅
+ /// 娑堟伅鍐呭
/// </summary>
- [SugarColumn(IsNullable = true, Length = 20, ColumnDataType = "VARCHAR2")]
- public string LocCode { get; set; }
+ [SugarColumn(ColumnName = "JSON_MESSAGE")]
+ public string? JsonMessage { get; set; }
/// <summary>
- /// 寮傚父浠ｇ爜
+ /// 鍙嶉缁撴灉琛ュ厖璇存槑
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string ErrorCode { get; set; }
+ [SugarColumn(ColumnName = "CODE_MESSAGE")]
+ public string? CodeMessage { get; set; }
/// <summary>
- /// 寮傚父鎻忚堪
+ /// 琛ュ厖
/// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDataType = "VARCHAR2")]
- public string ErrorMessage { get; set; }
+ [SugarColumn(ColumnName = "DATA")]
+ public string? Data { get; set; }
/// <summary>
- /// 浠诲姟涓婃姤鎺ユ敹鏁版嵁
+ /// 搴撲綅缂栫爜
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDataType = "CLOB")]
- public string MissionAccomplishedJson { get; set; }
+ [SugarColumn(ColumnName = "LOCCODE")]
+ public string? LocCode { get; set; }
/// <summary>
- /// 涓氬姟绫诲瀷
+ /// 搴撲綅涓枃鍚嶇О
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
- public string BusinessType { get; set; }
+ [SugarColumn(ColumnName = "LOCCODECHINESE")]
+ public string? LocCodeChinese { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll
index b7db24d..7691be5 100644
--- a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index ac90c91..d868c27 100644
--- a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs
index a8c70f4..ac0a971 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs
@@ -13,7 +13,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57662120d41592f254774481da29564b13bea668")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f4699ff377f0e5ea3640bb3670b2fbfbd56e3fb")]
[assembly: System.Reflection.AssemblyProductAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache
index 2ce5547..5228e33 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache
@@ -1 +1 @@
-5eae2084e55f96a3076bd26c01f56fc0fab68bf99259ce5863a14d2759ac4463
+c3f4f60d7b6bc5390bec43453c02cc2c29f88ae1aeb63688e1ced88dd7b1f25e
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache
index 52f4939..a335ce0 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a0b3039662d1bcbbbfc359fabc1d47d26d83a488101d74ab9555387ee29ea216
+90c59daba423ab99b975f1b940bfb188cb86bd529d474e078c4429165ad694ea
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll
index b7db24d..7691be5 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb
index ac90c91..d868c27 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll
index 6be651c..d44ca4b 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll
index 6be651c..d44ca4b 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/service/Warehouse/XbRackingTaskSyxtLogManager.cs b/StandardPda/MES.Service/service/Warehouse/XbRackingTaskSyxtLogManager.cs
new file mode 100644
index 0000000..eba52a4
--- /dev/null
+++ b/StandardPda/MES.Service/service/Warehouse/XbRackingTaskSyxtLogManager.cs
@@ -0,0 +1,134 @@
+using MES.Service.DB;
+using MES.Service.Dto.service;
+using MES.Service.Modes;
+
+namespace MES.Service.service.Warehouse;
+
+public class XbRackingTaskSyxtLogManager : Repository<XbRackingTaskSyxtLog>
+{
+ /// <summary>
+ /// 浠诲姟瀹屾垚涓婃姤
+ /// </summary>
+ /// <param name="dto">浠诲姟瀹屾垚涓婃姤鍙傛暟</param>
+ /// <returns>缁熶竴鍝嶅簲缁撴灉</returns>
+ public RackingTaskResponse TaskCompleteReport(TaskCompleteReportDto dto)
+ {
+ try
+ {
+ // 姝ラ1锛氶獙璇佷换鍔″彿鏄惁瀛樺湪
+ var task = Context.Queryable<XbRackingTaskSyxtLog>()
+ .Where(t => t.TaskCode == dto.TaskCode)
+ .First();
+
+ if (task == null)
+ {
+ return RackingTaskResponse.Fail($"浠诲姟鍙穂{dto.TaskCode}]涓嶅瓨鍦�");
+ }
+
+ // 姝ラ2锛氶獙璇佹墭鐩樼紪鐮佹槸鍚﹀尮閰�
+ if (task.PalletCode != dto.PalletCode)
+ {
+ return RackingTaskResponse.Fail($"鎵樼洏缂栫爜涓嶅尮閰嶏紝鏈熸湜[{task.PalletCode}]锛屽疄闄匸{dto.PalletCode}]");
+ }
+
+ // 姝ラ3锛氳浆鎹㈠簱浣嶇紪鐮佷负涓枃
+ string? locCodeChinese = null;
+ if (!string.IsNullOrEmpty(dto.LocCode))
+ {
+ // 楠岃瘉搴撲綅缂栫爜鏍煎紡
+ if (dto.LocCode.Length != 6 || !dto.LocCode.All(char.IsDigit))
+ {
+ return RackingTaskResponse.Fail("搴撲綅缂栫爜鏍煎紡閿欒锛屽簲涓�6浣嶆暟瀛�");
+ }
+
+ // 杞崲搴撲綅缂栫爜
+ locCodeChinese = ConvertLocCodeToChinese(dto.LocCode);
+ }
+
+ // 姝ラ4锛氭洿鏂颁换鍔℃棩蹇楄〃
+ var updateResult = Context.Updateable<XbRackingTaskSyxtLog>()
+ .SetColumns(t => t.LocCode == dto.LocCode)
+ .SetColumns(t => t.LocCodeChinese == locCodeChinese)
+ .SetColumns(t => t.Code == "200")
+ .SetColumns(t => t.JsonMessage == "浠诲姟瀹屾垚")
+ .SetColumns(t => t.CodeMessage == "浠诲姟瀹屾垚")
+ .Where(t => t.TaskCode == dto.TaskCode)
+ .ExecuteCommand();
+
+ if (updateResult <= 0)
+ {
+ return RackingTaskResponse.Fail("鏇存柊浠诲姟鏃ュ織澶辫触");
+ }
+
+ return RackingTaskResponse.Success();
+ }
+ catch (Exception ex)
+ {
+ return RackingTaskResponse.Fail($"鏇存柊浠诲姟鏃ュ織澶辫触锛歿ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 灏嗗簱浣嶇紪鐮佽浆鎹负涓枃鎻忚堪
+ /// </summary>
+ /// <param name="locCode">搴撲綅缂栫爜锛屾牸寮忓"010203"</param>
+ /// <returns>涓枃鎻忚堪锛屾牸寮忓"1鎺�2灞�3鍒�"</returns>
+ private string ConvertLocCodeToChinese(string locCode)
+ {
+ // 瑙ｆ瀽鎺掑彿锛堝墠涓や綅锛�
+ int row = int.Parse(locCode.Substring(0, 2));
+ // 瑙ｆ瀽灞傚彿锛堜腑闂翠袱浣嶏級
+ int level = int.Parse(locCode.Substring(2, 2));
+ // 瑙ｆ瀽鍒楀彿锛堝悗涓や綅锛�
+ int column = int.Parse(locCode.Substring(4, 2));
+
+ return $"{row}鎺抺level}灞倇column}鍒�";
+ }
+
+
+ /// <summary>
+ /// 寮傚父浠诲姟涓婃姤
+ /// </summary>
+ /// <param name="dto">寮傚父浠诲姟涓婃姤鍙傛暟</param>
+ /// <returns>缁熶竴鍝嶅簲缁撴灉</returns>
+ public RackingTaskResponse TaskErrorReport(TaskErrorReportDto dto)
+ {
+ try
+ {
+ // 姝ラ1锛氶獙璇佷换鍔″彿鏄惁瀛樺湪
+ var task = Context.Queryable<XbRackingTaskSyxtLog>()
+ .Where(t => t.TaskCode == dto.TaskCode)
+ .First();
+
+ if (task == null)
+ {
+ return RackingTaskResponse.Fail($"浠诲姟鍙穂{dto.TaskCode}]涓嶅瓨鍦�");
+ }
+
+ // 姝ラ2锛氶獙璇佹墭鐩樼紪鐮佹槸鍚﹀尮閰�
+ if (task.PalletCode != dto.PalletCode)
+ {
+ return RackingTaskResponse.Fail($"鎵樼洏缂栫爜涓嶅尮閰嶏紝鏈熸湜[{task.PalletCode}]锛屽疄闄匸{dto.PalletCode}]");
+ }
+
+ // 姝ラ3锛氭洿鏂颁换鍔℃棩蹇楄〃
+ var updateResult = Context.Updateable<XbRackingTaskSyxtLog>()
+ .SetColumns(t => t.Code == "500")
+ .SetColumns(t => t.JsonMessage == dto.ErrorMessage)
+ .SetColumns(t => t.CodeMessage == dto.ErrorMessage)
+ .Where(t => t.TaskCode == dto.TaskCode)
+ .ExecuteCommand();
+
+ if (updateResult <= 0)
+ {
+ return RackingTaskResponse.Fail("鏇存柊浠诲姟鏃ュ織澶辫触");
+ }
+
+ return RackingTaskResponse.Success();
+ }
+ catch (Exception ex)
+ {
+ return RackingTaskResponse.Fail($"鏇存柊浠诲姟鏃ュ織澶辫触锛歿ex.Message}");
+ }
+ }
+}
diff --git a/StandardPda/MESApplication/Controllers/Warehouse/XbRackingTaskSyxtLogController.cs b/StandardPda/MESApplication/Controllers/Warehouse/XbRackingTaskSyxtLogController.cs
new file mode 100644
index 0000000..3d97bad
--- /dev/null
+++ b/StandardPda/MESApplication/Controllers/Warehouse/XbRackingTaskSyxtLogController.cs
@@ -0,0 +1,276 @@
+using System.Dynamic;
+using MES.Service.Dto.service;
+using MES.Service.Modes;
+using MES.Service.service;
+using MES.Service.service.Warehouse;
+using MES.Service.util;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+
+namespace MESApplication.Controllers.Warehouse;
+
+[ApiController]
+[Route("api/[controller]")]
+public class XbRackingTaskSyxtLogController : ControllerBase
+{
+ private readonly MessageCenterManager _manager = new();
+
+ private readonly XbRackingTaskSyxtLogManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "xb_racking_task_syxt_log";
+
+ private readonly string URL = "http://localhost:10054/api/XbRackingTaskSyxtLog/";
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(decimal id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] XbRackingTaskSyxtLog data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity(
+ [FromBody] XbRackingTaskSyxtLog data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] XbRackingTaskSyxtLog data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚涓婃姤
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("TaskCompleteReport")]
+ public ResponseResult TaskCompleteReport(TaskCompleteReportDto dto)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "TaskCompleteReport";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(dto);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var result = m.TaskCompleteReport(dto);
+ resultInfos.tbBillList = result;
+
+ entity.Result = 0;
+ if (result.Code == "200") entity.Result = 1;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ if (result.Code == "200")
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+
+ return new ResponseResult
+ {
+ status = 1,
+ message = result.CodeMessage,
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 寮傚父浠诲姟涓婃姤
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("TaskErrorReport")]
+ public ResponseResult TaskErrorReport(TaskErrorReportDto dto)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "TaskErrorReport";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(dto);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var result = m.TaskErrorReport(dto);
+ resultInfos.tbBillList = result;
+
+ entity.Result = 0;
+ if (result.Code == "200") entity.Result = 1;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ if (result.Code == "200")
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+
+ return new ResponseResult
+ {
+ status = 1,
+ message = result.CodeMessage,
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+}
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll
index b7db24d..7691be5 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index ac90c91..d868c27 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 6e8fe58..cd16421 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 0cfd8d5..c26f47e 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 69f6a82..d09b2e1 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml
index bd80583..6aaf3db 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -651,7 +651,7 @@
</member>
<member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Save(MES.Service.Dto.webApi.ErpSalesOrder)">
<summary>
- 閿�鍞鍗曪紙U9棰勬祴璁㈠崟锛�
+ 閿�鍞鍗曪紙U9棰勬祴璁㈠崟锛�
</summary>
<param name="salesOrder"></param>
<returns></returns>
@@ -694,7 +694,7 @@
</member>
<member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Save(MES.Service.Dto.webApi.ErpSalesRerurn)">
<summary>
- 閫�璐ч�氱煡鍗�
+ 閫�璐ч�氱煡鍗�
</summary>
<param name="salesOrder"></param>
<returns></returns>
@@ -773,44 +773,44 @@
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Save(MES.Service.Dto.webApi.ErpSalesDelivery)">
<summary>
- 閿�鍞氦浠橀�氱煡锛圲9鏍囧噯閿�鍞級
+ 閿�鍞氦浠橀�氱煡锛圲9鏍囧噯閿�鍞級
</summary>
<param name="salesOrder"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
<summary>
- 鑾峰彇鎵�鏈�
+ 鑾峰彇鎵�鏈�
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
<summary>
- 鏍规嵁涓婚敭鑾峰彇
+ 鏍规嵁涓婚敭鑾峰彇
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
<summary>
- 鏍规嵁涓婚敭鍒犻櫎
+ 鏍规嵁涓婚敭鍒犻櫎
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
<summary>
- 娣诲姞
+ 娣诲姞
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
<summary>
- 娣诲姞杩斿洖鑷
+ 娣诲姞杩斿洖鑷
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
<summary>
- 淇敼
+ 淇敼
</summary>
<returns></returns>
</member>
@@ -1193,34 +1193,70 @@
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.GetTickeInfo(MES.Service.Dto.service.CCLoginDto)">
- <summary>
- 鏍规嵁浜ф祴鐧诲綍鍙疯幏鍙栦骇绾跨浉鍏冲伐鍗曚俊鎭�
- </summary>
- <returns></returns>
+ <summary>
+ 鏍规嵁浜ф祴鐧诲綍鍙疯幏鍙栦骇绾跨浉鍏冲伐鍗曚俊鎭�
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.AddAsnInfo(MES.Service.Dto.service.AsnInfo)">
- <summary>
- 瀛樺偍浜ф祴杩囩珯淇℃伅
- </summary>
- <returns></returns>
+ <summary>
+ 瀛樺偍浜ф祴杩囩珯淇℃伅
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetMediumBoxCode(MES.Service.Dto.service.MesMiddleBox)">
- <summary>
- 璁剧疆涓鐮�
- </summary>
- <returns></returns>
+ <summary>
+ 璁剧疆涓鐮�
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetStackCode(MES.Service.Dto.service.MesPalletBinding)">
- <summary>
- 璁剧疆鏍堟澘鐮�
- </summary>
- <returns></returns>
+ <summary>
+ 璁剧疆鏍堟澘鐮�
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.UnbindAsnInfo(MES.Service.Dto.service.UnbindAsnInfoDto)">
- <summary>
- 瑙ｇ粦sn鐮�
- </summary>
- <returns></returns>
+ <summary>
+ 瑙ｇ粦sn鐮�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetById(System.Decimal)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Add(MES.Service.Modes.XbRackingTaskSyxtLog)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.InsertReturnIdentity(MES.Service.Modes.XbRackingTaskSyxtLog)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Update(MES.Service.Modes.XbRackingTaskSyxtLog)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.WomcaaController.GetList">
<summary>
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json b/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json
index 41acb49..6bb491f 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json
@@ -11,7 +11,8 @@
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 122.226.249.238 )(PORT = 5936))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xb_prd; Password=xbprd",
- "U9IP": "192.168.1.66:45798" //U9鏈嶅姟鍣↖P鍦板潃,灏忔姝ｅ紡
+ "U9IP": "192.168.1.66:45798"
+ //U9鏈嶅姟鍣↖P鍦板潃,灏忔姝ｅ紡
//"U9IP": "192.168.1.66:45797" //U9鏈嶅姟鍣↖P鍦板潃,灏忔娴嬭瘯
}
}
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs
index 7b8601e..043c2cd 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs
@@ -13,7 +13,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57662120d41592f254774481da29564b13bea668")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f4699ff377f0e5ea3640bb3670b2fbfbd56e3fb")]
[assembly: System.Reflection.AssemblyProductAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyTitleAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache
index cd3d6b4..e82c1e6 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache
@@ -1 +1 @@
-b2fccb4cd2cdf4462bf862716ec574fbc0a777d08afc11e61b581f8f5a67250e
+8c5dd14083bb7d88e6dc7583bcc3d8f10f5799e6f6c66b02a99f949f47aa977a
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache
index 4feb8aa..0be873a 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache
index daaed00..5e8697a 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e69ebffd9b97996fa0fc7420689e44ace2d59bf02a826037d68dfbce1e6e2f0a
+f223c14a236ed82552fd69736622a648752037047e48466dd45ac3f12f630ca2
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll
index 6e8fe58..cd16421 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb
index 69f6a82..d09b2e1 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml
index bd80583..6aaf3db 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml
@@ -651,7 +651,7 @@
</member>
<member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Save(MES.Service.Dto.webApi.ErpSalesOrder)">
<summary>
- 閿�鍞鍗曪紙U9棰勬祴璁㈠崟锛�
+ 閿�鍞鍗曪紙U9棰勬祴璁㈠崟锛�
</summary>
<param name="salesOrder"></param>
<returns></returns>
@@ -694,7 +694,7 @@
</member>
<member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Save(MES.Service.Dto.webApi.ErpSalesRerurn)">
<summary>
- 閫�璐ч�氱煡鍗�
+ 閫�璐ч�氱煡鍗�
</summary>
<param name="salesOrder"></param>
<returns></returns>
@@ -773,44 +773,44 @@
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Save(MES.Service.Dto.webApi.ErpSalesDelivery)">
<summary>
- 閿�鍞氦浠橀�氱煡锛圲9鏍囧噯閿�鍞級
+ 閿�鍞氦浠橀�氱煡锛圲9鏍囧噯閿�鍞級
</summary>
<param name="salesOrder"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
<summary>
- 鑾峰彇鎵�鏈�
+ 鑾峰彇鎵�鏈�
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
<summary>
- 鏍规嵁涓婚敭鑾峰彇
+ 鏍规嵁涓婚敭鑾峰彇
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
<summary>
- 鏍规嵁涓婚敭鍒犻櫎
+ 鏍规嵁涓婚敭鍒犻櫎
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
<summary>
- 娣诲姞
+ 娣诲姞
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
<summary>
- 娣诲姞杩斿洖鑷
+ 娣诲姞杩斿洖鑷
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
<summary>
- 淇敼
+ 淇敼
</summary>
<returns></returns>
</member>
@@ -1193,34 +1193,70 @@
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.GetTickeInfo(MES.Service.Dto.service.CCLoginDto)">
- <summary>
- 鏍规嵁浜ф祴鐧诲綍鍙疯幏鍙栦骇绾跨浉鍏冲伐鍗曚俊鎭�
- </summary>
- <returns></returns>
+ <summary>
+ 鏍规嵁浜ф祴鐧诲綍鍙疯幏鍙栦骇绾跨浉鍏冲伐鍗曚俊鎭�
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.AddAsnInfo(MES.Service.Dto.service.AsnInfo)">
- <summary>
- 瀛樺偍浜ф祴杩囩珯淇℃伅
- </summary>
- <returns></returns>
+ <summary>
+ 瀛樺偍浜ф祴杩囩珯淇℃伅
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetMediumBoxCode(MES.Service.Dto.service.MesMiddleBox)">
- <summary>
- 璁剧疆涓鐮�
- </summary>
- <returns></returns>
+ <summary>
+ 璁剧疆涓鐮�
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetStackCode(MES.Service.Dto.service.MesPalletBinding)">
- <summary>
- 璁剧疆鏍堟澘鐮�
- </summary>
- <returns></returns>
+ <summary>
+ 璁剧疆鏍堟澘鐮�
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.womdaaController.UnbindAsnInfo(MES.Service.Dto.service.UnbindAsnInfoDto)">
- <summary>
- 瑙ｇ粦sn鐮�
- </summary>
- <returns></returns>
+ <summary>
+ 瑙ｇ粦sn鐮�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetById(System.Decimal)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Add(MES.Service.Modes.XbRackingTaskSyxtLog)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.InsertReturnIdentity(MES.Service.Modes.XbRackingTaskSyxtLog)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Update(MES.Service.Modes.XbRackingTaskSyxtLog)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
</member>
<member name="M:MESApplication.Controllers.WomcaaController.GetList">
<summary>
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe b/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe
index 0cfd8d5..c26f47e 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll
index 92d0f2e..1d1952f 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll
index 92d0f2e..1d1952f 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll
Binary files differ
--
Gitblit v1.9.3