Merge branch 'master' into djp

test

12 小时以前 c5dc821692c0529e3a688af84c647bf80cc49360

 Wms/Model/ModelVm/PdaVm/PdaSoVm.cs

@@ -15,6 +15,20 @@
        public string PalletNo { get; set; }

        /// <summary>
        /// 物料编码
        /// </summary>
        public string SkuNo { get; set; }
        /// <summary>
        /// 车间
        /// </summary>
        public string AreaNo { get; set; }

        /// <summary>
        /// 批次号
        /// </summary>
        public string LotNo { get; set; }

        /// <summary>
        /// 新托盘码
        /// </summary>
        public string PalletNoNew { get; set; }