From 808b225000355d62ad4338ba9ff5c286f80e2160 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Mon, 20 May 2024 13:43:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=A0=87=E7=AD=BE=E8=BF=BD=E6=BA=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pro/WmPackingrecordController.cs | 109 ++++++++++++++++++ .../ZrAdmin.NET-包装记录-0520091356.zip | Bin 0 -> 8381 bytes ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs | 53 +++++++++ ZR.Model/MES/pro/WmPackingrecord.cs | 72 ++++++++++++ ZR.Repository/BaseRepository.cs | 15 ++- .../pro/IService/IWmPackingrecordService.cs | 23 ++++ ZR.Service/mes/pro/WmPackingrecordService.cs | 95 +++++++++++++++ 7 files changed, 366 insertions(+), 1 deletion(-) create mode 100644 ZR.Admin.WebApi/Controllers/mes/pro/WmPackingrecordController.cs create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-包装记录-0520091356.zip create mode 100644 ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs create mode 100644 ZR.Model/MES/pro/WmPackingrecord.cs create mode 100644 ZR.Service/mes/pro/IService/IWmPackingrecordService.cs create mode 100644 ZR.Service/mes/pro/WmPackingrecordService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/WmPackingrecordController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/WmPackingrecordController.cs new file mode 100644 index 00000000..5d68fe54 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/pro/WmPackingrecordController.cs @@ -0,0 +1,109 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Filters; +using ZR.Service.mes.pro.IService; +using ZR.Model.MES.pro.DTO; +using ZR.Model.mes.pro; + +//创建时间：2024-05-20 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 包装记录 + /// + [Verify] + [Route("mes/pro/WmPackingrecord")] + public class WmPackingrecordController : BaseController + { + /// + /// 包装记录接口 + /// + private readonly IWmPackingrecordService _WmPackingrecordService; + + public WmPackingrecordController(IWmPackingrecordService WmPackingrecordService) + { + _WmPackingrecordService = WmPackingrecordService; + } + + /// + /// 查询包装记录列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "productmanagement:wmpackingrecord:list")] + public IActionResult QueryWmPackingrecord([FromQuery] WmPackingrecordQueryDto parm) + { + var response = _WmPackingrecordService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询包装记录详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "productmanagement:wmpackingrecord:query")] + public IActionResult GetWmPackingrecord(long Id) + { + var response = _WmPackingrecordService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加包装记录 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "productmanagement:wmpackingrecord:add")] + [Log(Title = "包装记录", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmPackingrecord([FromBody] WmPackingrecordDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmPackingrecordService.AddWmPackingrecord(modal); + + return SUCCESS(response); + } + + /// + /// 更新包装记录 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "productmanagement:wmpackingrecord:edit")] + [Log(Title = "包装记录", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmPackingrecord([FromBody] WmPackingrecordDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmPackingrecordService.UpdateWmPackingrecord(modal); + + return ToResponse(response); + } + + /// + /// 删除包装记录 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "productmanagement:wmpackingrecord:delete")] + [Log(Title = "包装记录", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmPackingrecord(string ids) + { + long[] idsArr = Tools.SpitLongArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + var response = _WmPackingrecordService.Delete(idsArr); + + return ToResponse(response); + } + + + + + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-包装记录-0520091356.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-包装记录-0520091356.zip new file mode 100644 index 0000000000000000000000000000000000000000..a1f8b64c706cbaa5934b8b0f13372f11335b2ced GIT binary patch literal 8381 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 KSug27?*0#gs1A+* literal 0 HcmV?d00001 diff --git a/ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs b/ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs new file mode 100644 index 00000000..53557fca --- /dev/null +++ b/ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs @@ -0,0 +1,53 @@ +using System.ComponentModel.DataAnnotations; + +namespace ZR.Model.MES.pro.DTO +{ + /// + /// 包装记录查询对象 + /// + public class WmPackingrecordQueryDto : PagerInfo + { + public string PartNum { get; set; } + + public string Machine { get; set; } + public string WorkOrderNum { get; set; } + public DateTime? start_time { get; set; } + public DateTime? end_time { get; set; } + + } + + /// + /// 包装记录输入输出对象 + /// + public class WmPackingrecordDto + { + public long Id { get; set; } + + + public string PartNum { get; set; } + + public string Machine { get; set; } + + public string ProductCode { get; set; } + + public string PackingCode { get; set; } + + public string ScannerContent { get; set; } + + public string WorkOrderNum { get; set; } + + public string Standby3 { get; set; } + + public string Standby4 { get; set; } + + public string Standby5 { get; set; } + + [Required(ErrorMessage = "指示是否满箱不能为空")] + public bool BFilled { get; set; } + + public DateTime? CreateTime { get; set; } + + + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/pro/WmPackingrecord.cs b/ZR.Model/MES/pro/WmPackingrecord.cs new file mode 100644 index 00000000..edc5e81e --- /dev/null +++ b/ZR.Model/MES/pro/WmPackingrecord.cs @@ -0,0 +1,72 @@ + +namespace ZR.Model.mes.pro +{ + /// + /// 包装记录 + /// + [SugarTable("wm_packingrecord")] + public class WmPackingrecord + { + /// + /// Id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + + /// + /// 零件号 + /// + public string PartNum { get; set; } + + /// + /// 设备名称（ID） + /// + public string Machine { get; set; } + + /// + /// 产品条码 + /// + public string ProductCode { get; set; } + + /// + /// 箱条码 + /// + public string PackingCode { get; set; } + + /// + /// 扫码记录 + /// + public string ScannerContent { get; set; } + + /// + /// 工单号 + /// + public string WorkOrderNum { get; set; } + + /// + /// 备用3 + /// + public string Standby3 { get; set; } + + /// + /// 备用4 + /// + public string Standby4 { get; set; } + + /// + /// 备用5 + /// + public string Standby5 { get; set; } + + /// + /// 指示是否满箱 + /// + public bool BFilled { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + + } +} \ No newline at end of file diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 552939c8..3bd2ac49 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/ZR.Repository/BaseRepository.cs @@ -34,6 +34,19 @@ namespace ZR.Repository itenant = DbScoped.SugarScope;//设置租户接口 } + public long UUID + { + + get + { + return UUID; + } + set + { + UUID = SnowFlakeSingle.Instance.NextId(); + } + } + #region add /// @@ -65,7 +78,7 @@ namespace ZR.Repository //{ // return Context.Updateable(entity); //} - + /// /// 实体根据主键更新 /// diff --git a/ZR.Service/mes/pro/IService/IWmPackingrecordService.cs b/ZR.Service/mes/pro/IService/IWmPackingrecordService.cs new file mode 100644 index 00000000..5c350f6b --- /dev/null +++ b/ZR.Service/mes/pro/IService/IWmPackingrecordService.cs @@ -0,0 +1,23 @@ +using System; +using ZR.Model; +using System.Collections.Generic; +using ZR.Model.mes.pro; +using ZR.Model.MES.pro.DTO; + +namespace ZR.Service.mes.pro.IService +{ + /// + /// 包装记录service接口 + /// + public interface IWmPackingrecordService : IBaseService + { + PagedInfo GetList(WmPackingrecordQueryDto parm); + + WmPackingrecord GetInfo(long Id); + + WmPackingrecord AddWmPackingrecord(WmPackingrecord parm); + + int UpdateWmPackingrecord(WmPackingrecord parm); + + } +} diff --git a/ZR.Service/mes/pro/WmPackingrecordService.cs b/ZR.Service/mes/pro/WmPackingrecordService.cs new file mode 100644 index 00000000..ca963a97 --- /dev/null +++ b/ZR.Service/mes/pro/WmPackingrecordService.cs @@ -0,0 +1,95 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using ZR.Model; + +using ZR.Repository; +using ZR.Service.Business.IBusinessService; +using System.Linq; +using ZR.Model.mes.pro; +using ZR.Model.MES.pro.DTO; + +namespace ZR.Service.mes.pro.IService +{ + /// + /// 包装记录Service业务层处理 + /// + [AppService(ServiceType = typeof(IWmPackingrecordService), ServiceLifetime = LifeTime.Transient)] + public class WmPackingrecordService : BaseService, IWmPackingrecordService + { + /// + /// 查询包装记录列表 + /// + /// + /// + public PagedInfo GetList(WmPackingrecordQueryDto parm) + { + var predicate = Expressionable.Create(); + predicate.AndIF(!string.IsNullOrEmpty(parm.PartNum), it => it.PartNum == parm.PartNum) + .AndIF(!string.IsNullOrEmpty(parm.Machine), it => it.Machine == parm.Machine) + .AndIF(!string.IsNullOrEmpty(parm.WorkOrderNum), it => it.WorkOrderNum == parm.WorkOrderNum) + .AndIF(parm.start_time > new DateTime(2021, 1, 1), it => it.CreateTime >= parm.start_time) + .AndIF(parm.end_time > new DateTime(2021, 1, 1), it => it.CreateTime <= parm.end_time); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public WmPackingrecord GetInfo(long Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加包装记录 + /// + /// + /// + public WmPackingrecord AddWmPackingrecord(WmPackingrecord model) + { + model.Id = SnowFlakeSingle.Instance.NextId(); + model.CreateTime = DateTime.Now; + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改包装记录 + /// + /// + /// + public int UpdateWmPackingrecord(WmPackingrecord model) + { + //var response = Update(w => w.Id == model.Id, it => new WmPackingrecord() + //{ + // PartNum = model.PartNum, + // Machine = model.Machine, + // ProductCode = model.ProductCode, + // PackingCode = model.PackingCode, + // ScannerContent = model.ScannerContent, + // WorkOrderNum = model.WorkOrderNum, + // Standby3 = model.Standby3, + // Standby4 = model.Standby4, + // Standby5 = model.Standby5, + // BFilled = model.BFilled, + // CreateTime = model.CreateTime, + //}); + //return response; + return Update(model, true); + } + + } +} \ No newline at end of file