Merge branch 'master' into csc

chengsc

2024-07-21 e75362cc5d11d900068a26232eb97ebd30203d48

 Wms/Model/ModelDto/DataDto/MateDataStockDto.cs

@@ -38,17 +38,23 @@
        /// <summary>
        /// 数量
        /// </summary>
        public string Qty { get; set; }
        public decimal? Qty { get; set; }

        /// <summary>
        /// 锁定数量
        /// </summary>
        public string LockQty { get; set; }
        public decimal? LockQty { get; set; }

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


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

        /// <summary>
        /// 剩余数量