线边库
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DOAN.Service.MES.material.IService
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库分类service接口
|
||||
/// </summary>
|
||||
public interface IMaterialPartsCategoriesService : IBaseService<MaterialPartsCategories>
|
||||
{
|
||||
PagedInfo<MaterialPartsCategoriesDto> GetList(MaterialPartsCategoriesQueryDto parm);
|
||||
|
||||
MaterialPartsCategories GetInfo(int CategoryId);
|
||||
|
||||
MaterialPartsCategories AddMaterialPartsCategories(MaterialPartsCategories parm);
|
||||
|
||||
int UpdateMaterialPartsCategories(MaterialPartsCategories parm);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DOAN.Service.MES.material.IService
|
||||
{
|
||||
/// <summary>
|
||||
/// 库存信息表service接口
|
||||
/// </summary>
|
||||
public interface IMaterialPartsInventoryService : IBaseService<MaterialPartsInventory>
|
||||
{
|
||||
PagedInfo<MaterialPartsInventoryDto2> GetList(MaterialPartsInventoryQueryDto parm);
|
||||
|
||||
MaterialPartsInventory GetInfo(int InventoryId);
|
||||
|
||||
MaterialPartsInventory AddMaterialPartsInventory(MaterialPartsInventory parm);
|
||||
|
||||
int UpdateMaterialPartsInventory(MaterialPartsInventory parm);
|
||||
|
||||
bool EntryInventory(MaterialPartsInventoryDto parm,string admin,int SupplierId);
|
||||
|
||||
bool OutInventory(MaterialPartsInventoryDto parm,string admin);
|
||||
|
||||
bool CheckInventory(MaterialPartsInventoryDto parm,string admin);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
using System;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DOAN.Service.MES.material.IService
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库库位service接口
|
||||
/// </summary>
|
||||
public interface IMaterialPartsStorageLocationsService : IBaseService<MaterialPartsStorageLocations>
|
||||
{
|
||||
PagedInfo<MaterialPartsStorageLocationsDto> GetList(MaterialPartsStorageLocationsQueryDto parm);
|
||||
|
||||
|
||||
string[] QueryMaterialPartsStorageLocationsLocationCode(string query);
|
||||
|
||||
MaterialPartsStorageLocations GetInfo(int LocationId);
|
||||
|
||||
MaterialPartsStorageLocations AddMaterialPartsStorageLocations(MaterialPartsStorageLocations parm);
|
||||
|
||||
int UpdateMaterialPartsStorageLocations(MaterialPartsStorageLocations parm);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using System;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DOAN.Service.MES.material.IService
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库供应商service接口
|
||||
/// </summary>
|
||||
public interface IMaterialPartsSuppliersService : IBaseService<MaterialPartsSuppliers>
|
||||
{
|
||||
PagedInfo<MaterialPartsSuppliersDto> GetList(MaterialPartsSuppliersQueryDto parm);
|
||||
|
||||
List<MaterialPartsSuppliersDto> GetListSupplier(string query);
|
||||
|
||||
MaterialPartsSuppliers GetInfo(int SupplierId);
|
||||
|
||||
MaterialPartsSuppliers AddMaterialPartsSuppliers(MaterialPartsSuppliers parm);
|
||||
|
||||
int UpdateMaterialPartsSuppliers(MaterialPartsSuppliers parm);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DOAN.Service.MES.material.IService
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库出入库service接口
|
||||
/// </summary>
|
||||
public interface IMaterialPartsTransactionsService : IBaseService<MaterialPartsTransactions>
|
||||
{
|
||||
PagedInfo<MaterialPartsTransactionsDto> GetList(MaterialPartsTransactionsQueryDto parm);
|
||||
|
||||
MaterialPartsTransactions GetInfo(int TransactionId);
|
||||
|
||||
MaterialPartsTransactions AddMaterialPartsTransactions(MaterialPartsTransactions parm);
|
||||
|
||||
int UpdateMaterialPartsTransactions(MaterialPartsTransactions parm);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using System;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DOAN.Service.MES.material.IService
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库基本信息表service接口
|
||||
/// </summary>
|
||||
public interface IMaterialSparePartsService : IBaseService<MaterialSpareParts>
|
||||
{
|
||||
PagedInfo<MaterialSparePartsDto> GetList(MaterialSparePartsQueryDto parm);
|
||||
|
||||
List<MaterialSparePartsDto> GetListNOPage(string query);
|
||||
|
||||
MaterialSpareParts GetInfo(int PartId);
|
||||
|
||||
MaterialSpareParts AddMaterialSpareParts(MaterialSpareParts parm);
|
||||
|
||||
int UpdateMaterialSpareParts(MaterialSpareParts parm);
|
||||
|
||||
}
|
||||
}
|
||||
83
DOAN.Service/MES/Material/MaterialPartsCategoriesService.cs
Normal file
83
DOAN.Service/MES/Material/MaterialPartsCategoriesService.cs
Normal file
@@ -0,0 +1,83 @@
|
||||
using System;
|
||||
using SqlSugar;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
|
||||
using DOAN.Repository;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Linq;
|
||||
using DOAN.Service.MES.material.IService;
|
||||
|
||||
namespace DOAN.Service.MES.material
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库分类Service业务层处理
|
||||
/// </summary>
|
||||
[AppService(ServiceType = typeof(IMaterialPartsCategoriesService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class MaterialPartsCategoriesService : BaseService<MaterialPartsCategories>, IMaterialPartsCategoriesService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询北泽线边库分类列表
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public PagedInfo<MaterialPartsCategoriesDto> GetList(MaterialPartsCategoriesQueryDto parm)
|
||||
{
|
||||
var predicate = Expressionable.Create<MaterialPartsCategories>()
|
||||
.AndIF(!string.IsNullOrEmpty(parm.CategoryName),it=>it.CategoryName.Contains(parm.CategoryName))
|
||||
;
|
||||
|
||||
var response = Queryable()
|
||||
.Where(predicate.ToExpression())
|
||||
.ToPage<MaterialPartsCategories, MaterialPartsCategoriesDto>(parm);
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取详情
|
||||
/// </summary>
|
||||
/// <param name="CategoryId"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsCategories GetInfo(int CategoryId)
|
||||
{
|
||||
var response = Queryable()
|
||||
.Where(x => x.CategoryId == CategoryId)
|
||||
.First();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加北泽线边库分类
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsCategories AddMaterialPartsCategories(MaterialPartsCategories model)
|
||||
{
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改北泽线边库分类
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public int UpdateMaterialPartsCategories(MaterialPartsCategories model)
|
||||
{
|
||||
//var response = Update(w => w.CategoryId == model.CategoryId, it => new MaterialPartsCategories()
|
||||
//{
|
||||
// CategoryName = model.CategoryName,
|
||||
// CreatedAt = model.CreatedAt,
|
||||
// UpdatedAt = model.UpdatedAt,
|
||||
//});
|
||||
//return response;
|
||||
return Update(model, true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
201
DOAN.Service/MES/Material/MaterialPartsInventoryService.cs
Normal file
201
DOAN.Service/MES/Material/MaterialPartsInventoryService.cs
Normal file
@@ -0,0 +1,201 @@
|
||||
using System;
|
||||
using SqlSugar;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Repository;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using System.Linq;
|
||||
using DOAN.Service.MES.material.IService;
|
||||
namespace DOAN.Service.MES.material
|
||||
{
|
||||
/// <summary>
|
||||
/// 库存信息表Service业务层处理
|
||||
/// </summary>
|
||||
[AppService(ServiceType = typeof(IMaterialPartsInventoryService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class MaterialPartsInventoryService : BaseService<MaterialPartsInventory>, IMaterialPartsInventoryService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询库存信息表列表
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public PagedInfo<MaterialPartsInventoryDto2> GetList(MaterialPartsInventoryQueryDto parm)
|
||||
{
|
||||
/*int[] LocationIdArray = null;
|
||||
if (!string.IsNullOrEmpty(parm.locationCode))
|
||||
{
|
||||
LocationIdArray= Context.Queryable<MaterialPartsStorageLocations>().Where(it => it.LocationCode == parm.locationCode)
|
||||
.Select(it => it.LocationId).ToArray();
|
||||
}
|
||||
int[] PartIdArray =null;
|
||||
if (!string.IsNullOrEmpty(parm.partName) && !string.IsNullOrEmpty(parm.partCode))
|
||||
{
|
||||
PartIdArray = Context.Queryable<MaterialSpareParts>()
|
||||
.Where(it => it.PartName.Contains(parm.partName) && it.PartCode.Contains(parm.partCode))
|
||||
.Select(it => it.PartId).ToArray();
|
||||
}else if (!string.IsNullOrEmpty(parm.partName))
|
||||
{
|
||||
PartIdArray = Context.Queryable<MaterialSpareParts>()
|
||||
.Where(it => it.PartName.Contains(parm.partName) )
|
||||
.Select(it => it.PartId).ToArray();
|
||||
}else if (!string.IsNullOrEmpty(parm.partCode))
|
||||
{
|
||||
PartIdArray = Context.Queryable<MaterialSpareParts>()
|
||||
.Where(it => it.PartCode.Contains(parm.partCode))
|
||||
.Select(it => it.PartId).ToArray();
|
||||
}*/
|
||||
|
||||
var result= Queryable().LeftJoin<MaterialSpareParts>((r, s) => r.PartId == s.PartId)
|
||||
.WhereIF(!string.IsNullOrEmpty(parm.locationCode), (r, s) => r.Location.Contains(parm.locationCode) )
|
||||
.WhereIF(!string.IsNullOrEmpty(parm.partName), (r, s) => s.PartName.Contains(parm.partName))
|
||||
.WhereIF(!string.IsNullOrEmpty(parm.partCode), (r, s) => s.PartCode.Contains(parm.partCode))
|
||||
.Select((r, s) => new MaterialPartsInventoryDto2(), true)
|
||||
.ToPage_NO_Convert(parm);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取详情
|
||||
/// </summary>
|
||||
/// <param name="InventoryId"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsInventory GetInfo(int InventoryId)
|
||||
{
|
||||
var response = Queryable()
|
||||
.Where(x => x.InventoryId == InventoryId)
|
||||
.First();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加库存信息表
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsInventory AddMaterialPartsInventory(MaterialPartsInventory model)
|
||||
{
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改库存信息表
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public int UpdateMaterialPartsInventory(MaterialPartsInventory model)
|
||||
{
|
||||
//var response = Update(w => w.InventoryId == model.InventoryId, it => new MaterialPartsInventory()
|
||||
//{
|
||||
// Quantity = model.Quantity,
|
||||
// Location = model.Location,
|
||||
// LastInventoryCheck = model.LastInventoryCheck,
|
||||
// CreatedAt = model.CreatedAt,
|
||||
// UpdatedAt = model.UpdatedAt,
|
||||
//});
|
||||
//return response;
|
||||
return Update(model, true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 入库
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public bool EntryInventory(MaterialPartsInventoryDto parm,string admin,int SupplierId)
|
||||
{
|
||||
|
||||
MaterialPartsTransactions MaterialPartsTransactions = new MaterialPartsTransactions();
|
||||
MaterialPartsTransactions.PartId= parm.PartId;
|
||||
MaterialPartsTransactions.TransactionType = "入库";
|
||||
MaterialPartsTransactions.Quantity = parm.Quantity;
|
||||
MaterialPartsTransactions.TransactionDate = DateTime.Now;
|
||||
|
||||
MaterialPartsTransactions.CreatedBy = admin;
|
||||
MaterialPartsTransactions.SupplierId = SupplierId;
|
||||
//要么新增,要么修改
|
||||
bool isExist = Context.Queryable<MaterialPartsInventory>()
|
||||
.Where(it => it.PartId == parm.PartId && it.Location == parm.Location).Any();
|
||||
if (isExist)
|
||||
{
|
||||
MaterialPartsTransactions.Remarks = "有库存入库";
|
||||
Context.Insertable(MaterialPartsTransactions).ExecuteCommand();
|
||||
|
||||
|
||||
return Context.Updateable<MaterialPartsInventory>()
|
||||
.SetColumns(it=>it.Quantity==it.Quantity+parm.Quantity)
|
||||
.SetColumns(it=>it.UpdatedAt==DateTime.Now)
|
||||
.Where(it=>it.PartId==parm.PartId&&it.Location==parm.Location)
|
||||
.ExecuteCommand()>0;
|
||||
}
|
||||
else
|
||||
{
|
||||
MaterialPartsTransactions.Remarks = "无库存入库";
|
||||
Context.Insertable(MaterialPartsTransactions).ExecuteCommand();
|
||||
|
||||
|
||||
MaterialPartsInventory inventory = new MaterialPartsInventory
|
||||
{
|
||||
PartId = parm.PartId,
|
||||
Quantity = parm.Quantity,
|
||||
Location = parm.Location,
|
||||
CreatedAt = DateTime.Now,
|
||||
|
||||
};
|
||||
return Context.Insertable(inventory).ExecuteCommand()>0;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 出库
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public bool OutInventory(MaterialPartsInventoryDto parm,string admin)
|
||||
{
|
||||
MaterialPartsTransactions MaterialPartsTransactions = new MaterialPartsTransactions();
|
||||
MaterialPartsTransactions.PartId= parm.PartId;
|
||||
MaterialPartsTransactions.TransactionType = "出库";
|
||||
MaterialPartsTransactions.Quantity = parm.Quantity;
|
||||
MaterialPartsTransactions.TransactionDate = DateTime.Now;
|
||||
|
||||
MaterialPartsTransactions.CreatedBy = admin;
|
||||
|
||||
Context.Insertable(MaterialPartsTransactions).ExecuteCommand();
|
||||
return Context.Updateable<MaterialPartsInventory>()
|
||||
.SetColumns(it=>it.Quantity==it.Quantity-parm.Quantity)
|
||||
.SetColumns(it=>it.UpdatedAt==DateTime.Now)
|
||||
.Where(it=>it.PartId==parm.PartId&&it.Location==parm.Location)
|
||||
.ExecuteCommand()>0;
|
||||
}
|
||||
public bool CheckInventory(MaterialPartsInventoryDto parm,string admin)
|
||||
{
|
||||
MaterialPartsTransactions MaterialPartsTransactions = new MaterialPartsTransactions();
|
||||
MaterialPartsTransactions.PartId= parm.PartId;
|
||||
MaterialPartsTransactions.TransactionType = "盘点";
|
||||
MaterialPartsTransactions.Quantity = parm.Quantity;
|
||||
MaterialPartsTransactions.TransactionDate = DateTime.Now;
|
||||
|
||||
MaterialPartsTransactions.CreatedBy = admin;
|
||||
|
||||
Context.Insertable(MaterialPartsTransactions).ExecuteCommand();
|
||||
return Context.Updateable<MaterialPartsInventory>()
|
||||
.SetColumns(it=>it.Quantity==parm.Quantity)
|
||||
.SetColumns(it=>it.UpdatedAt==DateTime.Now)
|
||||
.SetColumns(it=>it.LastInventoryCheck==DateTime.Now)
|
||||
.Where(it=>it.PartId==parm.PartId&&it.Location==parm.Location)
|
||||
.ExecuteCommand()>0;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
using System;
|
||||
using SqlSugar;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using DOAN.Repository;
|
||||
using DOAN.Service.MES.material.IService;
|
||||
using System.Linq;
|
||||
|
||||
namespace DOAN.Service.MES.material
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库库位Service业务层处理
|
||||
/// </summary>
|
||||
[AppService(ServiceType = typeof(IMaterialPartsStorageLocationsService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class MaterialPartsStorageLocationsService : BaseService<MaterialPartsStorageLocations>, IMaterialPartsStorageLocationsService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询北泽线边库库位列表
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public PagedInfo<MaterialPartsStorageLocationsDto> GetList(MaterialPartsStorageLocationsQueryDto parm)
|
||||
{
|
||||
var predicate = Expressionable.Create<MaterialPartsStorageLocations>();
|
||||
|
||||
var response = Queryable()
|
||||
.Where(predicate.ToExpression())
|
||||
.ToPage<MaterialPartsStorageLocations, MaterialPartsStorageLocationsDto>(parm);
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
public string[] QueryMaterialPartsStorageLocationsLocationCode(string query)
|
||||
{
|
||||
return Queryable()
|
||||
.WhereIF(!string.IsNullOrEmpty(query),x => x.LocationCode.Contains(query))
|
||||
.Select(x => x.LocationCode)
|
||||
.ToArray();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取详情
|
||||
/// </summary>
|
||||
/// <param name="LocationId"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsStorageLocations GetInfo(int LocationId)
|
||||
{
|
||||
var response = Queryable()
|
||||
.Where(x => x.LocationId == LocationId)
|
||||
.First();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加北泽线边库库位
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsStorageLocations AddMaterialPartsStorageLocations(MaterialPartsStorageLocations model)
|
||||
{
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改北泽线边库库位
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public int UpdateMaterialPartsStorageLocations(MaterialPartsStorageLocations model)
|
||||
{
|
||||
//var response = Update(w => w.LocationId == model.LocationId, it => new MaterialPartsStorageLocations()
|
||||
//{
|
||||
// LocationCode = model.LocationCode,
|
||||
// Description = model.Description,
|
||||
// CreatedAt = model.CreatedAt,
|
||||
// UpdatedAt = model.UpdatedAt,
|
||||
//});
|
||||
//return response;
|
||||
return Update(model, true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
96
DOAN.Service/MES/Material/MaterialPartsSuppliersService.cs
Normal file
96
DOAN.Service/MES/Material/MaterialPartsSuppliersService.cs
Normal file
@@ -0,0 +1,96 @@
|
||||
using System;
|
||||
using SqlSugar;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using DOAN.Repository;
|
||||
using DOAN.Service.MES.material.IService;
|
||||
using System.Linq;
|
||||
|
||||
namespace DOAN.Service.MES.material
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库供应商Service业务层处理
|
||||
/// </summary>
|
||||
[AppService(ServiceType = typeof(IMaterialPartsSuppliersService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class MaterialPartsSuppliersService : BaseService<MaterialPartsSuppliers>, IMaterialPartsSuppliersService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询北泽线边库供应商列表
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public PagedInfo<MaterialPartsSuppliersDto> GetList(MaterialPartsSuppliersQueryDto parm)
|
||||
{
|
||||
var predicate = Expressionable.Create<MaterialPartsSuppliers>();
|
||||
|
||||
var response = Queryable()
|
||||
.Where(predicate.ToExpression())
|
||||
.ToPage<MaterialPartsSuppliers, MaterialPartsSuppliersDto>(parm);
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
public List<MaterialPartsSuppliersDto> GetListSupplier(string query)
|
||||
{
|
||||
return Queryable()
|
||||
.WhereIF(!string.IsNullOrEmpty(query),x => x.SupplierName.Contains(query))
|
||||
.Select(x => new MaterialPartsSuppliersDto()
|
||||
{
|
||||
SupplierId = x.SupplierId,
|
||||
SupplierName = x.SupplierName
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取详情
|
||||
/// </summary>
|
||||
/// <param name="SupplierId"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsSuppliers GetInfo(int SupplierId)
|
||||
{
|
||||
var response = Queryable()
|
||||
.Where(x => x.SupplierId == SupplierId)
|
||||
.First();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加北泽线边库供应商
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsSuppliers AddMaterialPartsSuppliers(MaterialPartsSuppliers model)
|
||||
{
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改北泽线边库供应商
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public int UpdateMaterialPartsSuppliers(MaterialPartsSuppliers model)
|
||||
{
|
||||
//var response = Update(w => w.SupplierId == model.SupplierId, it => new MaterialPartsSuppliers()
|
||||
//{
|
||||
// SupplierName = model.SupplierName,
|
||||
// ContactPerson = model.ContactPerson,
|
||||
// Phone = model.Phone,
|
||||
// Email = model.Email,
|
||||
// Address = model.Address,
|
||||
// CreatedAt = model.CreatedAt,
|
||||
// UpdatedAt = model.UpdatedAt,
|
||||
//});
|
||||
//return response;
|
||||
return Update(model, true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
using System;
|
||||
using SqlSugar;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using DOAN.Repository;
|
||||
using DOAN.Service.MES.material.IService;
|
||||
using System.Linq;
|
||||
|
||||
namespace DOAN.Service.MES.material
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库出入库Service业务层处理
|
||||
/// </summary>
|
||||
[AppService(ServiceType = typeof(IMaterialPartsTransactionsService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class MaterialPartsTransactionsService : BaseService<MaterialPartsTransactions>, IMaterialPartsTransactionsService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询北泽线边库出入库列表
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public PagedInfo<MaterialPartsTransactionsDto> GetList(MaterialPartsTransactionsQueryDto parm)
|
||||
{
|
||||
// var predicate = Expressionable.Create<MaterialPartsTransactions>();
|
||||
|
||||
var response = Queryable()
|
||||
.LeftJoin<MaterialSpareParts>((t,s)=>t.PartId==s.PartId)
|
||||
.WhereIF(!string.IsNullOrEmpty(parm.PartName), (t,s)=>s.PartName.Contains(parm.PartName))
|
||||
.WhereIF(!string.IsNullOrEmpty(parm.TransactionType), (t,s)=>t.TransactionType==parm.TransactionType)
|
||||
.Select((t,s)=>new MaterialPartsTransactionsDto(),true )
|
||||
.ToPage_NO_Convert(parm);
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取详情
|
||||
/// </summary>
|
||||
/// <param name="TransactionId"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsTransactions GetInfo(int TransactionId)
|
||||
{
|
||||
var response = Queryable()
|
||||
.Where(x => x.TransactionId == TransactionId)
|
||||
.First();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加北泽线边库出入库
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialPartsTransactions AddMaterialPartsTransactions(MaterialPartsTransactions model)
|
||||
{
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改北泽线边库出入库
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public int UpdateMaterialPartsTransactions(MaterialPartsTransactions model)
|
||||
{
|
||||
//var response = Update(w => w.TransactionId == model.TransactionId, it => new MaterialPartsTransactions()
|
||||
//{
|
||||
// TransactionType = model.TransactionType,
|
||||
// Quantity = model.Quantity,
|
||||
// TransactionDate = model.TransactionDate,
|
||||
// Remarks = model.Remarks,
|
||||
// CreatedBy = model.CreatedBy,
|
||||
//});
|
||||
//return response;
|
||||
return Update(model, true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
99
DOAN.Service/MES/Material/MaterialSparePartsService.cs
Normal file
99
DOAN.Service/MES/Material/MaterialSparePartsService.cs
Normal file
@@ -0,0 +1,99 @@
|
||||
using System;
|
||||
using SqlSugar;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using DOAN.Model;
|
||||
using DOAN.Model.Dto;
|
||||
using DOAN.Model.MES.material.Dto;
|
||||
using DOAN.Model.MES.material;
|
||||
using DOAN.Repository;
|
||||
|
||||
using System.Linq;
|
||||
using DOAN.Service.MES.material.IService;
|
||||
using Mapster;
|
||||
|
||||
namespace DOAN.Service.MES.material
|
||||
{
|
||||
/// <summary>
|
||||
/// 北泽线边库基本信息表Service业务层处理
|
||||
/// </summary>
|
||||
[AppService(ServiceType = typeof(IMaterialSparePartsService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class MaterialSparePartsService : BaseService<MaterialSpareParts>, IMaterialSparePartsService
|
||||
{
|
||||
/// <summary>
|
||||
/// 查询北泽线边库基本信息表列表
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
public PagedInfo<MaterialSparePartsDto> GetList(MaterialSparePartsQueryDto parm)
|
||||
{
|
||||
var predicate = Expressionable.Create<MaterialSpareParts>()
|
||||
.AndIF(!string.IsNullOrEmpty(parm.PartName), it => it.PartName.Contains(parm.PartName))
|
||||
.AndIF(!string.IsNullOrEmpty(parm.PartCode), it => it.PartCode.Contains(parm.PartCode))
|
||||
;
|
||||
|
||||
var response = Queryable()
|
||||
.Where(predicate.ToExpression())
|
||||
.ToPage<MaterialSpareParts, MaterialSparePartsDto>(parm);
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
public List<MaterialSparePartsDto> GetListNOPage(string query)
|
||||
{
|
||||
var response = Queryable()
|
||||
.WhereIF(!string.IsNullOrEmpty(query),x => x.PartName.Contains(query)||x.PartCode.Contains(query))
|
||||
.ToList().Adapt<List<MaterialSpareParts>,List<MaterialSparePartsDto>>();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取详情
|
||||
/// </summary>
|
||||
/// <param name="PartId"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialSpareParts GetInfo(int PartId)
|
||||
{
|
||||
var response = Queryable()
|
||||
.Where(x => x.PartId == PartId)
|
||||
.First();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加北泽线边库基本信息表
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public MaterialSpareParts AddMaterialSpareParts(MaterialSpareParts model)
|
||||
{
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改北泽线边库基本信息表
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public int UpdateMaterialSpareParts(MaterialSpareParts model)
|
||||
{
|
||||
//var response = Update(w => w.PartId == model.PartId, it => new MaterialSpareParts()
|
||||
//{
|
||||
// PartName = model.PartName,
|
||||
// PartNumber = model.PartNumber,
|
||||
// Description = model.Description,
|
||||
// UnitOfMeasure = model.UnitOfMeasure,
|
||||
// MinStockLevel = model.MinStockLevel,
|
||||
// MaxStockLevel = model.MaxStockLevel,
|
||||
// CreatedAt = model.CreatedAt,
|
||||
// UpdatedAt = model.UpdatedAt,
|
||||
//});
|
||||
//return response;
|
||||
return Update(model, true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -65,12 +65,7 @@ namespace DOAN.Service.MES.Order
|
||||
.ToList()
|
||||
})
|
||||
.Distinct()
|
||||
|
||||
.ToList();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
return queryResult;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user