Merge branch 'master' into csc

chengsc

2024-10-18 1e26a7575d9969e728b0aa01466f490409cb173c

 Wms/WMS.Entity/DataEntity/DataBoxInfo.cs

@@ -72,14 +72,14 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int Qty {get;set;}
        public decimal Qty {get;set;}

        /// <summary>
        /// Desc:整箱数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? FullQty {get;set;}
        public decimal? FullQty {get;set;}

        /// <summary>
        /// Desc:状态
@@ -131,6 +131,11 @@
        public DateTime? ProductionTime {get;set;}

        /// <summary>
        /// 过期时间
        /// </summary>
        public DateTime? ExpirationTime { get; set; }

        /// <summary>
        /// Desc:供货批次
        /// Default:
        /// Nullable:True