From 56f5b01b7fce60a659f18f7c840c0867cd42067a Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期二, 01 四月 2025 23:48:47 +0800 Subject: [PATCH] 新增审核和确认接口,优化登录逻辑 --- Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs | 83 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 3 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs index 8e8b3bd..8cc7c41 100644 --- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs +++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs @@ -504,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; } @@ -524,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> + /// 鑷姩鎵f枡 榛樿 false + /// </summary> + public bool IsAutoIssued { get; set; } = false; + public string OtherID { get; set; } = "WMS"; + /// <summary> + /// 鐘舵�� 1涓烘彁浜ょ姸鎬� + /// </summary> + public int DocStatus { get; set; } + } #endregion #region 鍒涘缓濮斿鐢熶骇棰嗘枡鍗� @@ -628,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