抛光仓库配置
This commit is contained in:
parent
9f4ba1a788
commit
4fdd6272a7
@ -0,0 +1,107 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using ZR.Admin.WebApi.Extensions;
|
||||||
|
using ZR.Admin.WebApi.Filters;
|
||||||
|
using ZR.Model.MES.wms;
|
||||||
|
using ZR.Model.MES.wms.Dto;
|
||||||
|
using ZR.Service.Business.IBusinessService;
|
||||||
|
|
||||||
|
//创建时间:2024-10-10
|
||||||
|
namespace ZR.Admin.WebApi.Controllers
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 三楼抛光仓库
|
||||||
|
/// </summary>
|
||||||
|
[Verify]
|
||||||
|
[Route("/mes/wm/WmPolishWarehouse")]
|
||||||
|
public class WmPolishWarehouseController : BaseController
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 三楼抛光仓库接口
|
||||||
|
/// </summary>
|
||||||
|
private readonly IWmPolishWarehouseService _WmPolishWarehouseService;
|
||||||
|
|
||||||
|
public WmPolishWarehouseController(IWmPolishWarehouseService WmPolishWarehouseService)
|
||||||
|
{
|
||||||
|
_WmPolishWarehouseService = WmPolishWarehouseService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查询三楼抛光仓库列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="parm"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpGet("list")]
|
||||||
|
[ActionPermissionFilter(Permission = "business:wmpolishwarehouse:list")]
|
||||||
|
public IActionResult QueryWmPolishWarehouse([FromQuery] WmPolishWarehouseQueryDto parm)
|
||||||
|
{
|
||||||
|
var response = _WmPolishWarehouseService.GetList(parm);
|
||||||
|
return SUCCESS(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查询三楼抛光仓库详情
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="Id"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpGet("{Id}")]
|
||||||
|
[ActionPermissionFilter(Permission = "business:wmpolishwarehouse:query")]
|
||||||
|
public IActionResult GetWmPolishWarehouse(int Id)
|
||||||
|
{
|
||||||
|
var response = _WmPolishWarehouseService.GetInfo(Id);
|
||||||
|
|
||||||
|
var info = response.Adapt<WmPolishWarehouse>();
|
||||||
|
return SUCCESS(info);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加三楼抛光仓库
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
[ActionPermissionFilter(Permission = "business:wmpolishwarehouse:add")]
|
||||||
|
[Log(Title = "三楼抛光仓库", BusinessType = BusinessType.INSERT)]
|
||||||
|
public IActionResult AddWmPolishWarehouse([FromBody] WmPolishWarehouseDto parm)
|
||||||
|
{
|
||||||
|
var modal = parm.Adapt<WmPolishWarehouse>().ToCreate(HttpContext);
|
||||||
|
|
||||||
|
var response = _WmPolishWarehouseService.AddWmPolishWarehouse(modal);
|
||||||
|
|
||||||
|
return SUCCESS(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新三楼抛光仓库
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPut]
|
||||||
|
[ActionPermissionFilter(Permission = "business:wmpolishwarehouse:edit")]
|
||||||
|
[Log(Title = "三楼抛光仓库", BusinessType = BusinessType.UPDATE)]
|
||||||
|
public IActionResult UpdateWmPolishWarehouse([FromBody] WmPolishWarehouseDto parm)
|
||||||
|
{
|
||||||
|
var modal = parm.Adapt<WmPolishWarehouse>().ToUpdate(HttpContext);
|
||||||
|
var response = _WmPolishWarehouseService.UpdateWmPolishWarehouse(modal);
|
||||||
|
|
||||||
|
return ToResponse(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除三楼抛光仓库
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpDelete("{ids}")]
|
||||||
|
[ActionPermissionFilter(Permission = "business:wmpolishwarehouse:delete")]
|
||||||
|
[Log(Title = "三楼抛光仓库", BusinessType = BusinessType.DELETE)]
|
||||||
|
public IActionResult DeleteWmPolishWarehouse(string ids)
|
||||||
|
{
|
||||||
|
int[] idsArr = Tools.SpitIntArrary(ids);
|
||||||
|
if (idsArr.Length <= 0)
|
||||||
|
{
|
||||||
|
return ToResponse(ApiResult.Error($"删除失败Id 不能为空"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var response = _WmPolishWarehouseService.Delete(idsArr);
|
||||||
|
|
||||||
|
return ToResponse(response);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
48
ZR.Model/MES/wms/Dto/WmPolishWarehouseDto.cs
Normal file
48
ZR.Model/MES/wms/Dto/WmPolishWarehouseDto.cs
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
|
||||||
|
namespace ZR.Model.MES.wms.Dto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 三楼抛光仓库查询对象
|
||||||
|
/// </summary>
|
||||||
|
public class WmPolishWarehouseQueryDto : PagerInfo
|
||||||
|
{
|
||||||
|
public string Location { get; set; }
|
||||||
|
public string Remark { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 三楼抛光仓库输入输出对象
|
||||||
|
/// </summary>
|
||||||
|
public class WmPolishWarehouseDto
|
||||||
|
{
|
||||||
|
[Required(ErrorMessage = "主键不能为空")]
|
||||||
|
public int Id { get; set; }
|
||||||
|
|
||||||
|
[Required(ErrorMessage = "库位不能为空")]
|
||||||
|
public string Location { get; set; }
|
||||||
|
|
||||||
|
public int? PartCapacity { get; set; }
|
||||||
|
|
||||||
|
public int? TankCapacity { get; set; }
|
||||||
|
|
||||||
|
public int? BuildCapacity { get; set; }
|
||||||
|
|
||||||
|
public int? BoxPartNum { get; set; }
|
||||||
|
|
||||||
|
public string StorePartList { get; set; }
|
||||||
|
|
||||||
|
public string Remark { get; set; }
|
||||||
|
|
||||||
|
public string CreatedBy { get; set; }
|
||||||
|
|
||||||
|
public DateTime? CreatedTime { get; set; }
|
||||||
|
|
||||||
|
public string UpdatedBy { get; set; }
|
||||||
|
|
||||||
|
public DateTime? UpdatedTime { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
82
ZR.Model/MES/wms/WmPolishWarehouse.cs
Normal file
82
ZR.Model/MES/wms/WmPolishWarehouse.cs
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
|
||||||
|
namespace ZR.Model.MES.wms
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 三楼抛光仓库
|
||||||
|
/// </summary>
|
||||||
|
[SugarTable("wm_polish_warehouse")]
|
||||||
|
public class WmPolishWarehouse
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 主键
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
|
||||||
|
public int Id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 库位
|
||||||
|
/// </summary>
|
||||||
|
public string Location { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 零件容量
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "part_capacity")]
|
||||||
|
public int? PartCapacity { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 箱容量
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "tank_capacity")]
|
||||||
|
public int? TankCapacity { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 每幢容量
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "build_capacity")]
|
||||||
|
public int? BuildCapacity { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 一箱产品数
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "box_part_num")]
|
||||||
|
public int? BoxPartNum { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 库描述
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "remark")]
|
||||||
|
public string Remark { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 存放产品描述
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "store_part_list")]
|
||||||
|
public string StorePartList { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建人
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "cREATED_BY")]
|
||||||
|
public string CreatedBy { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建时间
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "cREATED_TIME")]
|
||||||
|
public DateTime? CreatedTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新人
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "uPDATED_BY")]
|
||||||
|
public string UpdatedBy { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新时间
|
||||||
|
/// </summary>
|
||||||
|
[SugarColumn(ColumnName = "uPDATED_TIME")]
|
||||||
|
public DateTime? UpdatedTime { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
20
ZR.Service/mes/wms/IService/IWmPolishWarehouseService.cs
Normal file
20
ZR.Service/mes/wms/IService/IWmPolishWarehouseService.cs
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
using ZR.Model;
|
||||||
|
using ZR.Model.MES.wms;
|
||||||
|
using ZR.Model.MES.wms.Dto;
|
||||||
|
|
||||||
|
namespace ZR.Service.Business.IBusinessService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 三楼抛光仓库service接口
|
||||||
|
/// </summary>
|
||||||
|
public interface IWmPolishWarehouseService : IBaseService<WmPolishWarehouse>
|
||||||
|
{
|
||||||
|
PagedInfo<WmPolishWarehouseDto> GetList(WmPolishWarehouseQueryDto parm);
|
||||||
|
|
||||||
|
WmPolishWarehouse GetInfo(int Id);
|
||||||
|
|
||||||
|
WmPolishWarehouse AddWmPolishWarehouse(WmPolishWarehouse parm);
|
||||||
|
|
||||||
|
int UpdateWmPolishWarehouse(WmPolishWarehouse parm);
|
||||||
|
}
|
||||||
|
}
|
||||||
85
ZR.Service/mes/wms/WmPolishWarehouseService.cs
Normal file
85
ZR.Service/mes/wms/WmPolishWarehouseService.cs
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
using Infrastructure.Attribute;
|
||||||
|
using SqlSugar;
|
||||||
|
using ZR.Model;
|
||||||
|
using ZR.Model.MES.wms;
|
||||||
|
using ZR.Model.MES.wms.Dto;
|
||||||
|
using ZR.Repository;
|
||||||
|
using ZR.Service.Business.IBusinessService;
|
||||||
|
|
||||||
|
namespace ZR.Service.mes.wms
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 三楼抛光仓库Service业务层处理
|
||||||
|
/// </summary>
|
||||||
|
[AppService(ServiceType = typeof(IWmPolishWarehouseService), ServiceLifetime = LifeTime.Transient)]
|
||||||
|
public class WmPolishWarehouseService : BaseService<WmPolishWarehouse>, IWmPolishWarehouseService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 查询三楼抛光仓库列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="parm"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public PagedInfo<WmPolishWarehouseDto> GetList(WmPolishWarehouseQueryDto parm)
|
||||||
|
{
|
||||||
|
var predicate = Expressionable.Create<WmPolishWarehouse>()
|
||||||
|
.AndIF(!string.IsNullOrEmpty(parm.Location),it=>it.Location.Contains(parm.Location))
|
||||||
|
.AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark));
|
||||||
|
|
||||||
|
var response = Queryable()
|
||||||
|
.Where(predicate.ToExpression())
|
||||||
|
.ToPage<WmPolishWarehouse, WmPolishWarehouseDto>(parm);
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取详情
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="Id"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public WmPolishWarehouse GetInfo(int Id)
|
||||||
|
{
|
||||||
|
var response = Queryable()
|
||||||
|
.Where(x => x.Id == Id)
|
||||||
|
.First();
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加三楼抛光仓库
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="model"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public WmPolishWarehouse AddWmPolishWarehouse(WmPolishWarehouse model)
|
||||||
|
{
|
||||||
|
return Context.Insertable(model).ExecuteReturnEntity();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 修改三楼抛光仓库
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="model"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public int UpdateWmPolishWarehouse(WmPolishWarehouse model)
|
||||||
|
{
|
||||||
|
//var response = Update(w => w.Id == model.Id, it => new WmPolishWarehouse()
|
||||||
|
//{
|
||||||
|
// Location = model.Location,
|
||||||
|
// PartCapacity = model.PartCapacity,
|
||||||
|
// TankCapacity = model.TankCapacity,
|
||||||
|
// BuildCapacity = model.BuildCapacity,
|
||||||
|
// BoxPartNum = model.BoxPartNum,
|
||||||
|
// StorePartList = model.StorePartList,
|
||||||
|
// CreatedBy = model.CreatedBy,
|
||||||
|
// CreatedTime = model.CreatedTime,
|
||||||
|
// UpdatedBy = model.UpdatedBy,
|
||||||
|
// UpdatedTime = model.UpdatedTime,
|
||||||
|
//});
|
||||||
|
//return response;
|
||||||
|
return Update(model, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user