From 66b929ee33502566b084d7b5b0a9d958b3bd2775 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 3 Jul 2023 14:38:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=92=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceWorkFlowProjectRelation.cs | 6 +++ .../TrackingSystem/StatusSkuBaseInfo.cs | 42 ++++++++++++++++++- .../TrackingSystem/ServiceProjectService.cs | 28 ++++++++----- .../TrackingSystem/StatusSkuBaseService.cs | 12 ++++++ 4 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 Myshipping.Application/Service/TrackingSystem/StatusSkuBaseService.cs diff --git a/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowProjectRelation.cs b/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowProjectRelation.cs index 703b02f7..d749d35c 100644 --- a/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowProjectRelation.cs +++ b/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowProjectRelation.cs @@ -2,13 +2,19 @@ using SqlSugar; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; namespace Myshipping.Application.Entity { + /// + /// 服务流程与服务项目关系表 + /// [Tenant(CommonConst.MasterDb)] + [SugarTable("service_workflow_project_relation")] + [Description("服务流程与服务项目关系表")] public class ServiceWorkFlowProjectRelation { /// diff --git a/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs b/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs index ed6ae975..a28ce9d1 100644 --- a/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs +++ b/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs @@ -1,12 +1,50 @@ -using System; +using Furion.DistributedIDGenerator; +using Myshipping.Application.Entity.TrackingSystem; +using SqlSugar; +using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; namespace Myshipping.Application.Entity { - internal class StatusSkuBaseInfo + [SugarTable("status_sku_base")] + [Description("状态主表")] + public class StatusSkuBaseInfo : TrackingSystemDbEntity { + public StatusSkuBaseInfo() + { + PK_ID = IDGen.NextID().ToString(); + + CreatedTime = DateTime.Now; + + } + + /// + /// 状态代码 + /// + public string STATUS_SKU_CODE { get; set; } + + /// + /// 状态名称 + /// + public string STATUS_SKU_NAME { get; set; } + + /// + /// 显示颜色(背景色) + /// + public string BACKGROUND_COLOR { get; set; } + + /// + /// 显示顺序号 + /// + public int SORT_NO { get; set; } + + /// + /// 是否启用 + /// + public int IS_ENABLE { get; set; } } } diff --git a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs b/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs index 9e69775c..d5590196 100644 --- a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs +++ b/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs @@ -44,7 +44,8 @@ namespace Myshipping.Application /// /// 服务项目详情 /// 返回回执 - public async Task Save(ServiceProjectBaseDto info) + [HttpPost("/ServiceProject/Save")] + public async Task Save([FromBody] ServiceProjectBaseDto info) { TaskManageOrderResultDto result = new TaskManageOrderResultDto(); @@ -151,7 +152,8 @@ namespace Myshipping.Application /// /// 服务项目详情 /// 返回回执 - public async Task SaveAndEnable(ServiceProjectBaseDto info) + [HttpPost("/ServiceProject/SaveAndEnable")] + public async Task SaveAndEnable([FromBody]ServiceProjectBaseDto info) { TaskManageOrderResultDto result = new TaskManageOrderResultDto(); @@ -178,13 +180,14 @@ namespace Myshipping.Application /// /// 服务项目主键 /// 返回回执 - public async Task SetEnable(string pkId) + [HttpGet("/ServiceProject/SetEnable")] + public async Task SetEnable([FromQuery] string pkId) { TaskManageOrderResultDto result = new TaskManageOrderResultDto(); try { - if(string.IsNullOrWhiteSpace(pkId)) + if (string.IsNullOrWhiteSpace(pkId)) { throw Oops.Oh($"服务项目主键不能为空", typeof(InvalidOperationException)); } @@ -210,12 +213,12 @@ namespace Myshipping.Application it.UpdatedTime, it.UpdatedUserId, it.UpdatedUserName - + }).ExecuteCommandAsync(); result.succ = true; result.msg = "执行成功"; - + } catch (Exception ex) { @@ -231,7 +234,8 @@ namespace Myshipping.Application /// /// 服务项目主键 /// 返回回执 - public async Task SetUnEnable(string pkId) + [HttpGet("/ServiceProject/SetUnEnable")] + public async Task SetUnEnable([FromQuery] string pkId) { TaskManageOrderResultDto result = new TaskManageOrderResultDto(); @@ -283,7 +287,8 @@ namespace Myshipping.Application /// /// 服务项目主键 /// 返回回执 - public async Task Delete(string pkId) + [HttpGet("/ServiceProject/Delete")] + public async Task Delete([FromQuery] string pkId) { TaskManageOrderResultDto result = new TaskManageOrderResultDto(); @@ -336,7 +341,8 @@ namespace Myshipping.Application /// /// 服务项目主键 /// 返回回执 - public async Task GetInfo(string pkId) + [HttpGet("/ServiceProject/GetInfo")] + public async Task GetInfo([FromQuery] string pkId) { TaskManageOrderResultDto result = new TaskManageOrderResultDto(); @@ -374,7 +380,8 @@ namespace Myshipping.Application /// 检索值 /// 最大返回行数（默认15） /// 返回回执 - public async Task QueryList(string queryItem, int topNum = 15) + [HttpGet("/ServiceProject/QueryList")] + public async Task QueryList([FromQuery] string queryItem, [FromQuery] int topNum = 15) { TaskManageOrderResultDto result = new TaskManageOrderResultDto(); @@ -404,6 +411,7 @@ namespace Myshipping.Application /// /// 服务项目台账查询请求 /// 返回结果 + [HttpGet("/ServiceProject/GetPage")] public async Task> GetPageAsync(QueryServiceProjectBaseDto QuerySearch) { //制单日期 diff --git a/Myshipping.Application/Service/TrackingSystem/StatusSkuBaseService.cs b/Myshipping.Application/Service/TrackingSystem/StatusSkuBaseService.cs new file mode 100644 index 00000000..136ee9fd --- /dev/null +++ b/Myshipping.Application/Service/TrackingSystem/StatusSkuBaseService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + public class StatusSkuBaseService + { + } +}