Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/Model/ModelDto/PdaDto/PdaSoDto.cs

@@ -7,17 +7,17 @@
    public class OutPdaInfo
    {
        public string OutModel { get; set; }                     // 拣货区（出库口）
        public decimal PlanQty { get; set; }                       // 计划数量
        public decimal? PlanQty { get; set; }                       // 计划数量--
        public decimal? FinishQty { get; set; }                       // 完成数量
        public string Standard { get; set; }                       // 规格
        public decimal PickQty { get; set; }                       // 托盘待拣数量
        public decimal? PickQty { get; set; }                       // 托盘待拣数量--
        public decimal? PickedQty { get; set; }                       // 托盘已拣数量
        public string SkuNo { get; set; }                           // 物料编号
    }
    public class BoxInfo
    {
        public string BoxNo { get; set; }                     // 箱码/支码
        public decimal Qty { get; set; }                       // 箱内数量 
        public decimal? Qty { get; set; }                       // 箱内数量 
        public string SkuNo { get; set; }                   // 物料编码 
        public string SkuName { get; set; }                 // 物料名称
        public string LotNo { get; set; }                   // 批次