From 6b821f97b2a82c199113d68054b3e3c93f3443aa Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 28 四月 2025 14:19:04 +0800
Subject: [PATCH] 收货行ID类型修改
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs | 166 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 130 insertions(+), 36 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
index f4c8521..3039bf0 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
@@ -54,6 +54,11 @@
public bool IsLogin { get; set; }
}
+ public class Mcode
+ {
+ public string m_code { get; set; }
+ }
+
public class IssueUOM : BaseCode { }
public class POLine : BaseCode
@@ -233,6 +238,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 +252,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 +265,7 @@
/// <summary>
/// 鍗曚綅id
/// </summary>
- public string UOMMain { get; set; }
+ public double UOMMain { get; set; } = 1002212260110007;
/// <summary>
/// 鍗曚綅id
/// </summary>
@@ -262,12 +274,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 +287,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 鏃犳潵婧�
@@ -295,10 +300,9 @@
public class CreateReceivementInput : U9CBaseInput
{
/// <summary>
- /// 渚涘簲鍟�
+ /// 鏃犳潵婧愬弬鏁�
/// </summary>
- public string Supplier { get; set; }
- public List<RcvLine> RcvLines { get; set; }
+ public CreateReceivementParam CreateReceivementParam { get; set; }
}
public class RcvDTO
@@ -310,11 +314,11 @@
/// <summary>
/// 渚涘簲鍟�
/// </summary>
- public Supplier Supplier { get; set; }
+ public Mcode Supplier { get; set; }
/// <summary>
/// 鍗曟嵁绫诲瀷锛氭湁ASN鍗曚紶RCV01锛屾病鏈堿SN鍗曡禒鍝佷紶RCV03
/// </summary>
- public RcvDocType RcvDocType { get; set; }
+ public Mcode RcvDocType { get; set; }
public List<RcvLine> RcvLines { get; set; }
public bool IsRcvByChangeable { get; set; } = true;
public bool IsPriceListChangeable { get; set; } = true;
@@ -322,14 +326,7 @@
public bool IsPaymentTermChangeable { get; set; } = true;
public bool IsLineApprove { get; set; } = true;
}
- public class Supplier
- {
- public string m_code { get; set; }
- }
- public class RcvDocType
- {
- public string m_code { get; set; }
- }
+
public class RcvLine
{
/// <summary>
@@ -381,13 +378,11 @@
{
public string m_itemCode { get; set; }
}
- public class Wh2
+ public class Wh2: Mcode
{
- public string m_code { get; set; }
}
- public class Location
+ public class Location : Mcode
{
- public string m_code { get; set; }
}
public class RcvLineLocation
@@ -439,7 +434,7 @@
/// <summary>
/// 鐢熶骇璁㈠崟缂栫爜
/// </summary>
- public MOs MOs { get; set; }
+ public List<MOs> MOs { get; set; }
/// <summary>
/// 棰嗘枡鍗曡闆嗗悎
/// </summary>
@@ -488,7 +483,7 @@
/// <summary>
/// 澶囨枡琛ㄨID
/// </summary>
- public string MOPickList { get; set; }
+ public long MOPickList { get; set; }
/// <summary>
/// 鍙戞枡鎵规
/// </summary>
@@ -503,12 +498,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; }
@@ -523,6 +518,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 鍒涘缓濮斿鐢熶骇棰嗘枡鍗�
@@ -543,7 +582,7 @@
/// <summary>
/// 涓氬姟鏃ユ湡
/// </summary>
- public DateTime BusinessDate { get; set; }
+ public string BusinessDate { get; set; }
/// <summary>
/// 棰嗘枡琛岄泦鍚�
/// </summary>
@@ -588,7 +627,7 @@
/// <summary>
/// 濮斿璁㈠崟澶囨枡琛ㄨID
/// </summary>
- public string SCMOPickList { get; set; }
+ public long SCMOPickList { get; set; }
/// <summary>
/// 鍙戞枡鎵规
/// </summary>
@@ -625,6 +664,39 @@
public string OtherID { get; set; } = "WMS";
}
+ #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 鍒涘缓璋冨叆鍗�
@@ -879,4 +951,26 @@
#endregion
+
+ #region 鏀惰揣鍗曟柊澧炶搴撲綅
+
+ public class CreateRcvLineLocationInput : U9CBaseInput
+ {
+ public CreateRcvLineLocationParam RcvLineLocationParam { get; set; }
+ }
+
+
+ public class CreateRcvLineLocationParam
+ {
+ /// <summary>
+ /// 鏀惰揣琛孖D
+ /// </summary>
+ public long RcvLineId { get; set; }
+ /// <summary>
+ /// 鍌ㄤ綅
+ /// </summary>
+ public string BinCode { get; set; }
+ }
+
+ #endregion
}
--
Gitblit v1.9.3