Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库-毛坯仓库添加，毛坯仓库日志添加

Browse Source
This commit is contained in:
赵正易
2024-05-13 17:32:20 +08:00
parent 47dd0c4930
commit b4039d0b49
14 changed files with 791 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs Normal file
View File

@@ -0,0 +1,136 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms.Dto;
using ZR.Model.MES.wms;
//创建时间：2024-05-13
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 毛坯库存表
/// </summary>
[Verify]
[Route("/mes/wm/WmBlankInventory")]
public class WmBlankInventoryController : BaseController
{
/// <summary>
/// 毛坯库存表接口
/// </summary>
private readonly IWmBlankInventoryService _WmBlankInventoryService;
public WmBlankInventoryController(IWmBlankInventoryService WmBlankInventoryService)
{
_WmBlankInventoryService = WmBlankInventoryService;
}
/// <summary>
/// 查询毛坯库存表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmblankinventory:list")]
public IActionResult QueryWmBlankInventory([FromQuery] WmBlankInventoryQueryDto parm)
{
var response = _WmBlankInventoryService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询毛坯库存表详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmblankinventory:query")]
public IActionResult GetWmBlankInventory(string Id)
{
var response = _WmBlankInventoryService.GetInfo(Id);
var info = response.Adapt<WmBlankInventory>();
return SUCCESS(info);
}
/// <summary>
/// 添加毛坯库存表
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmblankinventory:add")]
[Log(Title = "毛坯库存表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmBlankInventory([FromBody] WmBlankInventoryDto parm)
{
try
{
var modal = parm.Adapt<WmBlankInventory>().ToCreate(HttpContext);
var response = _WmBlankInventoryService.AddWmBlankInventory(modal);
return SUCCESS(response);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message, null));
}
}
/// <summary>
/// 更新毛坯库存表
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmblankinventory:edit")]
[Log(Title = "毛坯库存表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmBlankInventory([FromBody] WmBlankInventoryDto parm)
{
var modal = parm.Adapt<WmBlankInventory>().ToUpdate(HttpContext);
var response = _WmBlankInventoryService.UpdateWmBlankInventory(modal);
return ToResponse(response);
}
/// <summary>
/// 删除毛坯库存表
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmblankinventory:delete")]
[Log(Title = "毛坯库存表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmBlankInventory(string ids)
{
string[] idsArr = ids.Split(',');
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmBlankInventoryService.Delete(idsArr);
return ToResponse(response);
}
/// <summary>
/// 物料清单数据同步
/// </summary>
/// <returns></returns>
[HttpPost("synchronousMaterial")]
[ActionPermissionFilter(Permission = "business:wmblankinventory:add")]
[Log(Title = "物料清单数据同步", BusinessType = BusinessType.INSERT)]
public IActionResult SynchronousMaterial([FromBody] WmBlankInventoryDto parm)
{
var modal = parm.Adapt<WmBlankInventory>().ToCreate(HttpContext);
var response = _WmBlankInventoryService.AddWmBlankInventory(modal);
return SUCCESS(response);
}
}
}

111
ZR.Admin.WebApi/Controllers/mes/wms/WmBlankRecordController.cs Normal file
View File

@@ -0,0 +1,111 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms.Dto;
using ZR.Model.MES.wms;
//创建时间：2024-05-13
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 毛坯库存库存变动记录表
/// </summary>
[Verify]
[Route("/mes/wm/WmBlankRecord")]
public class WmBlankRecordController : BaseController
{
/// <summary>
/// 毛坯库存库存变动记录表接口
/// </summary>
private readonly IWmBlankRecordService _WmBlankRecordService;
public WmBlankRecordController(IWmBlankRecordService WmBlankRecordService)
{
_WmBlankRecordService = WmBlankRecordService;
}
/// <summary>
/// 查询毛坯库存库存变动记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmblankrecord:list")]
public IActionResult QueryWmBlankRecord([FromQuery] WmBlankRecordQueryDto parm)
{
var response = _WmBlankRecordService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询毛坯库存库存变动记录表详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmblankrecord:query")]
public IActionResult GetWmBlankRecord(string Id)
{
var response = _WmBlankRecordService.GetInfo(Id);
var info = response.Adapt<WmBlankRecord>();
return SUCCESS(info);
}
/// <summary>
/// 添加毛坯库存库存变动记录表
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmblankrecord:add")]
[Log(Title = "毛坯库存库存变动记录表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmBlankRecord([FromBody] WmBlankRecordDto parm)
{
var modal = parm.Adapt<WmBlankRecord>().ToCreate(HttpContext);
var response = _WmBlankRecordService.AddWmBlankRecord(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新毛坯库存库存变动记录表
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmblankrecord:edit")]
[Log(Title = "毛坯库存库存变动记录表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmBlankRecord([FromBody] WmBlankRecordDto parm)
{
var modal = parm.Adapt<WmBlankRecord>().ToUpdate(HttpContext);
var response = _WmBlankRecordService.UpdateWmBlankRecord(modal);
return ToResponse(response);
}
/// <summary>
/// 删除毛坯库存库存变动记录表
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmblankrecord:delete")]
[Log(Title = "毛坯库存库存变动记录表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmBlankRecord(string ids)
{
string[] idsArr = ids.Split(',');
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmBlankRecordService.Delete(idsArr);
return ToResponse(response);
}
}
}

BIN
ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存库存变动记录表-0513140439.zip Normal file
View File

Binary file not shown.

BIN
ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-毛坯库存表-0513140434.zip Normal file
View File

Binary file not shown.

BIN
ZR.Admin.WebApi/导出统计报表-2024051114234102ae279d-bb09-4390-90e0-490342e8ebb4.xlsx Normal file
View File

Binary file not shown.

73
ZR.Model/MES/wms/Dto/WmBlankInventoryDto.cs Normal file
View File

@@ -0,0 +1,73 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 毛坯库存表查询对象
/// </summary>
public class WmBlankInventoryQueryDto : PagerInfo
{
public string BlankNum { get; set; }
public int? Type { get; set; }
public int? Status { get; set; }
}
/// <summary>
/// 毛坯库存表输入输出对象
/// </summary>
public class WmBlankInventoryDto
{
// [Required(ErrorMessage = "主键不能为空")]
public string Id { get; set; }
public string FkPaintId { get; set; }
public string BlankNum { get; set; }
/// <summary>
/// 单位
///</summary>
public string Unit { get; set; }
/// <summary>
/// 颜色
///</summary>
public string Color { get; set; }
/// <summary>
/// 规格
///</summary>
public string Specification { get; set; }
/// <summary>
/// 描述
///</summary>
public string Description { get; set; }
/// <summary>
/// 版本号
///</summary>
public string Version { get; set; }
public int? Quantity { get; set; }
public int? MaxNum { get; set; }
public int? MinNum { get; set; }
public int? WarnNum { get; set; }
public int? Type { get; set; }
public int? Status { 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; }
}
}

43
ZR.Model/MES/wms/Dto/WmBlankRecordDto.cs Normal file
View File

@@ -0,0 +1,43 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 毛坯库存库存变动记录表查询对象
/// </summary>
public class WmBlankRecordQueryDto : PagerInfo
{
}
/// <summary>
/// 毛坯库存库存变动记录表输入输出对象
/// </summary>
public class WmBlankRecordDto
{
[Required(ErrorMessage = "主键不能为空")]
public string Id { get; set; }
public string FkBlankInventoryId { get; set; }
public string BlankNum { get; set; }
public int? ChangeQuantity { get; set; }
public decimal Type { get; set; }
public decimal Status { 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; }
}
}

91
ZR.Model/MES/wms/WmBlankInventory.cs Normal file
View File

@@ -0,0 +1,91 @@
namespace ZR.Model.MES.wms
{
/// <summary>
/// 毛坯库存表
/// </summary>
[SugarTable("wm_blank_inventory")]
public class WmBlankInventory
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
public string Id { get; set; }
/// <summary>
/// 油漆id
/// </summary>
[SugarColumn(ColumnName = "fk_paint_id")]
public string FkPaintId { get; set; }
/// <summary>
/// 毛坯号
/// </summary>
[SugarColumn(ColumnName = "blank_num")]
public string BlankNum { get; set; }
/// <summary>
/// 库存数量
/// </summary>
public int? Quantity { get; set; }
/// <summary>
/// 最大库存
/// </summary>
[SugarColumn(ColumnName = "max_num")]
public int? MaxNum { get; set; }
/// <summary>
/// 最小库存
/// </summary>
[SugarColumn(ColumnName = "min_num")]
public int? MinNum { get; set; }
/// <summary>
/// 预警库存
/// </summary>
[SugarColumn(ColumnName = "warn_num")]
public int? WarnNum { get; set; }
/// <summary>
/// 类别
/// </summary>
public int? Type { get; set; }
/// <summary>
/// 状态
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { 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; }
}
}

74
ZR.Model/MES/wms/WmBlankRecord.cs Normal file
View File

@@ -0,0 +1,74 @@
namespace ZR.Model.MES.wms
{
/// <summary>
/// 毛坯库存库存变动记录表
/// </summary>
[SugarTable("wm_blank_record")]
public class WmBlankRecord
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
public string Id { get; set; }
/// <summary>
/// 毛坯库存主键
/// </summary>
[SugarColumn(ColumnName = "fk_blank_inventory_id")]
public string FkBlankInventoryId { get; set; }
/// <summary>
/// 毛坯号
/// </summary>
[SugarColumn(ColumnName = "blank_num")]
public string BlankNum { get; set; }
/// <summary>
/// 变动数量
/// </summary>
[SugarColumn(ColumnName = "change_quantity")]
public int? ChangeQuantity { get; set; }
/// <summary>
/// 类别
/// </summary>
public decimal Type { get; set; }
/// <summary>
/// 状态
/// </summary>
public decimal Status { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { 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; }
}
}

24
ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Model.MES.wms;
using System.Collections.Generic;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms.IService
{
/// <summary>
/// 毛坯库存表service接口
/// </summary>
public interface IWmBlankInventoryService : IBaseService<WmBlankInventory>
{
PagedInfo<WmBlankInventoryDto> GetList(WmBlankInventoryQueryDto parm);
WmBlankInventory GetInfo(string Id);
WmBlankInventory AddWmBlankInventory(WmBlankInventory parm);
int UpdateWmBlankInventory(WmBlankInventory parm);
}
}

24
ZR.Service/mes/wms/IService/IWmBlankRecordService.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using ZR.Model;
using ZR.Model.Dto;
using System.Collections.Generic;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms.IService
{
/// <summary>
/// 毛坯库存库存变动记录表service接口
/// </summary>
public interface IWmBlankRecordService : IBaseService<WmBlankRecord>
{
PagedInfo<WmBlankRecordDto> GetList(WmBlankRecordQueryDto parm);
WmBlankRecord GetInfo(string Id);
WmBlankRecord AddWmBlankRecord(WmBlankRecord parm);
int UpdateWmBlankRecord(WmBlankRecord parm);
}
}

121
ZR.Service/mes/wms/WmBlankInventoryService.cs Normal file
View File

@@ -0,0 +1,121 @@
using System;
using SqlSugar;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Model.MES.wms;
using ZR.Repository;
using System.Linq;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 毛坯库存表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWmBlankInventoryService), ServiceLifetime = LifeTime.Transient)]
public class WmBlankInventoryService : BaseService<WmBlankInventory>, IWmBlankInventoryService
{
/// <summary>
/// 查询毛坯库存表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmBlankInventoryDto> GetList(WmBlankInventoryQueryDto parm)
{
var predicate = Expressionable.Create<WmBlankInventory>()
.AndIF(!string.IsNullOrEmpty(parm.BlankNum), it => it.BlankNum.Contains(parm.BlankNum))
.AndIF(parm.Status > -1, it => it.Status == parm.Status)
.AndIF(parm.Type > 0, it => it.Type == parm.Type)
;
var response = Queryable()
.Where(predicate.ToExpression())
.OrderByDescending(it=>it.UpdatedTime)
.ToPage<WmBlankInventory, WmBlankInventoryDto>(parm);
if (response.Result.Count > 0)
{
foreach (WmBlankInventoryDto item in response.Result)
{
WmMaterial material = Context.Queryable<WmMaterial>()
.Where(it => it.BlankNum == item.BlankNum)
.Where(it => it.Remarks == "毛坯")
.First();
if (material == null)
{
item.Description = "此毛坯号不在物料清单内！";
continue;
}
item.Color = material.Color;
item.Unit = material.Unit;
item.Version = material.Version;
item.Specification = material.Specification;
item.Description = !string.IsNullOrEmpty(material.Description) ? material.Description : material.ProductName;
}
}
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmBlankInventory GetInfo(string Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
return response;
}
/// <summary>
/// 添加毛坯库存表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmBlankInventory AddWmBlankInventory(WmBlankInventory model)
{
bool hasRecord = Context.Queryable<WmBlankInventory>()
.Where(it => it.BlankNum == model.BlankNum)
.Any();
if(hasRecord)
{
throw new Exception("毛坯仓库已有相同毛坯号记录");
}
model.Id = SnowFlakeSingle.Instance.NextId().ToString();
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改毛坯库存表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmBlankInventory(WmBlankInventory model)
{
//var response = Update(w => w.Id == model.Id, it => new WmBlankInventory()
//{
// BlankNum = model.BlankNum,
// Quantity = model.Quantity,
// MaxNum = model.MaxNum,
// MinNum = model.MinNum,
// WarnNum = model.WarnNum,
// Type = model.Type,
// Status = model.Status,
// Remark = model.Remark,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
}
}

87
ZR.Service/mes/wms/WmBlankRecordService.cs Normal file
View File

@@ -0,0 +1,87 @@
using System;
using SqlSugar;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Repository;
using ZR.Service.Business.IBusinessService;
using System.Linq;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 毛坯库存库存变动记录表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWmBlankRecordService), ServiceLifetime = LifeTime.Transient)]
public class WmBlankRecordService : BaseService<WmBlankRecord>, IWmBlankRecordService
{
/// <summary>
/// 查询毛坯库存库存变动记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmBlankRecordDto> GetList(WmBlankRecordQueryDto parm)
{
var predicate = Expressionable.Create<WmBlankRecord>();
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmBlankRecord, WmBlankRecordDto>(parm);
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmBlankRecord GetInfo(string Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
return response;
}
/// <summary>
/// 添加毛坯库存库存变动记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmBlankRecord AddWmBlankRecord(WmBlankRecord model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改毛坯库存库存变动记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmBlankRecord(WmBlankRecord model)
{
//var response = Update(w => w.Id == model.Id, it => new WmBlankRecord()
//{
// BlankNum = model.BlankNum,
// ChangeQuantity = model.ChangeQuantity,
// Type = model.Type,
// Status = model.Status,
// Remark = model.Remark,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
}
}

7
ZR.Service/mes/wms/WmGoodsNowProductionService.cs
View File

@@ -258,6 +258,13 @@ namespace ZR.Service.mes.wms
{
model.PackageCodeOriginal = model.PackageCodeClient;
}
bool hasRecord = Context.Queryable<WmGoodsNowProduction>()
.Where(it => it.PackageCodeClient == model.PackageCodeClient)
.Any();
if (hasRecord)
{
throw new Exception("成品仓库已有相同批次号记录");
}
return Context.Insertable(model).ExecuteReturnEntity();
}