From a8fcfbb5e5ed9a07b1a30ef2d7ef9d407e9b04dd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 02 四月 2025 21:44:54 +0800
Subject: [PATCH] 更新ASN实体
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 260 insertions(+), 20 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
index e72ed77..8cc7c41 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
@@ -160,11 +160,11 @@
/// <summary>
/// 鍏ュ簱鍗曡鎬绘暟閲�
/// </summary>
- public decimal CreateBarCodeItemQty { get; set; }
+ public double CreateBarCodeItemQty { get; set; }
/// <summary>
/// 鍖呰瑁呯鏁伴噺
/// </summary>
- public decimal LabelQty { get; set; }
+ public double LabelQty { get; set; }
}
public class BarcodeCreateByAssignQtyParam
@@ -174,11 +174,11 @@
/// <summary>
/// 鍏ュ簱鍗曡鎬绘暟閲�
/// </summary>
- public decimal CreateBarCodeItemQty { get; set; }
+ public double CreateBarCodeItemQty { get; set; }
/// <summary>
/// 鍖呰瑁呯鏁伴噺
/// </summary>
- public decimal LabelQty { get; set; }
+ public double LabelQty { get; set; }
}
public class CreateBarCodeEntitys
@@ -233,6 +233,13 @@
{
public TransQty TransQty { get; set; }
public string ASNLineKey { get; set; }
+ public List<BinInfoList> BinInfoList { get; set; }
+ }
+
+ public class BinInfoList {
+ public Location Bin { get; set; }
+ public double LocationQtySU { get; set; }
+ public double LocationQtyTU { get; set; }
}
public class TransQty
@@ -240,7 +247,7 @@
/// <summary>
/// 鏈鏀惰揣鏁伴噺1
/// </summary>
- public string m_amount1 { get; set; }
+ public double m_amount1 { get; set; }
public m_uOM1 m_uOM1 { get; set; }
}
@@ -253,7 +260,7 @@
/// <summary>
/// 鍗曚綅id
/// </summary>
- public string UOMMain { get; set; }
+ public double UOMMain { get; set; } = 1002212260110007;
/// <summary>
/// 鍗曚綅id
/// </summary>
@@ -262,12 +269,12 @@
public class UOMMain_SKey
{
- public string ID { get; set; }
+ public double ID { get; set; } = 1002212260110007;
}
public class UOMSub_SKey
{
- public string ID { get; set; }
+ public double ID { get; set; } = 1002212260110007;
}
/// <summary>
@@ -275,14 +282,7 @@
/// </summary>
public class CreateRcvBySrcASNInput : U9CBaseInput
{
- /// <summary>
- /// 褰撳墠鏀惰揣鏁伴噺 - m_amount1
- /// </summary>
- public string CurRevQty { get; set; }
- /// <summary>
- /// ASN鍗曡ID
- /// </summary>
- public string ASNLineKey { get; set; }
+ public CreateRcvBySrcASNParam CreateRcvBySrcASNParam { get; set; }
}
#region 鏃犳潵婧�
@@ -294,7 +294,12 @@
public class CreateReceivementInput : U9CBaseInput
{
-
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ public string Supplier { get; set; }
+ public string RcvDocType { get; set; }
+ public List<RcvLine> RcvLines { get; set; }
}
public class RcvDTO
@@ -499,12 +504,12 @@
#endregion
#region 鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂欐帴鍙�
- public class CreateProdReturnOrderInput : U9CBaseInput
+ public class CreateProdReturnOrderNewInput : U9CBaseInput
{
- public List<CreateProdReturnOrderParam> CreateProdReturnOrderParam { get; set; }
+ public List<CreateProdReturnOrderNewParam> CreateProdReturnOrderNewParams { get; set; }
}
- public class CreateProdReturnOrderParam
+ public class CreateProdReturnOrderNewParam
{
public List<RecedeItemAndSnDTOList> RecedeItemAndSnDTOList { get; set; }
public bool IsAutoIssued { get; set; }
@@ -519,6 +524,50 @@
public double IssueLineNum { get; set; }
}
+ #endregion
+
+ #region 鍒涘缓鐢熶骇閫�鏂欏崟
+ public class CreateProdReturnOrderInput : U9CBaseInput
+ {
+ public List<CreateProdReturnOrderParam> CreateProdReturnOrderParam { get; set; }
+ }
+
+ public class CreateProdReturnOrderParam
+ {
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string ItemCode { get; set; }
+ /// <summary>
+ /// 澶囨枡琛↖D
+ /// </summary>
+ public string PickID { get; set; }
+ /// <summary>
+ /// 閫�鏂欐暟閲�
+ /// </summary>
+ public double RecedeQty { get; set; }
+ /// <summary>
+ /// 閫�鏂欑悊鐢� 0 鍊掓墸閫�鏂� 1濮斿閫�鏂� 2鎸枡閫�鏂� 3棰嗘枡寤鸿閫�鏂� 4鍋囬��鏂� 5鐩樼偣宸紓閫�鏂� 6璺ㄦ湡闂村弽寮�宸ラ��鏂�
+ /// </summary>
+ public int RecedeReason { get; set; }
+ /// <summary>
+ /// 棰嗘枡鍗曡ID
+ /// </summary>
+ public double IssueDocLine { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鑷姩鎵ｆ枡 榛樿 false
+ /// </summary>
+ public bool IsAutoIssued { get; set; } = false;
+ public string OtherID { get; set; } = "WMS";
+ /// <summary>
+ /// 鐘舵�� 1涓烘彁浜ょ姸鎬�
+ /// </summary>
+ public int DocStatus { get; set; }
+ }
#endregion
#region 鍒涘缓濮斿鐢熶骇棰嗘枡鍗�
@@ -623,6 +672,39 @@
#endregion
+ #region 棰嗘枡鍗�/閫�鏂欏崟鍙戞枡/閫�鏂欑‘璁�
+ public class ConfirmReqReturnInput : U9CBaseInput
+ {
+ public List<ConfirmReqReturnParam> ConfirmReqReturnParams { get; set; }
+ }
+
+ public class ConfirmReqReturnParam
+ {
+ /// <summary>
+ /// 棰嗘枡鍗�/閫�鏂欏崟鍙�
+ /// </summary>
+ public string DocNo { get; set; }
+ public bool IsSucceed { get; set; } = true;
+ public string ErrorMsg { get; set; }
+ public bool OperateType { get; set; } = true;
+ public string OtherID { get; set; } = "WMS";
+ public bool IsNotNewTransaction { get; set; } = true;
+ public bool IsAutoApp { get; set; } = true;
+ }
+ #endregion
+
+
+ #region 棰嗘枡鍗曢��鏂欏崟瀹℃牳鎺ュ彛
+ public class ApproveReqReturnInput : U9CBaseInput
+ {
+ public List<ApproveReqReturnParam> ApproveReqReturnParams { get; set; }
+ }
+
+ public class ApproveReqReturnParam: ConfirmReqReturnParam
+ {
+ }
+ #endregion
+
#region 鍒涘缓璋冨叆鍗�
public class CreateTransferInInput : U9CBaseInput
{
@@ -716,5 +798,163 @@
}
#endregion
+ #region 璋冨叆鍗曞鏍�
+ public class TransferInSubmitInput : U9CBaseInput
+ {
+ public List<TransferInSubmitParam> TransferInSubmitParam { get; set; }
+ }
+ public class TransferInSubmitParam
+ {
+ /// <summary>
+ /// 榛樿"WMS"
+ /// </summary>
+ public string OtherID { get; set; } = "WMS";
+ /// <summary>
+ /// 鍗曟嵁缂栫爜
+ /// </summary>
+ public string Code { get; set; }
+ }
+
+ #endregion
+
+ #region 褰㈡�佽浆鎹㈠崟
+ public class CreateTransferFormInput : U9CBaseInput
+ {
+ public List<CreateTransferFormParam> CreateTransferFormParam { get; set; }
+ }
+ public class CreateTransferFormParam
+ {
+ /// <summary>
+ /// 榛樿"WMS"
+ /// </summary>
+ public string OtherID { get; set; } = "WMS";
+ /// <summary>
+ /// 鍗曟嵁绫诲埆锛歍ransForm001 鏂欏搧褰㈡�佽浆鎹� TransForm003 鎵瑰彿褰㈡�佽浆鎹�
+ /// </summary>
+ public string TransferFormTransType_Code { get; set; }
+ /// <summary>
+ /// 涓氬姟鏃堕棿
+ /// </summary>
+ public DateTime BussinessDate { get; set; }
+ /// <summary>
+ /// 褰㈡�佽浆鎹㈣闆嗗悎
+ /// </summary>
+ public List<TransferFormLine> TransferFormLines { get; set; }
+ }
+
+ public class TransferFormLine : TransferFormBaseLine
+ {
+ /// <summary>
+ /// 杞崲绫诲瀷0杞崲鍓� 1杞崲鍚� 榛樿浼�0
+ /// </summary>
+ public int TransferType { get; set; } = 0;
+ /// <summary>
+ /// 鎴愭湰鑱斿姩榛樿浼爐rue
+ /// </summary>
+ public bool IsCostDependent { get; set; } = true;
+ /// <summary>
+ /// 杞崲鍚庢暟鎹泦鍚�
+ /// </summary>
+ public List<TransferFormSubLine> TransferFormSubLines { get; set; }
+ }
+
+ /// <summary>
+ /// 杞崲鍚庢暟鎹�
+ /// </summary>
+ public class TransferFormSubLine : TransferFormBaseLine
+ {
+ /// <summary>
+ /// 杞崲绫诲瀷0杞崲鍓� 1杞崲鍚� 榛樿浼�1
+ /// </summary>
+ public int TransferType { get; set; } = 1;
+ }
+
+ public class TransferFormBaseLine
+ {
+ /// <summary>
+ /// TransferFormLine涓负杞崲鍓嶆枡鍙凤紝TransferFormSubLine涓负杞崲鍚庢枡鍙�
+ /// </summary>
+ public ItemEntity ItemInfo { get; set; }
+ /// <summary>
+ /// TransferFormLine涓负杞崲鍓嶄粨浣嶏紝TransferFormSubLine涓负杞崲鍚庝粨浣�
+ /// </summary>
+ public string Wh_Code { get; set; }
+ /// <summary>
+ /// TransferFormLine涓负杞崲鍓嶅簱瀛樻暟閲忥紝TransferFormSubLine涓负杞崲鍚庡簱瀛樻暟閲�
+ /// </summary>
+ public double StoreUOMQty { get; set; }
+ /// <summary>
+ /// TransferFormLine涓负杞崲鍓嶆垚鏈暟閲忥紝TransferFormSubLine涓负杞崲鍚庢垚鏈暟閲�
+ /// </summary>
+ public double CostUOMQty { get; set; }
+ public int StorageType { get; set; } = 4;
+ /// <summary>
+ /// TransferFormLine涓负杞崲鍓嶅偍浣嶏紝TransferFormSubLine涓负杞崲鍚庡偍浣�
+ /// </summary>
+ public string BinInfo_Code { get; set; }
+ /// <summary>
+ /// TransferFormLine涓负杞崲鍓嶆壒鍙凤紝TransferFormSubLine涓负杞崲鍚庢壒鍙�
+ /// </summary>
+ public string LotInfo_Code { get; set; }
+ }
+
+ public class TransferFormSubmitInput : U9CBaseInput
+ {
+ public List<TransferFormSubmitParam> TransferFormSubmitParam { get; set; }
+ }
+
+ public class TransferFormSubmitParam
+ {
+ /// <summary>
+ /// 榛樿"WMS"
+ /// </summary>
+ public string OtherID { get; set; } = "WMS";
+ /// <summary>
+ /// 鍗曟嵁缂栫爜
+ /// </summary>
+ public string Code { get; set; }
+ }
+
+ #endregion
+
+ #region 鏉傛敹鍗曞鏍�
+ public class MiscRcvTransApproveInput : U9CBaseInput
+ {
+ public List<MiscRcvTransApproveParam> MiscRcvTransApproveParam { get; set; }
+ }
+
+ public class MiscRcvTransApproveParam
+ {
+ /// <summary>
+ /// 榛樿"WMS"
+ /// </summary>
+ public string OtherID { get; set; } = "WMS";
+ /// <summary>
+ /// 鍗曟嵁缂栫爜
+ /// </summary>
+ public string Code { get; set; }
+ }
+
+ #endregion
+
+ #region 鏉傚彂鍗曞鏍�
+ public class MiscShipApproveInput : U9CBaseInput
+ {
+ public List<MiscShipApproveParam> MiscShipApproveParam { get; set; }
+ }
+
+ public class MiscShipApproveParam
+ {
+ /// <summary>
+ /// 榛樿"WMS"
+ /// </summary>
+ public string OtherID { get; set; } = "WMS";
+ /// <summary>
+ /// 鍗曟嵁缂栫爜
+ /// </summary>
+ public string Code { get; set; }
+ }
+
+ #endregion
}
--
Gitblit v1.9.3