From 1c2541b283ce6ba855e67c476412dffe2c693480 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 11 六月 2025 13:56:23 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/Model/InterFaceModel/HttpModel.cs | 149 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 131 insertions(+), 18 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index a3db8e2..4eed61d 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -93,6 +93,12 @@
public enum PLCTypeEnum
{
+
+ /// <summary>
+ /// 杈撻�佺嚎
+ /// </summary>
+ [Description("杈撻�佺嚎")]
+ ConveyorLine = 1,
/// <summary>
/// AGV灏忚溅
/// </summary>
@@ -156,24 +162,7 @@
/// 椤哄簭-浼樺厛绾�
/// </summary>
public int Order { get; set; }
-
-
- /// <summary>
- /// 鎵樼洏绫诲瀷锛�0:鐗╂枡 1:鎵樼洏
- /// </summary>
- public string PalletType { get; set; }
- /// <summary>
- /// 鎷ｈ揣鏂瑰紡锛�0:鏈哄櫒浜烘媶鍨� 1:PDA鎷嗗灈
- /// </summary>
- public string UnstackingMode { get; set; }
- /// <summary>
- /// 鎵樼洏涓婃�绘暟閲�
- /// </summary>
- public decimal? BoxexQty { get; set; }
- /// <summary>
- /// 鎷ｈ揣鏁伴噺
- /// </summary>
- public decimal? CompleteQty { get; set; }
+
}
/// <summary>
/// 鎺ュ彈wcs浠诲姟鍙嶉淇℃伅Model
@@ -369,4 +358,128 @@
public string RequestUser { get; set; }
}
#endregion
+
+
+ #region MyRegion
+
+ public class FumaGetBoxModel
+ {
+ public string Success { get; set; }
+ public string Message { get; set; }
+ public PlnBoxModel Product { get; set; }
+ }
+
+ public class PlnBoxModel
+ {
+
+ /// <summary>
+ /// 涓婃父鍗曟嵁鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PallNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍙�
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗕唬鐮�
+ /// </summary>
+ public string Custom { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ public string CustomName { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string ProductionTime { get; set; }
+ /// <summary>
+ /// 杩囨湡鏃ユ湡
+ /// </summary>
+ public string ExpirationTime { get; set; }
+ /// <summary>
+ /// 浜х嚎
+ /// </summary>
+ public string Line_No { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+ /// <summary>
+ /// 鍖呰瑙勬牸
+ /// </summary>
+ public string PackageStandard { get; set; }
+ /// <summary>
+ /// 鍖呰鍗曚綅
+ /// </summary>
+ public string PackUnit { get; set; }
+ /// <summary>
+ /// 瀛樺偍鏈熻嚦
+ /// </summary>
+ public string StoreTime { get; set; }
+
+ /// <summary>
+ /// 绠辩爜淇℃伅
+ /// </summary>
+ public List<BoxInfoList> BoxInfoList { get; set; }
+ }
+
+ public class BoxInfoList
+ {
+ /// <summary>
+ /// 闆剁鏍囪
+ /// </summary>
+ public string BitBoxMark { get; set; }
+ /// <summary>
+ /// 绠辨潯鐮�
+ /// </summary>
+ public string BoxNo { get; set; }
+
+ /// <summary>
+ /// 鐩掔爜淇℃伅
+ /// </summary>
+ public List<BoxInfo2List> BoxInfo2List { get; set; }
+ }
+ public class BoxInfo2List
+ {
+ /// <summary>
+ /// 鐩掓潯鐮�
+ /// </summary>
+ public string BoxNo2 { get; set; }
+
+ /// <summary>
+ /// 鏀爜淇℃伅
+ /// </summary>
+ public List<BoxInfo3List> BoxInfo3List { get; set; }
+ }
+
+ public class BoxInfo3List
+ {
+ /// <summary>
+ /// 鏀潯鐮�
+ /// </summary>
+ public string BoxNo3 { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ }
+
+ #endregion
}
--
Gitblit v1.8.0