From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Model/InterFaceModel/HttpModel.cs | 302 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 288 insertions(+), 14 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 9040f1a..c4b9322 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -49,8 +49,9 @@
/// </summary>
public string message { get; set; }
}
+
/// <summary>
- /// Mes浠ょ墝Model
+ /// 鎺ユ敹Mes浠ょ墝Model
/// </summary>
public class MesTokenModel
{
@@ -78,15 +79,17 @@
}
+ /// <summary>
+ /// 鎺ユ敹MES浠ょ墝token鍊糓doel
+ /// </summary>
public class GetTokenModel
{
public string token { get; set; }
public string expire_time { get; set; }
}
-
/// <summary>
- /// 閲婃斁澶囨枡鍖哄偍浣嶇姸鎬丮odel
+ /// 鎺ユ敹閲婃斁澶囨枡鍖哄偍浣嶇姸鎬丮odel
/// </summary>
public class UpLocateModel
{
@@ -118,7 +121,7 @@
public string TaskNo { get; set; }
/// <summary>
- /// 浠诲姟绫诲瀷
+ /// 浠诲姟绫诲瀷 0锛氬叆搴擄紝1锛氬嚭搴擄紝2:绉诲簱锛�3锛氬叆搴撹９鍖�
/// </summary>
public string TaskType { get; set; }
@@ -312,6 +315,50 @@
public int? QtyCount { get; set; }
}
+
+ //鍏ュ簱浠诲姟鍗曟嵁淇℃伅
+ public class ResponseOrderTaskModel
+ {
+ /// <summary>
+ /// WMS涓嬪彂鍗曞彿
+ /// </summary>
+ public string? OrderNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string? TaskNo { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string? LotNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string? SkuNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string? SkuName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string? BoxType { get; set; }
+
+ /// <summary>
+ /// 鎬荤鏁�/璁″垝绠辨暟/棰勪及绠辨暟
+ /// </summary>
+ public int? Qty { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public int? TaskType { get; set; }
+ }
#endregion
#region AGV-Model
@@ -332,7 +379,7 @@
/// 鏍煎紡: 鈥測yyy-MM-ddHH:mm:ss鈥�
/// 鏄惁蹇呭～锛氬惁
/// </summary>
- public string EeqTime { get; set; }
+ public string ReqTime { get; set; }
/// <summary>
/// 瀹㈡埛绔紪鍙凤紝濡� PDA锛孒CWMS 绛夈��
@@ -375,6 +422,13 @@
/// 鏄惁蹇呭～锛氬惁
/// </summary>
public string CtnrTyp { get; set; }
+
+ /// <summary>
+ /// 瀹瑰櫒鏁伴噺锛堝弶杞�/CTU 涓撶敤锛�
+ /// 鍙夎溅椤圭洰蹇呬紶
+ /// 鏄惁蹇呭～锛氬惁
+ /// </summary>
+ public string CtnrNum { get; set; }
/// <summary>
/// 瀹瑰櫒缂栧彿锛堝弶杞�/CTU 涓撶敤锛�
@@ -618,6 +672,7 @@
/// </summary>
public class AgvTaskDto
{
+
/// <summary>
/// 璇锋眰缂栧彿锛屾瘡涓姹傞兘瑕佷竴涓敮涓�缂栧彿
/// 鍚屼竴涓姹傞噸澶嶆彁浜� 浣跨敤鍚屼竴缂栧彿
@@ -636,13 +691,13 @@
/// 鍦扮爜 X 鍧愭爣(mm)锛氫换鍔″畬鎴愭椂鏈夊��
/// 鏄惁蹇呭～锛氬惁
/// </summary>
- public int CooX { get; set; }
+ public decimal CooX { get; set; }
/// <summary>
/// 鍦扮爜 Y 鍧愭爣(mm)锛氫换鍔″畬鎴愭椂鏈夊��
/// 鏄惁蹇呭～锛氬惁
/// </summary>
- public int CooY { get; set; }
+ public decimal CooY { get; set; }
/// <summary>
/// 褰撳墠浣嶇疆缂栧彿
@@ -738,11 +793,6 @@
/// </summary>
public string CtnrCode { get; set; }
- /// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// 鏄惁蹇呭～锛氬惁
- /// </summary>
- public string CtnrType { get; set; }
/// <summary>
/// 宸烽亾缂栧彿
@@ -762,6 +812,40 @@
/// 鏄惁蹇呭～锛氬惁
/// </summary>
public string EqpCode { get; set; }
+ public string DstBinCode { get; set; }
+ public string IndBind { get; set; }
+ public string Layer { get; set; }
+ public string MapShortName { get; set; }
+ public string MaterialType { get; set; }
+
+ public string Action { get; set; }
+ public string AreaCode { get; set; }
+
+ public string BerthCode { get; set; }
+
+
+
+ public string CallCode { get; set; }
+
+ public string CallTyp { get; set; }
+ public string ClientCode { get; set; }
+ public string OrgCode { get; set; }
+ public string CtnrTyp { get; set; }
+ public string CurrentCallCode { get; set; }
+
+ public string PodCode { get; set; }
+
+ public string PodTyp { get; set; }
+ public string PodNum { get; set; }
+ public string RelatedArea { get; set; }
+ public string ReqTime { get; set; }
+ public string SubTaskNum { get; set; }
+
+ public string TaskTyp { get; set; }
+
+ public string TokenCode { get; set; }
+ public string Username { get; set; }
+ public string WhCode { get; set; }
}
/// <summary>
@@ -798,25 +882,215 @@
/// </summary>
public string Data { get; set; }
}
+
+ /// <summary>
+ /// WMS涓嬪彂AGV鍙栨秷浠诲姟鍥炰紶鍙傛暟
+ /// </summary>
+ public class cancelTaskModel
+ {
+ /// <summary>
+ /// 杩斿洖鐮�
+ /// 0锛氭垚鍔�
+ /// 1锛氬弬鏁扮浉鍏崇殑閿欒
+ /// 6锛氶噸澶嶅彂閫侊紝涓婂眰绯荤粺涓嶉渶瑕侀噸鍙�
+ /// 99锛氬叾浠栨湭鐭ラ敊璇紝璋冪敤澶辫触鍚庯紝鍙互閲嶈瘯
+ /// 100锛� 璇ヤ换鍔′笉瀛樺湪锛屼笂灞傜郴缁熶笉闇�閲嶅彂锛岄渶瑕佷汉宸ヤ粙鍏ュ鐞�
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 杩斿洖娑堟伅
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string Message { get; set; }
+
+ /// <summary>
+ /// 璇锋眰缂栧彿
+ /// 鏄惁蹇呭～锛氭槸
+ /// </summary>
+ public string ReqCode { get; set; }
+ }
#endregion
#region FuMa-Model
/// <summary>
- /// 鍙戦�佹帴鏀惰祴鐮佺郴缁熸帴鍙ｅ弬鏁扮殑model
+ /// 鎺ユ敹璧嬬爜绯荤粺鎺ュ彛杩斿洖鐨勫弬鏁� model
/// </summary>
public class FuMaModel
{
/// <summary>
/// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
/// </summary>
- public int Success { get; set; }
+ public bool IsSuccess { get; set; }
/// <summary>
/// 淇℃伅璇︽儏
/// </summary>
public string Message { get; set; }
}
+ /// <summary>
+ /// 鑾峰彇绠辩爜淇℃伅鍙傛暟Model
+ /// </summary>
+ public class FuMaGetBoxModel:FuMaModel
+ {
+ /// <summary>
+ /// 浜у搧淇℃伅
+ /// </summary>
+ public ProductModel Product { get; set; }
+ /// <summary>
+ /// 绠辨敮淇℃伅
+ /// </summary>
+ public List<BarcodesModel> Barcodes { get; set; }
+ /// <summary>
+ /// 鍖呰姣斾緥
+ /// </summary>
+ public string PkgRatio { get; set; }
+ /// <summary>
+ /// 鏁寸灏忓寘瑁呮暟閲�
+ /// </summary>
+ public decimal BoxItemQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string MaterialNum { get; set; }
+ /// <summary>
+ /// 鏍囧噯閲嶉噺
+ /// </summary>
+ public decimal StandarWeight { get; set; }
+ /// <summary>
+ /// 浜х嚎鍚嶇О
+ /// </summary>
+ public string LineName { get; set; }
+ /// <summary>
+ /// 杞﹂棿鍚嶇О
+ /// </summary>
+ public string WorkShop { get; set; }
+ /// <summary>
+ /// 璐熻矗浜�
+ /// </summary>
+ public string HeadMan { get; set; }
+
+ }
+ public class ProductModel
+ {
+ /// <summary>
+ /// 浜у搧缂栧彿
+ /// </summary>
+ public string ProductCode { get; set; }
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ public string ProductName { get; set; }
+ public int SubtypeId { get; set; }
+ /// <summary>
+ /// 瀛愮被缂栫爜
+ /// </summary>
+ public string SubType { get; set; }
+ public string Type { get; set; }
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string Spec { get; set; }
+ /// <summary>
+ /// 鍖呰瑙勬牸
+ /// </summary>
+ public string PackageSpec { get; set; }
+ /// <summary>
+ /// 鍖呰鍗曚綅
+ /// </summary>
+ public string PackUnit { get; set; }
+ public string PhysicDetailType { get; set; }
+ public bool IsSpecial { get; set; }
+ public bool Is789 { get; set; }
+ /// <summary>
+ /// 鎵瑰噯鏂囧彿
+ /// </summary>
+ public string AuthorizedNo { get; set; }
+ public List<string> PkgRatio { get; set; }
+
+ }
+
+ public class BarcodesModel
+ {
+ /// <summary>
+ /// 绠卞彿/鏀彿
+ /// </summary>
+ public string Barcode { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public int ScanTaskId { get; set; }
+ /// <summary>
+ /// 鐢熶骇鎵瑰彿
+ /// </summary>
+ public string BatchNo { get; set; }
+
+ /// <summary>
+ /// 鎷肩鍚庣殑鎵瑰彿
+ /// </summary>
+ public string MixedBatchNo { get; set; }
+ /// <summary>
+ /// 鍖呰绾у埆
+ /// </summary>
+ public string Level { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ParentBarcode { get; set; }
+
+ /// <summary>
+ /// 鐘舵�侊紝鏁寸銆侀浂绠便�佹嫾绠�
+ /// </summary>
+ public string Status { get; set; }
+ /// <summary>
+ /// 绠卞唴灏忓寘瑁呮暟閲�
+ /// </summary>
+ public decimal BoxItemQty { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string ScanTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string MixedScanTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string MixedTaskId { get; set; }
+ /// <summary>
+ /// 鐗╂祦鍙�
+ /// </summary>
+ public string LogisticsNum { get; set; }
+ /// <summary>
+ /// 鍖呰浜�
+ /// </summary>
+ public string PackageMan { get; set; }
+ /// <summary>
+ /// 鎵樼洏鐮�
+ /// </summary>
+ public string PalletCode { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string ProductionDate { get; set; }
+ /// <summary>
+ /// 鏈夋晥鏈熻嚦
+ /// </summary>
+ public string ExpirationDate { get; set; }
+ /// <summary>
+ /// 瀹為檯閲嶉噺
+ /// </summary>
+ public decimal Weight { get; set; }
+ /// <summary>
+ /// 绠卞唴浠舵暟
+ /// </summary>
+ public int MinLevelCount { get; set; }
+ }
+
#endregion
}
--
Gitblit v1.8.0