Merge branch 'master' into csc

Demo

2024-07-17 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8

 Wms/Model/ModelDto/DataDto/StockDetailDto.cs

@@ -49,17 +49,17 @@
        /// <summary>
        /// 锁定数量
        /// </summary>           
        public int? LockQty { get; set; }
        public decimal? LockQty { get; set; }

        /// <summary>
        /// 冻结数量
        /// </summary>           
        public int? FrozenQty { get; set; }
        public decimal? FrozenQty { get; set; }

        /// <summary>
        /// 可抽检数量
        /// </summary>           
        public int? InspectQty { get; set; }
        public decimal? InspectQty { get; set; }

        /// <summary>
        /// 入库单号
@@ -69,7 +69,7 @@
        /// <summary>
        /// 入库明细号
        /// </summary>           
        public int ASNDetailNo { get; set; }
        public int? ASNDetailNo { get; set; }

        /// <summary>
        /// 所属仓库
@@ -199,5 +199,10 @@
        /// Nullable:True
        /// </summary>           
        public string Demo { get; set; }

        /// <summary>
        /// 储位深度
        /// </summary>
        public int Dept { get; set; }
    }
}