From 04624e7dae0291aba33967f754573236324d2a62 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期四, 24 七月 2025 17:02:31 +0800
Subject: [PATCH] Merge branch 'master' into djp
---
Wms/Model/InterFaceModel/HttpModel.cs | 644 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 626 insertions(+), 18 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index ae83817..078b54a 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Text;
namespace Model.InterFaceModel
@@ -73,13 +74,43 @@
#region WCS鎺ュ彛瀹炰綋绫�
/// <summary>
- /// 鎺ユ敹wcs鎺ュ彛杩斿洖鍙傛暟鐨刴odel
+ /// 鎺ユ敹wcs鎺ュ彛杩斿洖WCS缁撴灉鍙傛暟鐨刴odel
/// </summary>
public class WcsModel
{
public int StatusCode { get; set; }
public string Msg { get; set; }
}
+ /// <summary>
+ /// 鎺ュ彈WCS鍙嶉鐨勫弬鏁�
+ /// </summary>
+ public class WcsModel2
+ {
+ public int code { get; set; }
+ public string message { get; set; }
+
+ }
+
+ public enum PLCTypeEnum
+ {
+
+ /// <summary>
+ /// 杈撻�佺嚎
+ /// </summary>
+ [Description("杈撻�佺嚎")]
+ ConveyorLine = 1,
+ /// <summary>
+ /// AGV灏忚溅
+ /// </summary>
+ [Description("AGV灏忚溅")]
+ AGV = 2,
+ /// <summary>
+ /// 绌挎杞�
+ /// </summary>
+ [Description("绌挎杞�")]
+ ShuttleCar = 7
+ }
+
/// <summary>
/// Wms涓撶敤 涓嬪彂鎸囦护Dto
/// </summary>
@@ -94,6 +125,8 @@
/// 浠诲姟绫诲瀷0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2绉诲簱浠诲姟
/// </summary>
public string TaskType { get; set; }
+
+ public PLCTypeEnum Type { get; set; }
/// <summary>
/// 鎵樼洏鍙�
@@ -129,24 +162,8 @@
/// 椤哄簭-浼樺厛绾�
/// </summary>
public int Order { get; set; }
+ public int? Qty { 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
@@ -342,4 +359,595 @@
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
+
+ #region#SAP瀹炰綋绫�
+ public class SapSkuInfoVm
+ {
+ public SendSkuInfoVm data { get; set; }
+ }
+ public class SendSkuInfoVm
+ {
+ /// <summary>
+ /// 鐗╂枡鍙�
+ /// </summary>
+ public long skuNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫荤洰
+ /// </summary>
+ public string categoryNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫荤洰鍚嶇О
+ /// </summary>
+ public string categoryName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瀛樻斁鍖哄煙
+ /// </summary>
+ public string regionNo { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏嶆
+ /// </summary>
+ public int consume { get; set; }
+
+ /// <summary>
+ /// 鍩烘湰鍗曚綅
+ /// </summary>
+ public string unit { get; set; }
+
+ /// <summary>
+ /// 鍖呰鏁伴噺
+ /// </summary>
+ public decimal packageQty { get; set; }
+
+ /// <summary>
+ /// 绠卞崟浣�
+ /// </summary>
+ public string packageName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string specification { get; set; }
+
+ /// <summary>
+ /// 淇濊川鏈�
+ /// </summary>
+ public string? shelfLife { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱涓存湡澶╂暟
+ /// </summary>
+ public string? remainingDays { get; set; }
+ }
+
+ public class SapCustomerVm
+ {
+ public SendCustomerVm data { get; set; }
+ }
+ /// <summary>
+ /// 涓嬪彂鍚屾瀹㈡埛渚涘簲鍟嗘暟鎹�
+ /// </summary>
+ public class SendCustomerVm
+ {
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public long customerNo { get; set; }
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string customerName { get; set; }
+ /// <summary>
+ /// 绫诲瀷 0锛氬鎴枫��1锛氫緵搴斿晢銆�
+ /// </summary>
+ public string CustomerType { get; set; }
+ /// <summary>
+ /// 鍦板潃
+ /// </summary>
+ public string streetAddress { get; set; }
+ /// <summary>
+ /// 鑱旂郴浜�
+ /// </summary>
+ public string contact { get; set; }
+ /// <summary>
+ /// 鑱旂郴浜虹數璇�
+ /// </summary>
+ public string contactMobile { get; set; }
+ }
+
+ public class SapAsnVm
+ {
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string @operator{ get; set; }
+ public SendAsnVm data { get; set; }
+ }
+ public class SendAsnVm
+ {
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public string orderNo { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曠被鍨�
+ /// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 锛堥攢鍞��璐э級4锛氫綑鏂欓��鍥炲叆搴� 8 锛氱敓浜ч��鏂欏叆搴�
+ /// </summary>
+ public string billType { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ /// </summary>
+ public string vendorNo { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ public string vendorName { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<SendAsnDetail> orderDCmdList { get; set; }
+ }
+ public class SendAsnDetail
+ {
+ /// <summary>
+ /// 鍏ュ簱鍗曡鍙�
+ /// </summary>
+ public string lineNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 搴旀敹鐗╂枡鏁伴噺
+ /// </summary>
+ public string expectedQty { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string productionDate { get; set; }
+ /// <summary>
+ /// 鍒版湡鏃ユ湡
+ /// </summary>
+ public string expireDate { get; set; }
+ /// <summary>
+ /// 澶嶆鏃ユ湡
+ /// </summary>
+ public string retestDate { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗘壒鍙�
+ /// </summary>
+ public string supplyBatch { get; set; }
+ }
+
+ public class SapSoVm
+ {
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string @operator { get; set; }
+ public SendSoVm data { get; set; }
+ }
+ public class SendSoVm
+ {
+ /// <summary>
+ /// 鍑哄簱鍗曞彿
+ /// </summary>
+ public string orderNo { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曟嵁绫诲瀷
+ /// 0锛氭垚鍝佸嚭搴撱��1锛氶鏂欏嚭搴撱��4锛氫笉鍚堟牸鍝佸嚭搴撱��7锛氬叾浠栧嚭搴� 銆�9 锛氱敓浜ч鏂欏嚭搴�
+ /// </summary>
+ public string orderType { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栫爜
+ /// </summary>
+ public string customerNo { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ public string customerName { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<SendSoDetail> orderDetailList { get; set; }
+ }
+ public class SendSoDetail
+ {
+ /// <summary>
+ /// 鍙戝嚭浠撳簱
+ /// </summary>
+ public string wareHouseNo { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曡鍙�
+ /// </summary>
+ public string lineNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal skuQty { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ }
+
+ public class BackAsnVm
+ {
+ /// <summary>
+ /// 闃查噸鐮�
+ /// </summary>
+ public string ZUUID { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public string VBELN { get; set; }
+ /// <summary>
+ /// 璁㈠崟绫诲瀷锛�0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氫綑鏂欓��鍥炲叆搴� 8 锛氱敓浜ч��鏂欏叆搴�
+ /// </summary>
+ public string LFART { get; set; }
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚鏃堕棿
+ /// </summary>
+ public string WADAT_IST { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<BackAsnDetail> ITEM { get; set; }
+ }
+ public class BackAsnDetail
+ {
+ /// <summary>
+ /// 琛岀紪鐮�
+ /// </summary>
+ public string POSNR { get; set; }
+ /// <summary>
+ /// 鑽搧缂栫爜
+ /// </summary>
+ public string MATNR { get; set; }
+ /// <summary>
+ /// 鑽搧鍚嶇О
+ /// </summary>
+ public string MAKTX { get; set; }
+ /// <summary>
+ /// 瀹炴敹鏁伴噺
+ /// </summary>
+ public string LFIMG { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string MEINS { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string CHARG { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string HSDAT { get; set; }
+ /// <summary>
+ /// 鍒版湡鏃ユ湡
+ /// </summary>
+ public string VFDAT { get; set; }
+ }
+
+ public class BackSoVm
+ {
+ /// <summary>
+ /// 闃查噸鐮�
+ /// </summary>
+ public string ZUUID { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曞彿
+ /// </summary>
+ public string VBELN { get; set; }
+ /// <summary>
+ /// 璐т富缂栫爜
+ /// </summary>
+ public string WERKS { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曠被鍨�,鍗曟嵁绫诲瀷 0锛氭垚鍝佸嚭搴� 1锛氶鏂欏嚭搴� 4锛氫笉鍚堟牸鍝佸嚭搴� 7锛氬叾浠栧嚭搴� 9 锛氱敓浜ч鏂欏嚭搴�
+ /// </summary>
+ public string LFART { get; set; }
+ /// <summary>
+ /// 璁㈠崟瀹屾垚鏃堕棿
+ /// </summary>
+ public string WADAT_IST { get; set; }
+ /// <summary>
+ /// 璁㈠崟鏄庣粏
+ /// </summary>
+ public List<BackSoDetail> ITEM { get; set; }
+ }
+ public class BackSoDetail
+ {
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ public string POSNR { get; set; }
+ /// <summary>
+ /// 鑽搧缂栫爜
+ /// </summary>
+ public string MATNR { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string CHARG { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string LFIMG { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string MEINS { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string HSDAT { get; set; }
+ /// <summary>
+ /// 鍒版湡鏃ユ湡
+ /// </summary>
+ public string VFDAT { get; set; }
+ }
+
+ public class SapQualityVm
+ {
+ public string @operator{ get; set; }
+ public SendQualityVm data { get; set; }
+ }
+ public class SendQualityVm
+ {
+ /// <summary>
+ /// 璋冩暣鍗曞彿
+ /// </summary>
+ public string orderNo { get; set; }
+ /// <summary>
+ /// 璋冩暣鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<SendQualityDetailVm> adjustmentDList { get; set; }
+ }
+ public class SendQualityDetailVm
+ {
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ public string lineNo { get; set; }
+ /// <summary>
+ /// 璐т富缂栧彿
+ /// </summary>
+ public string ownerNo { 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 decimal skuQty { get; set; }
+ /// <summary>
+ /// 鏄惁鍚堟牸
+ /// </summary>
+ public string IsQualified { get; set; }
+ }
+
+ public class SapSampleVm
+ {
+ public SendSampleVm data { get; set; }
+ }
+ public class SendSampleVm
+ {
+ public List<SendSampleSku> pallDataList { get; set; }
+ }
+ public class SendSampleSku
+ {
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ /// <summary>
+ /// 鎵ｉ櫎鏁伴噺
+ /// </summary>
+ public decimal skuQty { get; set; }
+ }
+
+
+ public class SapQcVm
+ {
+ public SendSapQcVm data { get; set; }
+ }
+ public class SendSapQcVm
+ {
+ public List<SendSapQcDetailVm> pallDataList { get; set; }
+ }
+ public class SendSapQcDetailVm
+ {
+ /// <summary>
+ /// 璇烽獙缂栧彿
+ /// </summary>
+ public string QcNo { 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 decimal Qty { get; set; }
+ /// <summary>
+ /// 渚涜揣鎵规
+ /// </summary>
+ public string SupplierLot { get; set; }
+ }
+ #endregion
}
--
Gitblit v1.8.0