From 741ec8ade473559a60c0854e3f3f466dc20e5438 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Sun, 17 Mar 2024 16:05:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=5F?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=9Ainit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/mes/wms/WmCustomController.cs | 111 ++++++++++++++++++ .../ZrAdmin.NET-客户信息-0317153123.zip | Bin 0 -> 7827 bytes ZR.Model/MES/wms/Dto/WmCustomDto.cs | 42 +++++++ ZR.Model/MES/wms/Dto/WmMaterialDto.cs | 41 ++++++- ZR.Model/MES/wms/WmCustom.cs | 68 ++++++----- .../mes/wms/IService/IWmCustomService.cs | 25 ++++ ZR.Service/mes/wms/WmCustomService.cs | 91 ++++++++++++++ ZR.Service/mes/wms/WmMaterialService.cs | 14 ++- 8 files changed, 359 insertions(+), 33 deletions(-) create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/WmCustomController.cs create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-客户信息-0317153123.zip create mode 100644 ZR.Model/MES/wms/Dto/WmCustomDto.cs create mode 100644 ZR.Service/mes/wms/IService/IWmCustomService.cs create mode 100644 ZR.Service/mes/wms/WmCustomService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmCustomController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmCustomController.cs new file mode 100644 index 00000000..340450d9 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmCustomController.cs @@ -0,0 +1,111 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Model.Dto; + +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-03-17 +namespace ZR.Admin.WebApi.Controllers.mes.wms +{ + /// + /// 客户信息 + /// + [Verify] + [Route("/mes/wm/WmCustom")] + public class WmCustomController : BaseController + { + /// + /// 客户信息接口 + /// + private readonly IWmCustomService _WmCustomService; + + public WmCustomController(IWmCustomService WmCustomService) + { + _WmCustomService = WmCustomService; + } + + /// + /// 查询客户信息列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "wmsManagement:wmcustom:list")] + public IActionResult QueryWmCustom([FromQuery] WmCustomQueryDto parm) + { + var response = _WmCustomService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询客户信息详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "wmsManagement:wmcustom:query")] + public IActionResult GetWmCustom(int Id) + { + var response = _WmCustomService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加客户信息 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "wmsManagement:wmcustom:add")] + [Log(Title = "客户信息", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmCustom([FromBody] WmCustomDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmCustomService.AddWmCustom(modal); + + return SUCCESS(response); + } + + /// + /// 更新客户信息 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "wmsManagement:wmcustom:edit")] + [Log(Title = "客户信息", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmCustom([FromBody] WmCustomDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmCustomService.UpdateWmCustom(modal); + + return ToResponse(response); + } + + /// + /// 删除客户信息 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "wmsManagement:wmcustom:delete")] + [Log(Title = "客户信息", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmCustom(string ids) + { + int[] idsArr = Tools.SpitIntArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + var response = _WmCustomService.Delete(idsArr); + + return ToResponse(response); + } + + + + + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-客户信息-0317153123.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-客户信息-0317153123.zip new file mode 100644 index 0000000000000000000000000000000000000000..73777ba743b156edaf8279f6375679364d3bd278 GIT binary patch literal 7827 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 + /// 客户信息查询对象 + /// + public class WmCustomQueryDto : PagerInfo + { + public string CustomNo { get; set; } + + public string CustomName { get; set; } + } + + /// + /// 客户信息输入输出对象 + /// + public class WmCustomDto + { + [Required(ErrorMessage = "主键不能为空")] + public int Id { get; set; } + + public string CustomNo { get; set; } + + public string CustomName { get; set; } + + public string CustomAddress { 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; } + + + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/Dto/WmMaterialDto.cs b/ZR.Model/MES/wms/Dto/WmMaterialDto.cs index b007e34d..630e54aa 100644 --- a/ZR.Model/MES/wms/Dto/WmMaterialDto.cs +++ b/ZR.Model/MES/wms/Dto/WmMaterialDto.cs @@ -5,8 +5,47 @@ namespace ZR.Model.MES.wms.Dto /// /// 物料记录表查询对象 /// - public class WmMaterialQueryDto : PagerInfo + public class WmMaterialQueryDto : PagerInfo { + + + public string Id { get; set; } + + public string Partnumber { get; set; } + + public string U8InventoryCode { get; set; } + + public string BlankNum { get; set; } + + public string Unit { get; set; } + + public string ProductName { get; set; } + + public string Color { get; set; } + + public string Specification { get; set; } + + public string Description { get; set; } + + public string Version { get; set; } + + public string Remarks { get; set; } + + public int? Sort { get; set; } + + public string Search1 { get; set; } + + public string Search2 { get; set; } + + public int? Status { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } } /// diff --git a/ZR.Model/MES/wms/WmCustom.cs b/ZR.Model/MES/wms/WmCustom.cs index 8ae834c5..be91ec97 100644 --- a/ZR.Model/MES/wms/WmCustom.cs +++ b/ZR.Model/MES/wms/WmCustom.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using SqlSugar; @@ -6,54 +6,62 @@ namespace ZR.Model.MES.wms { /// /// 客户信息 - /// + /// [SugarTable("wm_custom")] public class WmCustom { /// /// 主键 - /// - [SugarColumn(ColumnName="id" ,IsPrimaryKey = true ,IsIdentity = true )] - public int Id { get; set; } + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + /// /// 客户代码 - /// - [SugarColumn(ColumnName="custom_no" )] - public string CustomNo { get; set; } + /// + [SugarColumn(ColumnName = "custom_no")] + public string CustomNo { get; set; } + /// /// 客户名称 - /// - [SugarColumn(ColumnName="custom_name" )] - public string CustomName { get; set; } + /// + [SugarColumn(ColumnName = "custom_name")] + public string CustomName { get; set; } + /// /// 客户地址 - /// - [SugarColumn(ColumnName="custom_address" )] - public string CustomAddress { get; set; } + /// + [SugarColumn(ColumnName = "custom_address")] + public string CustomAddress { get; set; } + /// /// 备注 - /// - [SugarColumn(ColumnName="remark" )] - public string Remark { get; set; } + /// + public string Remark { get; set; } + /// /// 创建人 - /// - [SugarColumn(ColumnName="CREATED_BY" )] - public string CreatedBy { get; set; } + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + /// /// 创建时间 - /// - [SugarColumn(ColumnName="CREATED_TIME" )] - public DateTime? CreatedTime { get; set; } + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + /// /// 更新人 - /// - [SugarColumn(ColumnName="UPDATED_BY" )] - public string UpdatedBy { get; set; } + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + /// /// 更新时间 - /// - [SugarColumn(ColumnName="UPDATED_TIME" )] - public DateTime? UpdatedTime { get; set; } + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + } -} +} \ No newline at end of file diff --git a/ZR.Service/mes/wms/IService/IWmCustomService.cs b/ZR.Service/mes/wms/IService/IWmCustomService.cs new file mode 100644 index 00000000..af900888 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmCustomService.cs @@ -0,0 +1,25 @@ +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 +{ + /// + /// 客户信息service接口 + /// + public interface IWmCustomService : IBaseService + { + PagedInfo GetList(WmCustomQueryDto parm); + + WmCustom GetInfo(int Id); + + WmCustom AddWmCustom(WmCustom parm); + + int UpdateWmCustom(WmCustom parm); + + } +} diff --git a/ZR.Service/mes/wms/WmCustomService.cs b/ZR.Service/mes/wms/WmCustomService.cs new file mode 100644 index 00000000..c466d777 --- /dev/null +++ b/ZR.Service/mes/wms/WmCustomService.cs @@ -0,0 +1,91 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using ZR.Model; +using ZR.Model.Dto; + +using ZR.Repository; + +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 +{ + + /// + /// 客户信息Service业务层处理 + /// + [AppService(ServiceType = typeof(IWmCustomService), ServiceLifetime = LifeTime.Transient)] + public class WmCustomService : BaseService, IWmCustomService + { + /// + /// 查询客户信息列表 + /// + /// + /// + public PagedInfo GetList(WmCustomQueryDto parm) + { + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.CustomNo), it => it.CustomNo.Contains(parm.CustomNo)) + .AndIF(!string.IsNullOrEmpty(parm.CustomName), it => it.CustomName.Contains(parm.CustomName)); + + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public WmCustom GetInfo(int Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加客户信息 + /// + /// + /// + public WmCustom AddWmCustom(WmCustom model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改客户信息 + /// + /// + /// + public int UpdateWmCustom(WmCustom model) + { + //var response = Update(w => w.Id == model.Id, it => new WmCustom() + //{ + // CustomNo = model.CustomNo, + // CustomName = model.CustomName, + // CustomAddress = model.CustomAddress, + // Remark = model.Remark, + // CreatedBy = model.CreatedBy, + // CreatedTime = model.CreatedTime, + // UpdatedBy = model.UpdatedBy, + // UpdatedTime = model.UpdatedTime, + //}); + //return response; + return Update(model, true); + } + + } +} \ No newline at end of file diff --git a/ZR.Service/mes/wms/WmMaterialService.cs b/ZR.Service/mes/wms/WmMaterialService.cs index bcecf225..e844ea36 100644 --- a/ZR.Service/mes/wms/WmMaterialService.cs +++ b/ZR.Service/mes/wms/WmMaterialService.cs @@ -27,11 +27,21 @@ namespace ZR.Service.mes.wms /// public PagedInfo GetList(WmMaterialQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(parm.Partnumber != null, it => it.Partnumber.Contains(parm.Partnumber)) + .AndIF(parm.U8InventoryCode != null, it => it.U8InventoryCode.Contains(parm.U8InventoryCode)) + .AndIF(parm.ProductName != null, it => it.ProductName.Contains(parm.ProductName)) + .AndIF(parm.Color != null, it => it.Color.Contains(parm.Color)) + .AndIF(parm.Specification != null, it => it.Specification.Contains(parm.Specification)) + .AndIF(parm.Description != null, it => it.Description.Contains(parm.Description)) + .AndIF(parm.Search1 != null, it => it.Search1.Contains(parm.Search1) || it.Search2.Contains(parm.Search1)) + .AndIF(parm.Status > -1, it => it.Status == parm.Status); + var response = Queryable() - .Where(predicate.ToExpression()) + .Where(predicate.ToExpression()).OrderByDescending(it=>it.CreatedTime) .ToPage(parm); + return response; }