From 733e63cb362f17aea4a1020654fa348a0d0c1f06 Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期一, 24 二月 2025 00:08:59 +0800 Subject: [PATCH] 优化入库逻辑,优化直接出库逻辑,优化移库任务逻辑 --- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs | 169 ++++---------------------------------------------------- 1 files changed, 12 insertions(+), 157 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs" index 945d568..28214d1 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs" @@ -12,135 +12,14 @@ namespace WIDESEA_Model.Models { [SugarTable(nameof(Dt_Task_Hty), "浠诲姟淇℃伅鍘嗗彶")] - public class Dt_Task_Hty : BaseEntity + public class Dt_Task_Hty : Dt_Task, IBaseHistoryEntity { /// <summary> - /// 涓婚敭 + /// 鍘熻〃涓婚敭 /// </summary> - [ImporterHeader(Name = "涓婚敭")] - [ExporterHeader(DisplayName = "涓婚敭")] - [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")] - public int TaskId { get; set; } - - /// <summary> - /// 浠诲姟鍙� - /// </summary> - [ImporterHeader(Name = "浠诲姟鍙�")] - [ExporterHeader(DisplayName = "浠诲姟鍙�")] - [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鍙�"), SequenceAttirbute(nameof(SequenceEnum.SeqTaskNum), 6000)] - public int TaskNum { get; set; } - - /// <summary> - /// 鏄惁涓哄爢鍨涙満鍙栨斁璐т綅 - /// </summary> - [ImporterHeader(Name = "鏄惁涓哄爢鍨涙満鍙栨斁璐т綅")] - [ExporterHeader(DisplayName = "鏄惁涓哄爢鍨涙満鍙栨斁璐т綅")] - [SugarColumn(IsNullable = true, ColumnDescription = "鏄惁涓哄爢鍨涙満鍙栨斁璐т綅")] - public bool IsPickPlace { get; set; } - - /// <summary> - /// 鎵樼洏缂栧彿 - /// </summary> - [ImporterHeader(Name = "鎵樼洏缂栧彿")] - [ExporterHeader(DisplayName = "鎵樼洏缂栧彿")] - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")] - public string PalletCode { get; set; } - - /// <summary> - /// 宸烽亾鍙� - /// </summary> - [ImporterHeader(Name = "宸烽亾鍙�")] - [ExporterHeader(DisplayName = "宸烽亾鍙�")] - [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "宸烽亾鍙�")] - public string Roadway { get; set; } - - /// <summary> - /// 浠诲姟绫诲瀷 - /// </summary> - [ImporterHeader(Name = "浠诲姟绫诲瀷")] - [ExporterHeader(DisplayName = "浠诲姟绫诲瀷")] - [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟绫诲瀷")] - public int TaskType { get; set; } - - /// <summary> - /// 浠诲姟鐘舵�� - /// </summary> - [ImporterHeader(Name = "浠诲姟鐘舵��")] - [ExporterHeader(DisplayName = "浠诲姟鐘舵��")] - [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鐘舵��")] - public int TaskState { get; set; } - - /// <summary> - /// 璧峰鍦板潃 - /// </summary> - [ImporterHeader(Name = "璧峰鍦板潃")] - [ExporterHeader(DisplayName = "璧峰鍦板潃")] - [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璧峰鍦板潃")] - public string SourceAddress { get; set; } - - /// <summary> - /// 鐩爣鍦板潃 - /// </summary> - [ImporterHeader(Name = "鐩爣鍦板潃")] - [ExporterHeader(DisplayName = "鐩爣鍦板潃")] - [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐩爣鍦板潃")] - public string TargetAddress { get; set; } - - /// <summary> - /// 褰撳墠浣嶇疆 - /// </summary> - [ImporterHeader(Name = "褰撳墠浣嶇疆")] - [ExporterHeader(DisplayName = "褰撳墠浣嶇疆")] - [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")] - public string CurrentAddress { get; set; } - - /// <summary> - /// 涓嬩竴鍦板潃 - /// </summary> - [ImporterHeader(Name = "涓嬩竴鍦板潃")] - [ExporterHeader(DisplayName = "涓嬩竴鍦板潃")] - [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")] - public string NextAddress { get; set; } - - /// <summary> - /// 寮傚父淇℃伅 - /// </summary> - [ImporterHeader(Name = "鍗曟嵁缂栧彿")] - [ExporterHeader(DisplayName = "鍗曟嵁缂栧彿")] - [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")] - public string? OrderNo { get; set; } - - /// <summary> - /// 浼樺厛绾� - /// </summary> - [ImporterHeader(Name = "浼樺厛绾�")] - [ExporterHeader(DisplayName = "浼樺厛绾�")] - [SugarColumn(IsNullable = false, ColumnDescription = "浼樺厛绾�")] - public int Grade { get; set; } - - //[SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "浠诲姟鏉ユ簮涓婚敭")] - //public int SourceKey { get; set; } - - /// <summary> - /// 浠诲姟涓嬪彂鏃堕棿 - /// </summary> - [ImporterHeader(Name = "浠诲姟涓嬪彂鏃堕棿")] - [ExporterHeader(DisplayName = "浠诲姟涓嬪彂鏃堕棿")] - [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟涓嬪彂鏃堕棿")] - public DateTime? Dispatchertime { get; set; } - - /// <summary> - /// 澶囨敞 - /// </summary> - [ImporterHeader(Name = "澶囨敞")] - [ExporterHeader(DisplayName = "澶囨敞")] - [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "澶囨敞")] - public string Remark { get; set; } - - /// <summary> - /// 鍘熶换鍔′富閿� - /// </summary> - [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熶换鍔′富閿�")] + [ImporterHeader(Name = "鍘熻〃涓婚敭")] + [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")] + [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")] public int SourceId { get; set; } /// <summary> @@ -151,36 +30,12 @@ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")] public string OperateType { get; set; } - ///// <summary> - ///// 鍒涘缓浜� - ///// </summary> - //[ImporterHeader(Name = "鍒涘缓浜�")] - //[ExporterHeader(DisplayName = "鍒涘缓浜�")] - //[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍒涘缓浜�")] - //public string Creater { get; set; } - - ///// <summary> - ///// 鍒涘缓鏃堕棿 - ///// </summary> - //[ImporterHeader(Name = "鍒涘缓鏃堕棿")] - //[ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")] - //[SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏃堕棿")] - //public DateTime CreateDate { get; set; } = DateTime.Now; - - ///// <summary> - ///// 鏇存柊鑰� - ///// </summary> - //[ImporterHeader(Name = "淇敼浜�")] - //[ExporterHeader(DisplayName = "淇敼浜�")] - //[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "淇敼浜�")] - //public string Modifier { get; set; } - - ///// <summary> - ///// 淇敼鏃ユ湡 - ///// </summary> - //[ImporterHeader(Name = "淇敼鏃ユ湡")] - //[ExporterHeader(DisplayName = "淇敼鏃ユ湡")] - //[SugarColumn(IsNullable = true, ColumnDescription = "淇敼鏃ユ湡")] - //public DateTime? ModifyDate { get; set; } + /// <summary> + /// 绉诲叆鍘嗗彶鏃堕棿 + /// </summary> + [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")] + [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")] + [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")] + public DateTime InsertTime { get; set; }= DateTime.Now; } } -- Gitblit v1.9.3