Merge branch 'dev' to sync branches

wanshenmean

9 天以前 b044183d3f3eae7150371318a017160fcd67c715

 Code/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs

@@ -1,4 +1,5 @@
using SqlSugar;
using Magicodes.ExporterAndImporter.Core;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -35,6 +36,12 @@
        /// <summary>
        /// 货位编号
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "货位ID")]
        public int LocationId { get; set; }

        /// <summary>
        /// 货位编号
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "货位编号")]
        public string LocationCode { get; set; }

@@ -57,9 +64,22 @@
        public string Remark { get; set; }

        /// <summary>
        /// 库存明细
        /// 出库日期
        /// </summary>
        [Navigate(NavigateType.OneToMany, nameof(Dt_StockInfoDetail.StockId), nameof(Id))]
        [SugarColumn(IsNullable = true, ColumnDescription = "出库日期")]
        public DateTime OutboundDate { get; set; }

       /// <summary>
       /// 库存明细
       /// </summary>
       [Navigate(NavigateType.OneToMany, nameof(Dt_StockInfoDetail.StockId), nameof(Id))]
        public List<Dt_StockInfoDetail> Details { get; set; }

        /// <summary>
        /// 货位明细
        /// </summary>
        [SugarColumn(ColumnName = "LocationDetails")]
        [Navigate(NavigateType.OneToOne, nameof(LocationId), nameof(Dt_LocationInfo.Id))]
        public Dt_LocationInfo LocationDetails { get; set; }
    }
}