diff --git a/RIZO.Admin.WebApi/Controllers/Mes/GatherData/ProcessParameterController.cs b/RIZO.Admin.WebApi/Controllers/Mes/GatherData/ProcessParameterController.cs index ea3baab..00386ed 100644 --- a/RIZO.Admin.WebApi/Controllers/Mes/GatherData/ProcessParameterController.cs +++ b/RIZO.Admin.WebApi/Controllers/Mes/GatherData/ProcessParameterController.cs @@ -4,7 +4,7 @@ using RIZO.Model.Mes.GatherData; using RIZO.Service.Mes.IMesService.GatherData; //创建时间：2025-11-12 -namespace RIZO.Admin.WebApi.Controllers.Mes +namespace RIZO.Admin.WebApi.Controllers.Mes.GatherData { /// /// 生产工艺参数 @@ -97,17 +97,5 @@ namespace RIZO.Admin.WebApi.Controllers.Mes return ToResponse(_ProcessParameterService.Delete(idArr)); } - /// - /// 扫码新增工单主表/工单从表/生产工艺参数数据 - /// - /// - //[HttpPost("createProcessParameterBySacnCode")] - //[Log(Title = "扫码新增工单主表/工单从表/生产工艺参数数据", BusinessType = BusinessType.INSERT)] - //public IActionResult CreateProcessParameterBySacnCode([FromBody] string lineCode, [FromBody] string processCode, [FromBody] string IDCode ) - //{ - // var response = _ProcessParameterService.CreateProcessParameterBySacnCode(lineCode,processCode,IDCode); - // return SUCCESS(response); - //} - } } \ No newline at end of file diff --git a/RIZO.Admin.WebApi/Controllers/Mes/MasterData/PlcFirstCodeController.cs b/RIZO.Admin.WebApi/Controllers/Mes/MasterData/PlcFirstCodeController.cs new file mode 100644 index 0000000..96cbb8f --- /dev/null +++ b/RIZO.Admin.WebApi/Controllers/Mes/MasterData/PlcFirstCodeController.cs @@ -0,0 +1,100 @@ +using Microsoft.AspNetCore.Mvc; +using RIZO.Model.Mes.Dto.MasterData; +using RIZO.Model.Mes.MasterData; +using RIZO.Service.Mes.IMesService.MasterData; + +//创建时间：2025-11-13 +namespace RIZO.Admin.WebApi.Controllers.Mes.MasterData +{ + /// + /// PLC通讯首位码 + /// + [Route("mes/PlcFirstCode")] + public class PlcFirstCodeController : BaseController + { + /// + /// PLC通讯首位码接口 + /// + private readonly IPlcFirstCodeService _PlcFirstCodeService; + + public PlcFirstCodeController(IPlcFirstCodeService PlcFirstCodeService) + { + _PlcFirstCodeService = PlcFirstCodeService; + } + + /// + /// 查询PLC通讯首位码列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "plcfirstcode:list")] + public IActionResult QueryPlcFirstCode([FromQuery] PlcFirstCodeQueryDto parm) + { + var response = _PlcFirstCodeService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询PLC通讯首位码详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "plcfirstcode:query")] + public IActionResult GetPlcFirstCode(long Id) + { + var response = _PlcFirstCodeService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加PLC通讯首位码 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "plcfirstcode:add")] + [Log(Title = "PLC通讯首位码", BusinessType = BusinessType.INSERT)] + public IActionResult AddPlcFirstCode([FromBody] PlcFirstCodeDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _PlcFirstCodeService.AddPlcFirstCode(modal); + + return SUCCESS(response); + } + + /// + /// 更新PLC通讯首位码 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "plcfirstcode:edit")] + [Log(Title = "PLC通讯首位码", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdatePlcFirstCode([FromBody] PlcFirstCodeDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _PlcFirstCodeService.UpdatePlcFirstCode(modal); + + return ToResponse(response); + } + + /// + /// 删除PLC通讯首位码 + /// + /// + [HttpPost("delete/{ids}")] + [ActionPermissionFilter(Permission = "plcfirstcode:delete")] + [Log(Title = "PLC通讯首位码", BusinessType = BusinessType.DELETE)] + public IActionResult DeletePlcFirstCode([FromRoute]string ids) + { + var idArr = Tools.SplitAndConvert(ids); + + return ToResponse(_PlcFirstCodeService.Delete(idArr)); + } + + } +} \ No newline at end of file diff --git a/RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderController.cs b/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs similarity index 89% rename from RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderController.cs rename to RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs index 9232380..60fb226 100644 --- a/RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderController.cs +++ b/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs @@ -1,11 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using RIZO.Model.Mes.Dto.WorkOrder; -using RIZO.Model.Mes.WorkOrder; -using RIZO.Service.Mes.IMesService; -using RIZO.Service.Mes.IMesService.WorkOrder; +using RIZO.Model.Mes.Dto.WorkOrderInfo; +using RIZO.Model.Mes.WorkOrderInfo; +using RIZO.Service.Mes.IMesService.WorkOrderInfo; //创建时间：2025-11-12 -namespace RIZO.Admin.WebApi.Controllers.Mes +namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo { /// /// 工单主表 @@ -62,7 +61,7 @@ namespace RIZO.Admin.WebApi.Controllers.Mes [Log(Title = "工单主表", BusinessType = BusinessType.INSERT)] public IActionResult AddWorkOrder([FromBody] WorkOrderDto parm) { - var modal = parm.Adapt().ToCreate(HttpContext); + var modal = parm.Adapt().ToCreate(HttpContext); var response = _WorkOrderService.AddWorkOrder(modal); @@ -78,7 +77,7 @@ namespace RIZO.Admin.WebApi.Controllers.Mes [Log(Title = "工单主表", BusinessType = BusinessType.UPDATE)] public IActionResult UpdateWorkOrder([FromBody] WorkOrderDto parm) { - var modal = parm.Adapt().ToUpdate(HttpContext); + var modal = parm.Adapt().ToUpdate(HttpContext); var response = _WorkOrderService.UpdateWorkOrder(modal); return ToResponse(response); diff --git a/RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderItemController.cs b/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderItemController.cs similarity index 95% rename from RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderItemController.cs rename to RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderItemController.cs index 3a7bc9a..5d783de 100644 --- a/RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderItemController.cs +++ b/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderItemController.cs @@ -1,11 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using RIZO.Service.Mes.IMesService; -using RIZO.Model.Mes.Dto.WorkOrder; -using RIZO.Model.Mes.WorkOrder; -using RIZO.Service.Mes.IMesService.WorkOrder; +using RIZO.Model.Mes.Dto.WorkOrderInfo; +using RIZO.Model.Mes.WorkOrderInfo; +using RIZO.Service.Mes.IMesService.WorkOrderInfo; //创建时间：2025-11-12 -namespace RIZO.Admin.WebApi.Controllers.Mes +namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo { /// /// 工单从表（存储工单所需物料明细及物料流转状态） diff --git a/RIZO.Admin.WebApi/Extensions/SwaggerExtension.cs b/RIZO.Admin.WebApi/Extensions/SwaggerExtension.cs index c830cc3..abdaa93 100644 --- a/RIZO.Admin.WebApi/Extensions/SwaggerExtension.cs +++ b/RIZO.Admin.WebApi/Extensions/SwaggerExtension.cs @@ -36,7 +36,7 @@ namespace RIZO.Admin.WebApi.Extensions app.UseSwaggerUI(c => { c.SwaggerEndpoint("sys/swagger.json", "系统管理"); - c.SwaggerEndpoint("article/swagger.json", "文章管理"); + //c.SwaggerEndpoint("article/swagger.json", "文章管理"); c.SwaggerEndpoint("v1/swagger.json", "business"); c.SwaggerEndpoint("shopping/swagger.json", "商城管理"); c.DocExpansion(DocExpansion.None); //->修改界面打开时自动折叠 diff --git a/RIZO.Admin.WebApi/RIZO.Admin.WebApi.csproj b/RIZO.Admin.WebApi/RIZO.Admin.WebApi.csproj index 385828b..9d96dec 100644 --- a/RIZO.Admin.WebApi/RIZO.Admin.WebApi.csproj +++ b/RIZO.Admin.WebApi/RIZO.Admin.WebApi.csproj @@ -28,7 +28,7 @@ - + diff --git a/RIZO.Model/Mes/Dto/GatherData/ProcessParameterDto.cs b/RIZO.Model/Mes/Dto/GatherData/ProcessParameterDto.cs index 34bae51..ea5466b 100644 --- a/RIZO.Model/Mes/Dto/GatherData/ProcessParameterDto.cs +++ b/RIZO.Model/Mes/Dto/GatherData/ProcessParameterDto.cs @@ -45,8 +45,21 @@ namespace RIZO.Model.Mes.Dto.GatherData public DateTime? UpdateTime { get; set; } public int? Delflag { get; set; } + } + // 定义密码修改请求模型 + public class ScanCodeParm + { + // 可添加 [Required] 特性进行自动验证 + [Required(ErrorMessage = "产线编码不能为空")] + public string LineCode { get; set; } + public string LineName { get; set; } + [Required(ErrorMessage = "工艺路线编码不能为空")] + public string ProcessCode { get; set; } + public string ProcessName { get; set; } + [Required(ErrorMessage = "扫码编码不能为空")] + public string IDCode { get; set; } } } \ No newline at end of file diff --git a/RIZO.Model/Mes/Dto/MasterData/PlcFirstCodeDto.cs b/RIZO.Model/Mes/Dto/MasterData/PlcFirstCodeDto.cs new file mode 100644 index 0000000..ed43070 --- /dev/null +++ b/RIZO.Model/Mes/Dto/MasterData/PlcFirstCodeDto.cs @@ -0,0 +1,28 @@ + +namespace RIZO.Model.Mes.Dto.MasterData +{ + /// + /// PLC通讯首位码查询对象 + /// + public class PlcFirstCodeQueryDto : PagerInfo + { + } + + /// + /// PLC通讯首位码输入输出对象 + /// + public class PlcFirstCodeDto + { + [Required(ErrorMessage = "Id不能为空")] + public long Id { get; set; } + + public string LineCode { get; set; } + + public string Feature { get; set; } + + public string FirstCode { get; set; } + + + + } +} \ No newline at end of file diff --git a/RIZO.Model/Mes/Dto/WorkOrder/WorkOrderDto.cs b/RIZO.Model/Mes/Dto/WorkOrder/WorkOrderDto.cs deleted file mode 100644 index 29a66ef..0000000 --- a/RIZO.Model/Mes/Dto/WorkOrder/WorkOrderDto.cs +++ /dev/null @@ -1,73 +0,0 @@ - -namespace RIZO.Model.Mes.Dto.WorkOrder -{ - /// - /// 工单主表查询对象 - /// - public class WorkOrderQueryDto : PagerInfo - { - } - - /// - /// 工单主表输入输出对象 - /// - public class WorkOrderDto - { - [Required(ErrorMessage = "主键ID不能为空")] - public long Id { get; set; } - - [Required(ErrorMessage = "工单编码（业务唯一标识）不能为空")] - public string WorkOrderCode { get; set; } - - [Required(ErrorMessage = "工艺编码不能为空")] - public string ProcessCode { get; set; } - - [Required(ErrorMessage = "工艺名称不能为空")] - public string ProcessName { get; set; } - - public string LineCode { get; set; } - - public string LineName { get; set; } - - public DateTime? OrderDate { get; set; } - - public string ProductCode { get; set; } - - public string ProductName { get; set; } - - [Required(ErrorMessage = "工单总数（非负）不能为空")] - public int TotalQty { get; set; } - - [Required(ErrorMessage = "合格数（非负）不能为空")] - public int OkQty { get; set; } - - [Required(ErrorMessage = "不合格数（非负）不能为空")] - public int NgQty { get; set; } - - public string DefectReason { get; set; } - - [Required(ErrorMessage = "工单状态（0-待执行、1-执行中、2-已完成、3-已取消）不能为空")] - public int OrderStatus { get; set; } - - [Required(ErrorMessage = "创建人ID不能为空")] - public string CreateBy { get; set; } - - [Required(ErrorMessage = "创建人名字不能为空")] - public string CreateName { get; set; } - - [Required(ErrorMessage = "创建时间不能为空")] - public DateTime? CreateTime { get; set; } - - public string UpdateBy { get; set; } - - public string UpdateName { get; set; } - - [Required(ErrorMessage = "更新时间不能为空")] - public DateTime? UpdateTime { get; set; } - - - - [ExcelColumn(Name = "工单状态（0-待执行、1-执行中、2-已完成、3-已取消）")] - public string OrderStatusLabel { get; set; } - } -} \ No newline at end of file diff --git a/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs b/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs new file mode 100644 index 0000000..2d8c65b --- /dev/null +++ b/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs @@ -0,0 +1,58 @@ + +namespace RIZO.Model.Mes.Dto.WorkOrderInfo +{ + /// + /// 工单主表查询对象 + /// + public class WorkOrderQueryDto : PagerInfo + { + } + + /// + /// 工单主表输入输出对象 + /// + public class WorkOrderDto + { + public long Id { get; set; } + + public string WorkOrderCode { get; set; } + + public string LineCode { get; set; } + + public string LineName { get; set; } + + public string OrderDate { get; set; } + + public string ProductCode { get; set; } + + public string ProductName { get; set; } + + public int TotalQty { get; set; } + + public int OkQty { get; set; } + + public int NgQty { get; set; } + + public string DefectReason { get; set; } + + public int OrderStatus { get; set; } + + + public string CreateBy { get; set; } + + + public string CreateName { get; set; } + + + public DateTime? CreateTime { get; set; } + + public string UpdateBy { get; set; } + + public string UpdateName { get; set; } + + + public DateTime? UpdateTime { get; set; } + + + } +} \ No newline at end of file diff --git a/RIZO.Model/Mes/Dto/WorkOrder/WorkOrderItemDto.cs b/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderItemDto.cs similarity index 56% rename from RIZO.Model/Mes/Dto/WorkOrder/WorkOrderItemDto.cs rename to RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderItemDto.cs index 40c29c5..c590c5d 100644 --- a/RIZO.Model/Mes/Dto/WorkOrder/WorkOrderItemDto.cs +++ b/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderItemDto.cs @@ -1,5 +1,5 @@ -namespace RIZO.Model.Mes.Dto.WorkOrder +namespace RIZO.Model.Mes.Dto.WorkOrderInfo { /// /// 工单从表（存储工单所需物料明细及物料流转状态）查询对象 @@ -13,44 +13,35 @@ namespace RIZO.Model.Mes.Dto.WorkOrder /// public class WorkOrderItemDto { - [Required(ErrorMessage = "自增主键（内部唯一标识）不能为空")] public long Id { get; set; } - [Required(ErrorMessage = "关联主表工单编码不能为空")] public string WorkOrderCode { get; set; } - [Required(ErrorMessage = "明细唯一编码不能为空")] public string WorkOrderItemCode { get; set; } - [Required(ErrorMessage = "PLC交互编码不能为空")] public string PlcCode { get; set; } - [Required(ErrorMessage = "物料编码不能为空")] public string MaterialCode { get; set; } - [Required(ErrorMessage = "物料名称不能为空")] public string MaterialName { get; set; } - [Required(ErrorMessage = "数量，默认为1不能为空")] public int Qty { get; set; } - [Required(ErrorMessage = "执行状态（建议枚举：0-未执行、1-执行中、2-已完成等）不能为空")] public string ExecuteStatus { get; set; } - [Required(ErrorMessage = "创建人ID不能为空")] public string CreateBy { get; set; } - [Required(ErrorMessage = "创建人名称不能为空")] public string CreateByName { get; set; } - [Required(ErrorMessage = "创建时间不能为空")] public DateTime? CreateTime { get; set; } public string UpdateBy { get; set; } - [Required(ErrorMessage = "最后更新时间不能为空")] public DateTime? UpdateTime { get; set; } + public string ProcessCode { get; set; } + + public string ProcessName { get; set; } [ExcelColumn(Name = "执行状态（建议枚举：0-未执行、1-执行中、2-已完成等）")] diff --git a/RIZO.Model/Mes/MasterData/PlcFirstCode.cs b/RIZO.Model/Mes/MasterData/PlcFirstCode.cs new file mode 100644 index 0000000..004d354 --- /dev/null +++ b/RIZO.Model/Mes/MasterData/PlcFirstCode.cs @@ -0,0 +1,34 @@ + +namespace RIZO.Model.Mes.MasterData +{ + /// + /// PLC通讯首位码 + /// + [SugarTable("plc_first_code")] + public class PlcFirstCode + { + /// + /// Id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + + /// + /// 产线编码 + /// + [SugarColumn(ColumnName = "line_code")] + public string LineCode { get; set; } + + /// + /// 灵敏度等级 + /// + public string Feature { get; set; } + + /// + /// PLC通讯首位编码 + /// + [SugarColumn(ColumnName = "plc_first_code")] + public string FirstCode { get; set; } + + } +} \ No newline at end of file diff --git a/RIZO.Model/Mes/WorkOrder/WorkOrderInfo.cs b/RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs similarity index 87% rename from RIZO.Model/Mes/WorkOrder/WorkOrderInfo.cs rename to RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs index dc4d720..d229f7f 100644 --- a/RIZO.Model/Mes/WorkOrder/WorkOrderInfo.cs +++ b/RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs @@ -1,11 +1,11 @@ -namespace RIZO.Model.Mes.WorkOrder +namespace RIZO.Model.Mes.WorkOrderInfo { /// /// 工单主表 /// [SugarTable("work_order")] - public class WorkOrderInfo + public class WorkOrder { /// /// 主键ID @@ -19,18 +19,6 @@ namespace RIZO.Model.Mes.WorkOrder [SugarColumn(ColumnName = "work_order_code")] public string WorkOrderCode { get; set; } - /// - /// 工艺编码 - /// - [SugarColumn(ColumnName = "process_code")] - public string ProcessCode { get; set; } - - /// - /// 工艺名称 - /// - [SugarColumn(ColumnName = "process_name")] - public string ProcessName { get; set; } - /// /// 产线Code /// @@ -47,7 +35,7 @@ namespace RIZO.Model.Mes.WorkOrder /// 订单日期 /// [SugarColumn(ColumnName = "order_date")] - public DateTime? OrderDate { get; set; } + public string OrderDate { get; set; } /// /// 产品编码 diff --git a/RIZO.Model/Mes/WorkOrder/WorkOrderItem.cs b/RIZO.Model/Mes/WorkOrderInfo/WorkOrderItem.cs similarity index 77% rename from RIZO.Model/Mes/WorkOrder/WorkOrderItem.cs rename to RIZO.Model/Mes/WorkOrderInfo/WorkOrderItem.cs index 55614fc..e0cc4ec 100644 --- a/RIZO.Model/Mes/WorkOrder/WorkOrderItem.cs +++ b/RIZO.Model/Mes/WorkOrderInfo/WorkOrderItem.cs @@ -1,5 +1,5 @@ -namespace RIZO.Model.Mes.WorkOrder +namespace RIZO.Model.Mes.WorkOrderInfo { /// /// 工单从表（存储工单所需物料明细及物料流转状态） @@ -31,6 +31,18 @@ namespace RIZO.Model.Mes.WorkOrder [SugarColumn(ColumnName = "plc_code")] public string PlcCode { get; set; } + /// + /// 工艺编码 + /// + [SugarColumn(ColumnName = "process_code")] + public string ProcessCode { get; set; } + + /// + /// 工艺名称 + /// + [SugarColumn(ColumnName = "process_name")] + public string ProcessName { get; set; } + /// /// 物料编码 /// @@ -84,5 +96,18 @@ namespace RIZO.Model.Mes.WorkOrder [SugarColumn(ColumnName = "update_time")] public DateTime? UpdateTime { get; set; } + + /// + /// 序号 + /// + [SugarColumn(ColumnName = "sequcence")] + public int Sequcence { get; set; } + + + /// + /// 唯一标识码 + /// + [SugarColumn(ColumnName = "identification_code")] + public int IdentificationCode { get; set; } } } \ No newline at end of file diff --git a/RIZO.Model/RIZO.Model.csproj b/RIZO.Model/RIZO.Model.csproj index 6035bf4..8ac7bef 100644 --- a/RIZO.Model/RIZO.Model.csproj +++ b/RIZO.Model/RIZO.Model.csproj @@ -14,7 +14,7 @@ - + diff --git a/RIZO.Service/Mes/GatherData/ProcessParameterService.cs b/RIZO.Service/Mes/GatherData/ProcessParameterService.cs index 9faf5de..4338970 100644 --- a/RIZO.Service/Mes/GatherData/ProcessParameterService.cs +++ b/RIZO.Service/Mes/GatherData/ProcessParameterService.cs @@ -1,9 +1,16 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; +using NLog.LayoutRenderers; using RIZO.Model.Mes.Dto.GatherData; +using RIZO.Model.Mes.Dto.WorkOrderInfo; using RIZO.Model.Mes.GatherData; +using RIZO.Model.Mes.MasterData; +using RIZO.Model.Mes.Material; +using RIZO.Model.Mes.WorkOrderInfo; using RIZO.Repository; using RIZO.Service.Mes.IMesService.GatherData; +using RIZO.Service.Mes.Material; +using RIZO.Service.Mes.Process; namespace RIZO.Service.Mes.GatherData { @@ -75,6 +82,5 @@ namespace RIZO.Service.Mes.GatherData return predicate; } - } } \ No newline at end of file diff --git a/RIZO.Service/Mes/IMesService/GatherData/IProcessParameterService.cs b/RIZO.Service/Mes/IMesService/GatherData/IProcessParameterService.cs index 07a5cf0..9290107 100644 --- a/RIZO.Service/Mes/IMesService/GatherData/IProcessParameterService.cs +++ b/RIZO.Service/Mes/IMesService/GatherData/IProcessParameterService.cs @@ -1,5 +1,6 @@ using RIZO.Model.Mes.Dto.GatherData; using RIZO.Model.Mes.GatherData; +using RIZO.Model.Mes.WorkOrderInfo; using System.Reflection.Emit; namespace RIZO.Service.Mes.IMesService.GatherData @@ -16,7 +17,5 @@ namespace RIZO.Service.Mes.IMesService.GatherData ProcessParameter AddProcessParameter(ProcessParameter parm); int UpdateProcessParameter(ProcessParameter parm); - - //ProcessParameter CreateProcessParameterBySacnCode(string lineCode, string processCode, string IDCode); } } diff --git a/RIZO.Service/Mes/IMesService/MasterData/IPlcFirstCodeService.cs b/RIZO.Service/Mes/IMesService/MasterData/IPlcFirstCodeService.cs new file mode 100644 index 0000000..3344052 --- /dev/null +++ b/RIZO.Service/Mes/IMesService/MasterData/IPlcFirstCodeService.cs @@ -0,0 +1,21 @@ +using RIZO.Model.Mes.Dto.MasterData; +using RIZO.Model.Mes.MasterData; + +namespace RIZO.Service.Mes.IMesService.MasterData +{ + /// + /// PLC通讯首位码service接口 + /// + public interface IPlcFirstCodeService : IBaseService + { + PagedInfo GetList(PlcFirstCodeQueryDto parm); + + PlcFirstCode GetInfo(long Id); + + + PlcFirstCode AddPlcFirstCode(PlcFirstCode parm); + int UpdatePlcFirstCode(PlcFirstCode parm); + + + } +} diff --git a/RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderService.cs b/RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderService.cs deleted file mode 100644 index 9f09c59..0000000 --- a/RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using RIZO.Model.Mes.Dto.WorkOrder; -using RIZO.Model.Mes.WorkOrder; - -namespace RIZO.Service.Mes.IMesService.WorkOrder -{ - /// - /// 工单主表service接口 - /// - public interface IWorkOrderService : IBaseService - { - PagedInfo GetList(WorkOrderQueryDto parm); - - WorkOrderInfo GetInfo(long Id); - - - WorkOrderInfo AddWorkOrder(WorkOrderInfo parm); - int UpdateWorkOrder(WorkOrderInfo parm); - - - } -} diff --git a/RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderItemService.cs b/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderItemService.cs similarity index 74% rename from RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderItemService.cs rename to RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderItemService.cs index a53c696..b8da255 100644 --- a/RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderItemService.cs +++ b/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderItemService.cs @@ -1,7 +1,8 @@ -using RIZO.Model.Mes.WorkOrder; -using RIZO.Model.Mes.Dto.WorkOrder; +using Infrastructure.Model; +using RIZO.Model.Mes.WorkOrderInfo; +using RIZO.Model.Mes.Dto.WorkOrderInfo; -namespace RIZO.Service.Mes.IMesService.WorkOrder +namespace RIZO.Service.Mes.IMesService.WorkOrderInfo { /// /// 工单从表（存储工单所需物料明细及物料流转状态）service接口 diff --git a/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs b/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs new file mode 100644 index 0000000..d632855 --- /dev/null +++ b/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs @@ -0,0 +1,21 @@ +using RIZO.Model.Mes.Dto.WorkOrderInfo; +using RIZO.Model.Mes.WorkOrderInfo; + +namespace RIZO.Service.Mes.IMesService.WorkOrderInfo +{ + /// + /// 工单主表service接口 + /// + public interface IWorkOrderService : IBaseService + { + PagedInfo GetList(WorkOrderQueryDto parm); + + WorkOrder GetInfo(long Id); + + + WorkOrder AddWorkOrder(WorkOrder parm); + int UpdateWorkOrder(WorkOrder parm); + + + } +} diff --git a/RIZO.Service/Mes/MasterData/PlcFirstCodeService.cs b/RIZO.Service/Mes/MasterData/PlcFirstCodeService.cs new file mode 100644 index 0000000..d31d16d --- /dev/null +++ b/RIZO.Service/Mes/MasterData/PlcFirstCodeService.cs @@ -0,0 +1,79 @@ +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using RIZO.Model.Mes.Dto.MasterData; +using RIZO.Model.Mes.MasterData; +using RIZO.Repository; +using RIZO.Service.Mes.IMesService.MasterData; + +namespace RIZO.Service.Mes +{ + /// + /// PLC通讯首位码Service业务层处理 + /// + [AppService(ServiceType = typeof(IPlcFirstCodeService), ServiceLifetime = LifeTime.Transient)] + public class PlcFirstCodeService : BaseService, IPlcFirstCodeService + { + /// + /// 查询PLC通讯首位码列表 + /// + /// + /// + public PagedInfo GetList(PlcFirstCodeQueryDto parm) + { + var predicate = QueryExp(parm); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public PlcFirstCode GetInfo(long Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加PLC通讯首位码 + /// + /// + /// + public PlcFirstCode AddPlcFirstCode(PlcFirstCode model) + { + return Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改PLC通讯首位码 + /// + /// + /// + public int UpdatePlcFirstCode(PlcFirstCode model) + { + return Update(model, true); + } + + /// + /// 查询导出表达式 + /// + /// + /// + private static Expressionable QueryExp(PlcFirstCodeQueryDto parm) + { + var predicate = Expressionable.Create(); + + return predicate; + } + } +} \ No newline at end of file diff --git a/RIZO.Service/Mes/WorkOrder/WorkOrderItemService.cs b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderItemService.cs similarity index 93% rename from RIZO.Service/Mes/WorkOrder/WorkOrderItemService.cs rename to RIZO.Service/Mes/WorkOrderInfo/WorkOrderItemService.cs index 290bc80..07f4296 100644 --- a/RIZO.Service/Mes/WorkOrder/WorkOrderItemService.cs +++ b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderItemService.cs @@ -1,11 +1,11 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; -using RIZO.Model.Mes.Dto.WorkOrder; -using RIZO.Model.Mes.WorkOrder; +using RIZO.Model.Mes.Dto.WorkOrderInfo; +using RIZO.Model.Mes.WorkOrderInfo; using RIZO.Repository; -using RIZO.Service.Mes.IMesService.WorkOrder; +using RIZO.Service.Mes.IMesService.WorkOrderInfo; -namespace RIZO.Service.Mes +namespace RIZO.Service.Mes.WorkOrderInfo { /// /// 工单从表（存储工单所需物料明细及物料流转状态）Service业务层处理 diff --git a/RIZO.Service/Mes/WorkOrder/WorkOrderService.cs b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs similarity index 71% rename from RIZO.Service/Mes/WorkOrder/WorkOrderService.cs rename to RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs index 7b094e6..d7b5613 100644 --- a/RIZO.Service/Mes/WorkOrder/WorkOrderService.cs +++ b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs @@ -1,18 +1,17 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; -using RIZO.Model.Mes.Dto.WorkOrder; -using RIZO.Model.Mes.WorkOrder; +using RIZO.Model.Mes.Dto.WorkOrderInfo; +using RIZO.Model.Mes.WorkOrderInfo; using RIZO.Repository; -using RIZO.Service.Mes.IMesService; -using RIZO.Service.Mes.IMesService.WorkOrder; +using RIZO.Service.Mes.IMesService.WorkOrderInfo; -namespace RIZO.Service.Mes +namespace RIZO.Service.Mes.WorkOrderInfo { /// /// 工单主表Service业务层处理 /// [AppService(ServiceType = typeof(IWorkOrderService), ServiceLifetime = LifeTime.Transient)] - public class WorkOrderService : BaseService, IWorkOrderService + public class WorkOrderService : BaseService, IWorkOrderService { /// /// 查询工单主表列表 @@ -25,7 +24,7 @@ namespace RIZO.Service.Mes var response = Queryable() .Where(predicate.ToExpression()) - .ToPage(parm); + .ToPage(parm); return response; } @@ -36,7 +35,7 @@ namespace RIZO.Service.Mes /// /// /// - public WorkOrderInfo GetInfo(long Id) + public WorkOrder GetInfo(long Id) { var response = Queryable() .Where(x => x.Id == Id) @@ -50,7 +49,7 @@ namespace RIZO.Service.Mes /// /// /// - public WorkOrderInfo AddWorkOrder(WorkOrderInfo model) + public WorkOrder AddWorkOrder(WorkOrder model) { return Insertable(model).ExecuteReturnEntity(); } @@ -60,7 +59,7 @@ namespace RIZO.Service.Mes /// /// /// - public int UpdateWorkOrder(WorkOrderInfo model) + public int UpdateWorkOrder(WorkOrder model) { return Update(model, true); } @@ -70,9 +69,9 @@ namespace RIZO.Service.Mes /// /// /// - private static Expressionable QueryExp(WorkOrderQueryDto parm) + private static Expressionable QueryExp(WorkOrderQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create(); return predicate; } diff --git a/RIZO.Service/RIZO.Service.csproj b/RIZO.Service/RIZO.Service.csproj index 2de6da7..e9da11a 100644 --- a/RIZO.Service/RIZO.Service.csproj +++ b/RIZO.Service/RIZO.Service.csproj @@ -16,10 +16,10 @@ - + - +