AddMate增加“是否批次管理”判断

admin

7 小时以前 4da743d3d8b1cd3c9c1bd118c74ef1aa297b2a3a

 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -61,7 +61,7 @@
        {
            Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
             .AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
             .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuNo.Contains(model.SkuName.Trim()))
             .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
             .AndIF(!string.IsNullOrWhiteSpace(model.AuditStatusNo), it => it.AuditStatusNo == model.AuditStatusNo)
             .AndIF(!string.IsNullOrWhiteSpace(model.Type), it => it.Type == model.Type)
             .AndIF(!string.IsNullOrWhiteSpace(model.IsControlled), it => it.IsControlled == model.IsControlled)
@@ -80,6 +80,7 @@
               .LeftJoin<SysMaterialCategory>((a, b, c, d) => a.CategoryNo == d.CategoryNo && d.IsDel == "0")
               .Select((a, b, c, d) => new MaterialsDto()
               {
                   Id = a.Id,
                   SkuNo = a.SkuNo,
                   SkuName = a.SkuName,
                   Standard = a.Standard,
@@ -157,6 +158,10 @@
            mate.IsControlled = string.IsNullOrWhiteSpace(mate.IsControlled) ? "0" : mate.IsControlled; //是否受控
            mate.IsInspect = string.IsNullOrWhiteSpace(mate.IsInspect) ? "0" : mate.IsInspect; //是否免检
            mate.IsPasteCode = string.IsNullOrWhiteSpace(mate.IsPasteCode) ? "0" : mate.IsPasteCode; //是否免检

            //是否批次管理
            mate.IsLotManage = string.IsNullOrWhiteSpace(mate.IsLotManage) ? "0" : mate.IsLotManage;

            mate.Origin = "WMS"; //来源
            mate.IsDel = "0";
            mate.CreateTime = DateTime.Now;
@@ -226,9 +231,10 @@
        /// 获取包装信息列表
        /// </summary>
        /// <returns></returns>
        public async Task<List<SysPackag>> GetPackagList()
        public async Task<List<SysPackag>> GetPackagList(int page)
        {
            return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToListAsync();
            int pageSize = 1000;
            return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToPageListAsync(page, pageSize);
        }

        #endregion
@@ -236,7 +242,7 @@
        #endregion

        #region erp
        

        /// <summary>
        /// 获取erp数据
        /// </summary>