From e2303b1125817cb7887e36d5905c8f1661d685a3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 29 五月 2025 17:29:52 +0800
Subject: [PATCH] 完善ERP出库下发任务及来源单号、记录表的字段更新
---
api/ApiModel.cs | 134 +++++++++++++++++++++++++-------------------
1 files changed, 75 insertions(+), 59 deletions(-)
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 5a5ac90..4b66d75 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -175,12 +175,12 @@
/// 鐗╂枡瑙勬牸
/// </summary>
[JsonProperty("s_spec")]
- public string s_spec { get; set; }
+ public string Spec { get; set; }
/// <summary>
/// 鏁伴噺
/// </summary>
[JsonProperty("n_num")]
- public int n_num { get; set; }
+ public int Num { get; set; }
/// <summary>
/// 璧风偣璐т綅淇℃伅
/// </summary>
@@ -273,54 +273,20 @@
public string StartLoc { get; set; }
}
- public class EmptyInboundDetailInfo { }
-
- //public class EmptyOnlineInfo {
- // public string ItemCode { get; set; }
- // public string ItemName { get; set; }
- // public string PatchNo { get; set; }
- // public string EndLoc { get; set; }
- //}
-
public class EmptyOnlinePalletInfo {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
-
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
- /// <summary>
- /// 鎵规鍙�- /// </summary>
-
[JsonProperty("batch_no")]
public string BatchNo { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
[JsonProperty("spe")]
- public string Spe { get; set; }
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
+ public string Spec { get; set; } // 鐗╂枡瑙勬牸
[JsonProperty("cnt_id")]
- public string CntId { get; set; }
- // 瀹瑰櫒绫诲瀷 = 鎵樼洏
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 鎵樼洏
}
public class EmptyOnlineGoodpackInfo {
- // 瀹瑰櫒绫诲瀷 = 濂借繍绠�- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
[JsonProperty("cnt_id")]
- public string CntId { get; set; }
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 濂借繍绠� }
/// <summary>
@@ -333,12 +299,6 @@
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
@@ -490,21 +450,10 @@
/// 鐗╂枡淇℃伅涓嬪彂鍚屾 鏁版嵁绫� /// </summary>
public class CgInfoSyncInfo {
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
[JsonProperty("itemName")]
public string ItemName { get; set; }
-
- /// <summary>
- /// 浜у搧鐗屽彿
- /// </summary>
[JsonProperty("itemCode")]
public string ItemCode { get; set; }
-
- /// <summary>
- /// 鎵规鍙�- /// </summary>
[JsonProperty("batchNo")]
public string BatchNo { get; set; }
@@ -530,7 +479,7 @@
/// <summary>
/// MES API 鍝嶅簲缁撴灉绫� /// </summary>
- public class WmsResult {
+ public class MesResult {
/// <summary>
/// 鎺ュ彛璋冪敤缁撴灉 1-鎴愬姛 0-澶辫触
/// </summary>
@@ -550,12 +499,79 @@
public string Data { get; set; }
}
- public static WmsResult NewWmsResult(int code, string message = "", bool printLog = true) {
- return new WmsResult {
+ public static MesResult NewMesResult(int code, string message = "", bool printLog = true) {
+ return new MesResult {
Result = code,
Success = code == 0, // 浠呭綋code=0鏃讹紝success=true
Data = message,
};
}
+
+ /// <summary>
+ /// 鍙嶉 ERP 鐨勬暟鎹被鍨�+ /// </summary>
+ public class ErpResult {
+ [JsonProperty("code")]
+ public int Code { get; set; }
+ [JsonProperty("message")]
+ public string Message { get; set; }
+ }
+
+ public static ErpResult NewErpResult(int code, string message) {
+ return new ErpResult { Code = code, Message = message };
+ }
+
+ /// <summary>
+ /// ERP 涓嬪彂鍑哄簱浠诲姟鐨勬暟鎹被鍨�+ /// </summary>
+ public class ErpSendOutboundOrderInfo {
+ public string ErpNo { get; set; } // ERP 鍗曞彿
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [JsonProperty("item_code")]
+ public string ItemCode { get; set; }
+ ///// <summary>
+ ///// 鐗╂枡鍚嶇О
+ ///// </summary>
+ //[JsonProperty("item_name")]
+ //public string ItemName { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [JsonProperty("spe")]
+ public string Spe { get; set; }
+ /// <summary>
+ /// 鎵规鍙�+ /// </summary>
+ [JsonProperty("batch_no")]
+ public string BatchNo { get; set; }
+ /// <summary>
+ /// 闇�嚭搴撴暟閲�+ /// </summary>
+ [JsonProperty("qty")]
+ public int Qty { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ [JsonProperty("cntr_type")]
+ public string CntrType { get; set; }
+ /// <summary>
+ /// 鍑哄簱缁堢偣璐у尯
+ /// </summary>
+ [JsonProperty("end_area")]
+ public string EndArea { get; set; }
+ /// <summary>
+ /// 鏄惁寮哄埗鍑哄簱
+ /// </summary>
+ [JsonProperty("force_out")]
+ public bool ForcedOut { get; set; }
+
+ }
+
+ public class PickUpReturnErpInfo {
+ public string LocCode { get; set; }
+
+ }
}
}
--
Gitblit v1.9.1