RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

抛光管理，完成抛光仓库入库，盘点，生成日志 条件查询功能

Browse Source
This commit is contained in:
赵正易 2024-07-25 17:36:22 +08:00
parent 11d23f211f
commit d3029ed1e4
12 changed files with 1062 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs Normal file
View File

@ -0,0 +1,146 @@
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.mes.wms.IService;
//创建时间：2024-07-25
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 工艺路线-抛光 库存表
/// </summary>
[Verify]
[Route("/mes/wm/WmPolishInventory")]
public class WmPolishInventoryController : BaseController
{
/// <summary>
/// 工艺路线-抛光 库存表接口
/// </summary>
private readonly IWmPolishInventoryService _WmPolishInventoryService;
public WmPolishInventoryController(IWmPolishInventoryService WmPolishInventoryService)
{
_WmPolishInventoryService = WmPolishInventoryService;
}
/// <summary>
/// 查询工艺路线-抛光 库存表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:list")]
public IActionResult QueryWmPolishInventory([FromQuery] WmPolishInventoryQueryDto parm)
{
var response = _WmPolishInventoryService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询工艺路线-抛光 库存表详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:query")]
public IActionResult GetWmPolishInventory(string Id)
{
var response = _WmPolishInventoryService.GetInfo(Id);
var info = response.Adapt<WmPolishInventory>();
return SUCCESS(info);
}
/// <summary>
/// 添加抛光 库存表
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:add")]
[Log(Title = "抛光 库存表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmPolishInventory([FromBody] WmPolishInventoryDto parm)
{
var modal = parm.Adapt<WmPolishInventory>().ToCreate(HttpContext);
var response = _WmPolishInventoryService.AddWmPolishInventory(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新抛光 库存表
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
[Log(Title = "抛光 库存表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmPolishInventory([FromBody] WmPolishInventoryDto parm)
{
var modal = parm.Adapt<WmPolishInventory>().ToUpdate(HttpContext);
var response = _WmPolishInventoryService.UpdateWmPolishInventory(modal);
return ToResponse(response);
}
/// <summary>
/// 删除抛光 库存表
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:delete")]
[Log(Title = "抛光 库存表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmPolishInventory(string ids)
{
string[] idsArr = ids.Split(",");
if (idsArr.Length <= 0)
{
return ToResponse(ApiResult.Error($"删除失败Id 不能为空"));
}
var response = _WmPolishInventoryService.Delete(idsArr);
return ToResponse(response);
}
/// <summary>
/// 抛光手动入库
/// </summary>
/// <returns></returns>
[HttpPost("doWmPolishWarehousing")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:add")]
[Log(Title = "抛光手动入库", BusinessType = BusinessType.INSERT)]
public IActionResult DoWmPolishWarehousing([FromBody] WmPolishInventoryDto parm)
{
try
{
var modal = parm.Adapt<WmPolishInventory>().ToCreate(HttpContext);
var response = _WmPolishInventoryService.DoWmPolishWarehousing(modal);
return ToResponse(new ApiResult(200, "手动入库成功", response));
}
catch (Exception e)
{
return ToResponse(new ApiResult(500, "手动入库异常:" + e.Message, e.Message));
}
}
/// <summary>
/// 物料下拉菜单查看
/// </summary>
/// <returns></returns>
[HttpGet("getMaterialSelectOption")]
public IActionResult GetMaterialSelectOption([FromQuery] string query)
{
try
{
var response = _WmPolishInventoryService.GetMaterialSelectOption(query);
return ToResponse(new ApiResult(200, "获取成功", response));
}
catch (Exception e)
{
return ToResponse(new ApiResult(500, "获取物料下拉菜单数据失败:" + e.Message, null));
}
}
}
}

107
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishRecordController.cs Normal file
View File

@ -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.mes.wms.IService;
//创建时间：2024-07-25
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 工艺路线-抛光 库存变动表
/// </summary>
[Verify]
[Route("/mes/wm/WmPolishRecord")]
public class WmPolishRecordController : BaseController
{
/// <summary>
/// 工艺路线-抛光 库存变动表接口
/// </summary>
private readonly IWmPolishRecordService _WmPolishRecordService;
public WmPolishRecordController(IWmPolishRecordService WmPolishRecordService)
{
_WmPolishRecordService = WmPolishRecordService;
}
/// <summary>
/// 查询工艺路线-抛光 库存变动表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmpolishrecord:list")]
public IActionResult QueryWmPolishRecord([FromQuery] WmPolishRecordQueryDto parm)
{
var response = _WmPolishRecordService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询工艺路线-抛光 库存变动表详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmpolishrecord:query")]
public IActionResult GetWmPolishRecord(string Id)
{
var response = _WmPolishRecordService.GetInfo(Id);
var info = response.Adapt<WmPolishRecord>();
return SUCCESS(info);
}
/// <summary>
/// 添加工艺路线-抛光 库存变动表
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmpolishrecord:add")]
[Log(Title = "工艺路线-抛光 库存变动表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmPolishRecord([FromBody] WmPolishRecordDto parm)
{
var modal = parm.Adapt<WmPolishRecord>().ToCreate(HttpContext);
var response = _WmPolishRecordService.AddWmPolishRecord(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新工艺路线-抛光 库存变动表
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmpolishrecord:edit")]
[Log(Title = "工艺路线-抛光 库存变动表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmPolishRecord([FromBody] WmPolishRecordDto parm)
{
var modal = parm.Adapt<WmPolishRecord>().ToUpdate(HttpContext);
var response = _WmPolishRecordService.UpdateWmPolishRecord(modal);
return ToResponse(response);
}
/// <summary>
/// 删除工艺路线-抛光 库存变动表
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmpolishrecord:delete")]
[Log(Title = "工艺路线-抛光 库存变动表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmPolishRecord(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
if (idsArr.Length <= 0)
{
return ToResponse(ApiResult.Error($"删除失败Id 不能为空"));
}
var response = _WmPolishRecordService.Delete(idsArr);
return ToResponse(response);
}
}
}

10
ZR.Model/MES/wms/Dto/WmMaterialDto.cs
View File

@ -168,6 +168,14 @@ namespace ZR.Model.MES.wms.Dto
}
/// <summary>
/// 物料下拉查询表
/// </summary>
public class WmMaterialSelectOptions
{
public string Key { get; set; }
public string Label { get; set; }
public string Value { get; set; }
}
}

66
ZR.Model/MES/wms/Dto/WmPolishInventoryDto.cs Normal file
View File

@ -0,0 +1,66 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 工艺路线-抛光 库存表查询对象
/// </summary>
public class WmPolishInventoryQueryDto : PagerInfo
{
public string BlankNum { get; set; }
public string Partnumber { get; set; }
public string Description { get; set; }
public int? Type { get; set; }
public int? Status { get; set; }
}
/// <summary>
/// 工艺路线-抛光 库存表输入输出对象
/// </summary>
public class WmPolishInventoryDto
{
public string Id { get; set; }
public string BlankNum { get; set; }
public string Partnumber { get; set; }
public string Color { get; set; }
public string Specification { get; set; }
public string Description { 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 DateTime? ActionTime { get; set; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
}

50
ZR.Model/MES/wms/Dto/WmPolishRecordDto.cs Normal file
View File

@ -0,0 +1,50 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 工艺路线-抛光 库存变动表查询对象
/// </summary>
public class WmPolishRecordQueryDto : PagerInfo
{
}
/// <summary>
/// 工艺路线-抛光 库存变动表输入输出对象
/// </summary>
public class WmPolishRecordDto
{
[Required(ErrorMessage = "主键不能为空")]
public string Id { get; set; }
[Required(ErrorMessage = "库存主键不能为空")]
public string FkInventoryId { get; set; }
public string Code { get; set; }
public string Partnumber { get; set; }
public string BlankNum { get; set; }
public int? ChangeType { get; set; }
public int? ChangeQuantity { get; set; }
public DateTime? ActionTime { 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; }
}
}

96
ZR.Model/MES/wms/WmPolishInventory.cs Normal file
View File

@ -0,0 +1,96 @@
namespace ZR.Model.MES.wms
{
/// <summary>
/// 工艺路线-抛光 库存表
/// </summary>
[SugarTable("wm_polish_inventory")]
public class WmPolishInventory
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
public string Id { get; set; }
/// <summary>
/// 毛坯号
/// </summary>
[SugarColumn(ColumnName = "blank_num")]
public string BlankNum { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string Partnumber { 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>
/// 类别(1-正常 2-返工件)
/// </summary>
public int? Type { get; set; }
/// <summary>
/// 状态（0-停用1-启用）
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 操作时间
/// </summary>
[SugarColumn(IsIgnore = true)]
public DateTime? ActionTime { 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; }
}
}

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

@ -0,0 +1,91 @@
namespace ZR.Model.MES.wms
{
/// <summary>
/// 工艺路线-抛光 库存变动表
/// </summary>
[SugarTable("wm_polish_record")]
public class WmPolishRecord
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
public string Id { get; set; }
/// <summary>
/// 库存主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_inventory_id")]
public string FkInventoryId { get; set; }
/// <summary>
/// 关联记录字段(4-检验时使用 group by字段)
/// </summary>
public string Code { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string Partnumber { get; set; }
/// <summary>
/// 毛坯号
/// </summary>
[SugarColumn(ColumnName = "blank_num")]
public string BlankNum { get; set; }
/// <summary>
/// 变动类别 1-入库 2-出库 3-盘点 4-检验
/// </summary>
[SugarColumn(ColumnName = "change_type")]
public int? ChangeType { get; set; }
/// <summary>
/// 变动数量
/// </summary>
[SugarColumn(ColumnName = "change_quantity")]
public int? ChangeQuantity { get; set; }
/// <summary>
/// 时间（操作时间）
/// </summary>
[SugarColumn(ColumnName = "action_time")]
public DateTime? ActionTime { 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; }
}
}

40
ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs Normal file
View File

@ -0,0 +1,40 @@
using ZR.Model;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms.IService
{
/// <summary>
/// 工艺路线-抛光 库存表service接口
/// </summary>
public interface IWmPolishInventoryService : IBaseService<WmPolishInventory>
{
PagedInfo<WmPolishInventoryDto> GetList(WmPolishInventoryQueryDto parm);
WmPolishInventory GetInfo(string Id);
WmPolishInventory AddWmPolishInventory(WmPolishInventory parm);
int UpdateWmPolishInventory(WmPolishInventory parm);
/// <summary>
/// 抛光库，物料下拉菜单获取下拉选项
/// </summary>
/// <param name="partnumber"></param>
/// <returns></returns>
public List<WmMaterialSelectOptions> GetMaterialSelectOption(string partnumber);
/// <summary>
/// 抛光零件入库
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
int DoWmPolishWarehousing(WmPolishInventory parm);
/// <summary>
/// 抛光零件盘点
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
int DoWmPolishStocktaking(WmPolishInventory parm);
}
}

20
ZR.Service/mes/wms/IService/IWmPolishRecordService.cs Normal file
View File

@ -0,0 +1,20 @@
using ZR.Model;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms.IService
{
/// <summary>
/// 工艺路线-抛光 库存变动表service接口
/// </summary>
public interface IWmPolishRecordService : IBaseService<WmPolishRecord>
{
PagedInfo<WmPolishRecordDto> GetList(WmPolishRecordQueryDto parm);
WmPolishRecord GetInfo(string Id);
WmPolishRecord AddWmPolishRecord(WmPolishRecord parm);
int UpdateWmPolishRecord(WmPolishRecord parm);
}
}

1
ZR.Service/mes/wms/WmBlankInventoryService.cs
View File

@ -48,6 +48,7 @@ namespace ZR.Service.mes.wms
.Queryable<WmMaterial>()
.Where(it => it.BlankNum == item.BlankNum)
.Where(it => it.Type == 2)
.Where(it => it.Status == 1)
.First();
if (material == null)
{

355
ZR.Service/mes/wms/WmPolishInventoryService.cs Normal file
View File

@ -0,0 +1,355 @@
using System;
using Aliyun.OSS;
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.mes.wms.IService;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 工艺路线-抛光 库存表Service业务层处理
/// </summary>
[AppService(
ServiceType = typeof(IWmPolishInventoryService),
ServiceLifetime = LifeTime.Transient
)]
public class WmPolishInventoryService
: BaseService<WmPolishInventory>,
IWmPolishInventoryService
{
/// <summary>
/// 查询工艺路线-抛光 库存表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmPolishInventoryDto> GetList(WmPolishInventoryQueryDto parm)
{
List<string> partnumberByDescription = new();
if (parm != null && !string.IsNullOrEmpty(parm.Description))
{
partnumberByDescription = Context
.Queryable<WmMaterial>()
.Where(it => it.Description.Contains(parm.Description))
.Select(it => it.Partnumber)
.ToList();
}
var predicate = Expressionable
.Create<WmPolishInventory>()
.AndIF(
!string.IsNullOrEmpty(parm.Description),
it => partnumberByDescription.Contains(it.Partnumber)
)
.AndIF(
!string.IsNullOrEmpty(parm.Partnumber),
it => it.Partnumber.Contains(parm.Partnumber)
)
.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<WmPolishInventory, WmPolishInventoryDto>(parm);
if (response.Result.Count > 0)
{
foreach (WmPolishInventoryDto item in response.Result)
{
WmMaterial material = Context
.Queryable<WmMaterial>()
.Where(it => it.Partnumber == item.Partnumber)
.Where(it => it.Type == 1)
.Where(it => it.Status == 1)
.First();
if (material == null)
{
item.Description = "此毛坯号不在物料清单内！";
continue;
}
item.Color = material.Color;
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 WmPolishInventory GetInfo(string Id)
{
var response = Queryable().Where(x => x.Id == Id).First();
return response;
}
/// <summary>
/// 添加工艺路线-抛光 库存表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmPolishInventory AddWmPolishInventory(WmPolishInventory model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改工艺路线-抛光 库存表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmPolishInventory(WmPolishInventory model)
{
//var response = Update(w => w.Id == model.Id, it => new WmPolishInventory()
//{
// BlankNum = model.BlankNum,
// Partnumber = model.Partnumber,
// 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);
}
/// <summary>
/// 零件号下拉查询
/// </summary>
/// <param name="query">零件号或描述</param>
/// <returns></returns>
public List<WmMaterialSelectOptions> GetMaterialSelectOption(string query)
{
var predicate = Expressionable
.Create<WmMaterial>()
.Or(it => it.Partnumber.Contains(query))
.Or(it => it.Description.Contains(query))
.Or(it => it.ProductName.Contains(query))
.And(it => it.Type == 1)
.And(it => it.Status == 1);
List<WmMaterialSelectOptions> options = Context
.Queryable<WmMaterial>()
.Where(predicate.ToExpression())
.Select(
(it) =>
new WmMaterialSelectOptions
{
Key = it.Id,
Label = "[ " + it.Partnumber + " ] " + it.Description,
Value = it.Partnumber
}
)
.ToList();
return options;
}
/// <summary>
/// 新增抛光仓库操作记录
/// </summary>
/// <param name="fkInventoryId">抛光仓库主键</param>
/// <param name="code">同批功能识别编号</param>
/// <param name="partnumber">零件号</param>
/// <param name="type">类别</param>
/// <param name="changeQuantity">操作数字</param>
/// <param name="remark">备注</param>
/// <param name="createdBy">创建人</param>
/// <returns></returns>
public int AddPolishRecord(
string fkInventoryId,
string code,
string partnumber,
int type,
int? changeQuantity,
DateTime? actionTime,
string remark,
string createdBy
)
{
WmPolishRecord newPolishRecord =
new()
{
Id = SnowFlakeSingle.Instance.NextId().ToString(),
FkInventoryId = fkInventoryId,
Code = code,
Partnumber = partnumber,
BlankNum = "",
ChangeType = type,
ChangeQuantity = changeQuantity ?? 0,
ActionTime = actionTime,
Status = 1,
Remark = remark,
CreatedBy = createdBy,
CreatedTime = DateTime.Now.ToLocalTime(),
UpdatedBy = createdBy,
UpdatedTime = DateTime.Now.ToLocalTime(),
};
return Context.Insertable(newPolishRecord).ExecuteCommand();
}
public int DoWmPolishWarehousing(WmPolishInventory parm)
{
try
{
Context.Ado.BeginTran();
// 零件号检查
string partnumber = parm.Partnumber;
WmMaterial material = Context
.Queryable<WmMaterial>()
.Where(it => it.Partnumber == partnumber)
.Where(it => it.Type == 1)
.Where(it => it.Status == 1)
.First();
if (material == null)
{
Context.Ado.RollbackTran();
throw new Exception("零件号在物料清单未查到,请到物料清单新增零件号记录");
}
// 检查是否存在库中
WmPolishInventory polishInventory = Context
.Queryable<WmPolishInventory>()
.Where(it => it.Partnumber == partnumber)
.Where(it => it.Type == parm.Type)
.Where(it => it.Status == 1)
.First();
if (polishInventory == null)
{
// 为空则新增库
WmPolishInventory newWmPolishInventory =
new()
{
Id = SnowFlakeSingle.Instance.NextId().ToString(),
BlankNum = "",
Partnumber = partnumber,
Type = parm.Type,
Quantity = parm.Quantity,
MaxNum = 0,
MinNum = 0,
WarnNum = 0,
Status = 1,
Remark = "系统自动创建库",
CreatedBy = parm.CreatedBy,
CreatedTime = DateTime.Now.ToLocalTime(),
UpdatedBy = parm.CreatedBy,
UpdatedTime = DateTime.Now.ToLocalTime(),
};
WmPolishInventory addWmPolishInventory = Context
.Insertable(newWmPolishInventory)
.ExecuteReturnEntity();
string code = SnowFlakeSingle.Instance.NextId().ToString();
string remark = "初次创建仓库，新增手动入库数据";
int successNum = AddPolishRecord(
addWmPolishInventory.Id,
code,
partnumber,
1,
parm.Quantity,
parm.ActionTime,
remark,
parm.CreatedBy
);
if (successNum == 0)
{
Context.Ado.RollbackTran();
throw new Exception("入库日志添加失败");
}
}
else
{
polishInventory.Quantity += parm.Quantity;
int updateNum = Context.Updateable(polishInventory).ExecuteCommand();
if (updateNum == 0)
{
Context.Ado.RollbackTran();
throw new Exception("修改抛光仓库数据失败");
}
// 已有则新增记录
string code = SnowFlakeSingle.Instance.NextId().ToString();
string remark = "手动入库";
int successNum = AddPolishRecord(
polishInventory.Id,
code,
partnumber,
1,
parm.Quantity,
parm.ActionTime,
remark,
parm.CreatedBy
);
if (successNum == 0)
{
Context.Ado.RollbackTran();
throw new Exception("入库日志添加失败");
}
}
Context.Ado.CommitTran();
return 1;
}
catch (Exception e)
{
Context.Ado.RollbackTran();
throw new Exception(e.Message);
}
}
public int DoWmPolishStocktaking(WmPolishInventory parm)
{
if (parm.Quantity < 0)
{
throw new Exception("修改的零件数小于0");
}
try
{
Context.Ado.BeginTran();
// 检查是否存在库中
WmPolishInventory polishInventory = Context
.Queryable<WmPolishInventory>()
.Where(it => it.Id == parm.Id)
.Where(it => it.Status == 1)
.First();
polishInventory.Quantity = parm.Quantity;
Context.Updateable(parm).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
// 已有则新增记录
string code = SnowFlakeSingle.Instance.NextId().ToString();
string remark = "手动盘点";
int successNum = AddPolishRecord(
parm.Id,
code,
parm.Partnumber,
3,
parm.Quantity,
parm.ActionTime,
remark,
parm.CreatedBy
);
if (successNum == 0)
{
Context.Ado.RollbackTran();
throw new Exception("盘点日志添加失败");
}
Context.Ado.CommitTran();
return successNum;
}
catch (Exception e)
{
Context.Ado.RollbackTran();
throw new Exception(e.Message);
}
}
}
}

81
ZR.Service/mes/wms/WmPolishRecordService.cs Normal file
View File

@ -0,0 +1,81 @@
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.mes.wms.IService;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 工艺路线-抛光 库存变动表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWmPolishRecordService), ServiceLifetime = LifeTime.Transient)]
public class WmPolishRecordService : BaseService<WmPolishRecord>, IWmPolishRecordService
{
/// <summary>
/// 查询工艺路线-抛光 库存变动表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmPolishRecordDto> GetList(WmPolishRecordQueryDto parm)
{
var predicate = Expressionable.Create<WmPolishRecord>();
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmPolishRecord, WmPolishRecordDto>(parm);
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmPolishRecord GetInfo(string Id)
{
var response = Queryable().Where(x => x.Id == Id).First();
return response;
}
/// <summary>
/// 添加工艺路线-抛光 库存变动表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmPolishRecord AddWmPolishRecord(WmPolishRecord model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改工艺路线-抛光 库存变动表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmPolishRecord(WmPolishRecord model)
{
//var response = Update(w => w.Id == model.Id, it => new WmPolishRecord()
//{
// Code = model.Code,
// Partnumber = model.Partnumber,
// BlankNum = model.BlankNum,
// ChangeType = model.ChangeType,
// ChangeQuantity = model.ChangeQuantity,
// ActionTime = model.ActionTime,
// Status = model.Status,
// Remark = model.Remark,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
}
}