From 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922 Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期三, 09 七月 2025 22:55:27 +0800 Subject: [PATCH] 增加质检出入库逻辑 --- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_hty.cs | 56 +++++++++++++++++++++----------------------------------- 1 files changed, 21 insertions(+), 35 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_hty.cs" index cd4de0e..8d09b8a 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_hty.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_hty.cs" @@ -10,48 +10,34 @@ namespace WIDESEA_Model.Models { - [SugarTable(nameof(Dt_InboundOrder_hty), "鍏ュ簱鍗曞巻鍙�")] - public class Dt_InboundOrder_hty : BaseEntity + [SugarTable(nameof(Dt_InboundOrder_Hty), "鍏ュ簱鍗曞巻鍙�")] + public class Dt_InboundOrder_Hty : Dt_InboundOrder, IBaseHistoryEntity { - [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")] - public int Id { get; set; } - - [CodeRule(WIDESEA_Core.Enums.RuleCode.InboundOrderRule)] - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")] - public string OrderNo { get; set; } - - [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "涓婃父鍗曟嵁缂栧彿")] - public string UpperOrderNo { get; set; } - - [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷")] - public int OrderType { get; set; } - - [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鐘舵��")] - public int OrderStatus { get; set; } - - [SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏂瑰紡")] - public int CreateType { get; set; } - - [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")] - public string Remark { get; set; } + /// <summary> + /// 鍘熻〃涓婚敭 + /// </summary> + [ImporterHeader(Name = "鍘熻〃涓婚敭")] + [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")] + [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")] + public int SourceId { get; set; } /// <summary> - /// 鎿嶄綔鑰� + /// 鎿嶄綔绫诲瀷 /// </summary> - [ImporterHeader(Name = "鎿嶄綔鑰�")] - [ExporterHeader(DisplayName = "鎿嶄綔鑰�")] - [SugarColumn(IsNullable = false, Length = 50, IsOnlyIgnoreUpdate = true, ColumnDescription = "鎿嶄綔鑰�")] - public string Operator { get; set; } + [ImporterHeader(Name = "鎿嶄綔绫诲瀷")] + [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")] + [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")] + public string OperateType { get; set; } /// <summary> - /// 鎿嶄綔鏃堕棿 + /// 绉诲叆鍘嗗彶鏃堕棿 /// </summary> - [ImporterHeader(Name = "鎿嶄綔鏃堕棿")] - [ExporterHeader(DisplayName = "鎿嶄綔鏃堕棿")] - [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鎿嶄綔鏃堕棿")] - public DateTime OperatingTime { get; set; } = DateTime.Now; + [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")] + [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")] + [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")] + public DateTime InsertTime { get; set; } = DateTime.Now; - [Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderDetail_hty.OrderId), nameof(Id))] - public List<Dt_InboundOrderDetail_hty> Details { get; set; } + [Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderDetail_Hty.OrderId), nameof(SourceId))] + public new List<Dt_InboundOrderDetail_Hty> Details { get; set; } } } -- Gitblit v1.9.3