From 43b2af8956d54dc3a53f211c53d8af582806b6ba Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 08 四月 2025 11:18:58 +0800
Subject: [PATCH] 备料任务合并发料只适用于包装车间工单发料 备料任务增加根据发料类型，调用相应发料单据的ERP接口
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs | 102 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
index 1ef6443..3fec36c 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
@@ -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; }
}
@@ -275,7 +282,7 @@
/// </summary>
public class CreateRcvBySrcASNInput : U9CBaseInput
{
- public List<CreateRcvBySrcASNParam> CreateRcvBySrcASNParam { get; set; }
+ public CreateRcvBySrcASNParam CreateRcvBySrcASNParam { get; set; }
}
#region 鏃犳潵婧�
@@ -433,7 +440,7 @@
/// <summary>
/// 鐢熶骇璁㈠崟缂栫爜
/// </summary>
- public MOs MOs { get; set; }
+ public List<MOs> MOs { get; set; }
/// <summary>
/// 棰嗘枡鍗曡闆嗗悎
/// </summary>
@@ -482,7 +489,7 @@
/// <summary>
/// 澶囨枡琛ㄨID
/// </summary>
- public string MOPickList { get; set; }
+ public long MOPickList { get; set; }
/// <summary>
/// 鍙戞枡鎵规
/// </summary>
@@ -497,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; }
@@ -517,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 鍒涘缓濮斿鐢熶骇棰嗘枡鍗�
@@ -537,7 +588,7 @@
/// <summary>
/// 涓氬姟鏃ユ湡
/// </summary>
- public DateTime BusinessDate { get; set; }
+ public string BusinessDate { get; set; }
/// <summary>
/// 棰嗘枡琛岄泦鍚�
/// </summary>
@@ -582,7 +633,7 @@
/// <summary>
/// 濮斿璁㈠崟澶囨枡琛ㄨID
/// </summary>
- public string SCMOPickList { get; set; }
+ public long SCMOPickList { get; set; }
/// <summary>
/// 鍙戞枡鎵规
/// </summary>
@@ -621,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
{
--
Gitblit v1.9.3