From bfcd7f5b405e431a5c07fe3fa77d74c892d4e66b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期四, 19 三月 2026 15:52:42 +0800
Subject: [PATCH] fix: 修复出入库冲突拦截，系统位置与实际位置的映射和修复
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/MES_InTaskDTO.cs | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/MES_InTaskDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/MES_InTaskDTO.cs"
index d92960e..6309674 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/MES_InTaskDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/MES_InTaskDTO.cs"
@@ -15,17 +15,17 @@
/// <summary>
/// 浠撳簱缂栫爜 - 蹇呭～锛岃瘑鍒浠撳簱
/// </summary>
- public string warehouseNo { get; set; }
+ public string? warehouseNo { get; set; }
/// <summary>
/// 鍗曟嵁缂栧彿 - 蹇呭～锛屽敮涓�
/// </summary>
- public string transNo { get; set; }
+ public string? transNo { get; set; }
/// <summary>
/// 鍗曟嵁鏃ユ湡 - 蹇呭～
/// </summary>
- public DateTime transDate { get; set; }
+ public DateTime? transDate { get; set; }
/// <summary>
/// 鐘舵�� - 蹇呭～锛孨鏈墽琛屻�丷鍙栨秷銆乊鎵ц瀹屾垚锛圵MS鏇存柊锛夈�両鎵ц涓紙WMS鏇存柊锛夈�丒鍏ュ簱寮傚父
@@ -34,28 +34,28 @@
/// 2. 褰撹緭閫佺嚎鍒ゆ柇寮傚父锛學MS鏇存柊鐘舵�佷负"E"銆傚湪涓篍鎯呭喌涓嬶紝浜哄伐浠嬪叆锛岄噸鏂板叆搴揥MS缁х画鎵ц鍏ュ簱锛屽苟鏇存柊鐘舵�併��
/// * 濡傛灉涓庣粦鐩樹笉涓�鑷达紝閭ｉ渶瑕丮ES鎺ㄩ�佸彇娑堝師浠诲姟"R"锛屽苟閲嶆柊鐢熸垚缁戝畾
/// </summary>
- public string status { get; set; }
+ public string? status { get; set; }
/// <summary>
/// 鎵樼洏鐮� - 蹇呭～锛孧ES灏嗘潯鐮佷笌鎵樼洏缁戝畾
/// </summary>
- public string containerNo { get; set; }
+ public string? containerNo { get; set; }
/// <summary>
/// 璧风偣浣嶇疆 - 蹇呭～
/// </summary>
- public string startPosition { get; set; }
+ public string? startPosition { get; set; }
/// <summary>
/// 鐩爣浣嶇疆/鍖哄煙 - 蹇呭～锛岀洰鏍囩偣浣嶆垨鐩爣鍖哄煙锛屽寘鍚笅鏋跺彛
/// 褰撹鍊间负浠撳簱缂栫爜鏃讹紝琛ㄧず闇�瑕佸叆搴撳埌浠撳簱涓�
/// </summary>
- public string endPosition { get; set; }
+ public string? endPosition { get; set; }
/// <summary>
/// 杞藉叿绫诲瀷
/// </summary>
- public string containerType { get; set; }
+ public string? containerType { get; set; }
}
//鍥炲弬
@@ -90,8 +90,8 @@
public ApiResponse Error(string message = null)
{
- Code = 200;
- Msg = "鎴愬姛";
+ Code = -1;
+ Msg = "澶辫触";
Data = new ResponseData
{
IsSuccess = false,
@@ -150,4 +150,101 @@
#endregion
}
+
+
+
+ //鍏ュ簱浠诲姟涓婃姤鍙傛暟
+ public class MesInResultResponse
+ {
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ public string TransNo { get; set; }
+ /// <summary>
+ /// 鎵ц缁撴灉 蹇呭～锛圫tart锛氬叆搴撳紑濮嬶紱Finish锛氬叆搴撳畬鎴愶紱Error锛氭墽琛屽け璐ワ級
+ /// </summary>
+ public string Result { get; set; }
+ /// <summary>
+ /// 鎵ц缁撴灉鎻忚堪 蹇呭～锛岃繑鍥炴墽琛岀粨鏋滅殑鎻忚堪锛屽锛氭搷浣滄垚鍔熴�佸け璐ュ師鍥犵瓑
+ /// </summary>
+ public string ResultMsg { get; set; }
+ /// <summary>
+ /// 鎵樼洏鐮�
+ /// </summary>
+ public string ContainerNo { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍌ㄤ綅
+ /// </summary>
+ public string LocationCode { get; set; }
+ }
+
+ //鍑哄簱浠诲姟涓婃姤鍙傛暟
+ public class MesOutResultResponse
+ {
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ public string TransNo { get; set; }
+ /// <summary>
+ /// 鎵ц缁撴灉 蹇呭～锛圫tart锛氬嚭搴撳紑濮嬶紱 Outstore锛氬嚭搴撳畬鎴愶紱Finish锛氬埌杈剧洰鐨勫湴锛汦rror锛氭墽琛屽け璐ワ級
+ /// </summary>
+ public string Result { get; set; }
+ /// <summary>
+ /// 鎵ц缁撴灉鎻忚堪 蹇呭～锛岃繑鍥炴墽琛岀粨鏋滅殑鎻忚堪锛屽锛氭搷浣滄垚鍔熴�佸け璐ュ師鍥犵瓑
+ /// </summary>
+ public string ResultMsg { get; set; }
+ }
+
+
+ //浠诲姟鍙嶉鍥炲弬
+ public class MES_parameter
+ {
+ /// <summary>
+ /// 澶勭悊缁撴灉 蹇呭～锛圷锛氭垚鍔燂紱N锛氬け璐ワ級
+ /// </summary>
+ public string Result { get; set; }
+ /// <summary>
+ /// 澶勭悊缁撴灉鎻忚堪 蹇呭～锛岃繑鍥炲鐞嗙粨鏋滅殑鎻忚堪锛屽锛氭搷浣滄垚鍔熴�佸け璐ュ師鍥犵瓑
+ /// </summary>
+ public string ResultMsg { get; set; }
+ }
+
+
+ //鍌ㄤ綅寮傚姩鐢宠
+ public class MES_Storagelocation
+ {
+ /// <summary>
+ /// 鎵樼洏鏉＄爜
+ /// </summary>
+ public string ContainerNo { get; set; }
+ /// <summary>
+ /// 鍘熻揣浣�
+ /// </summary>
+ public string OriginalLocationCode { get; set; }
+ /// <summary>
+ /// 鏂拌揣浣�
+ /// </summary>
+ public string NewLocationCode { get; set; }
+ }
+
+ //浠诲姟寮傚父涓婃姤
+ public class MES_TaskException
+ {
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ public string TransNo { get; set; }
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ public string EquipmentType { get; set; }
+ /// <summary>
+ /// 璁惧缂栫爜
+ /// </summary>
+ public string EquipmentNumber { get; set; }
+ /// <summary>
+ /// 寮傚父鎶ユ枃
+ /// </summary>
+ public string ErrorInfo { get; set; }
+ }
}
--
Gitblit v1.9.3