Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

test

6 小时以前 e9fa2cd033cc5399a4a23601f8155a8cd2079aab

 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; }
@@ -28,7 +42,7 @@
        /// 出库单明细Id
        /// </summary>
        public string SoDetailId { get; set; }
        

        /// <summary>
        /// 是否整箱 0整箱 1散盒
        /// </summary>
@@ -45,6 +59,11 @@
        public string BoxNo { get; set; }

        /// <summary>
        /// 箱码集合
        /// </summary>
        public List<string> BoxNoList{ get; set; }

        /// <summary>
        /// 盒码
        /// </summary>
        public string BoxNo2 { get; set; }