Merge branch 'yyk'

yuyou_x

2024-03-27 74bcd25a8828b0b5fdf4c3bdaf7e79606b0bcf9a

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -153,39 +153,58 @@
            try
            {
                string skuType = string.Empty;
                int IsPack = 0; //0：不管 1：贴 2：不贴
                /**
                 * 成品贴       0
                 * 采购可贴可不贴   1
                 * 中间品不贴   2
                 * 退货贴      3
                 * 余料退回可贴可不贴   4
                 * 其它可贴可不贴   5
                 * 代储不贴      6
                 * 寄存不贴      7
                 */
                switch (model.Type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
                {
                    case "0"://成品入库
                        skuType = "(2)";
                        IsPack = 1; //贴
                        break;
                    case "1"://采购入库
                        skuType = "(0,1,3)";
                        break;
                    case "2"://中间品入库
                        skuType = "(4)";
                        IsPack = 2; //不贴
                        break;
                    case "3"://退货入库
                        skuType = "(2)";
                        IsPack = 1; //贴
                        break;
                    case "4"://车间余料退回入库
                        skuType = "(0,1,3)";
                        break;
                    case "5"://其它入库
                        skuType = "(0,1,3)";
                        break;
                    case "6"://代储入库
                        skuType = "(2)";
                        break;
                    case "1"://采购入库
                        skuType = "(0,1,3)";
                        break;
                    case "4"://车间余料退回入库
                        skuType = "(0,1,3)";
                        break;
                    case "2"://中间品入库
                        skuType = "(4)";
                        IsPack = 2; //不贴
                        break;
                    case "7"://寄存入库
                        skuType = "(3)";
                        //skuType = "(3)";
                        IsPack = 2; //不贴
                        break;
                    default: //其它
                        skuType = "(0,1,2,3,4)";
                        //skuType = "(0,1,2,3,4)";
                        break;
                }

                Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
                    .AndIF(true, it => skuType.Contains(it.Type))
                    .AndIF(model.Type != "7", it => skuType.Contains(it.Type))
                    .AndIF(model.Type == "7", it => it.SkuNo == "100088")
                    .AndIF(IsPack == 1, it => it.PackagNo != "")
                    .AndIF(IsPack == 2, it => it.PackagNo == "")
                    .AndIF(true, it => it.IsDel == "0")
                    .And(it => it.SkuNo != "100099")
                    .AndIF(!string.IsNullOrWhiteSpace(model.SkuNo),
@@ -201,6 +220,8 @@
                    .Includes(x => x.PackagInfo)
                    .ToList();



                return data.Select(m => new MaterialsDto()
                {
                    //Id = m.Id,