From 76245024a71fedf2e9c9cb03fd489851f81bce55 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 02 四月 2025 16:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

---
 Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs |   95 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
index 19dce21..8cc7c41 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 鏃犳潵婧�
@@ -291,6 +298,7 @@
         /// 渚涘簲鍟�
         /// </summary>
         public string Supplier { get; set; }
+        public string RcvDocType { get; set; }
         public List<RcvLine> RcvLines { get; set; }
     }
 
@@ -496,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; }
@@ -516,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 鍒涘缓濮斿鐢熶骇棰嗘枡鍗�
@@ -620,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