RIZO/guiyang-fluorescent-line-lmes-backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工单主表

Browse Source
This commit is contained in:
quowingwang 2025-11-18 11:39:58 +08:00
parent 04d0252210
commit 39e576f292
25 changed files with 430 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RIZO.Admin.WebApi/Controllers/Mes/GatherData/ProcessParameterController.cs
View File

@ -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
{
/// <summary>
/// 生产工艺参数
@ -97,17 +97,5 @@ namespace RIZO.Admin.WebApi.Controllers.Mes
return ToResponse(_ProcessParameterService.Delete(idArr));
}
/// <summary>
/// 扫码新增工单主表/工单从表/生产工艺参数数据
/// </summary>
/// <returns></returns>
//[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);
//}
}
}

100
RIZO.Admin.WebApi/Controllers/Mes/MasterData/PlcFirstCodeController.cs Normal file
View File

@ -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
{
/// <summary>
/// PLC通讯首位码
/// </summary>
[Route("mes/PlcFirstCode")]
public class PlcFirstCodeController : BaseController
{
/// <summary>
/// PLC通讯首位码接口
/// </summary>
private readonly IPlcFirstCodeService _PlcFirstCodeService;
public PlcFirstCodeController(IPlcFirstCodeService PlcFirstCodeService)
{
_PlcFirstCodeService = PlcFirstCodeService;
}
/// <summary>
/// 查询PLC通讯首位码列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "plcfirstcode:list")]
public IActionResult QueryPlcFirstCode([FromQuery] PlcFirstCodeQueryDto parm)
{
var response = _PlcFirstCodeService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询PLC通讯首位码详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "plcfirstcode:query")]
public IActionResult GetPlcFirstCode(long Id)
{
var response = _PlcFirstCodeService.GetInfo(Id);
var info = response.Adapt<PlcFirstCodeDto>();
return SUCCESS(info);
}
/// <summary>
/// 添加PLC通讯首位码
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "plcfirstcode:add")]
[Log(Title = "PLC通讯首位码", BusinessType = BusinessType.INSERT)]
public IActionResult AddPlcFirstCode([FromBody] PlcFirstCodeDto parm)
{
var modal = parm.Adapt<PlcFirstCode>().ToCreate(HttpContext);
var response = _PlcFirstCodeService.AddPlcFirstCode(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新PLC通讯首位码
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "plcfirstcode:edit")]
[Log(Title = "PLC通讯首位码", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdatePlcFirstCode([FromBody] PlcFirstCodeDto parm)
{
var modal = parm.Adapt<PlcFirstCode>().ToUpdate(HttpContext);
var response = _PlcFirstCodeService.UpdatePlcFirstCode(modal);
return ToResponse(response);
}
/// <summary>
/// 删除PLC通讯首位码
/// </summary>
/// <returns></returns>
[HttpPost("delete/{ids}")]
[ActionPermissionFilter(Permission = "plcfirstcode:delete")]
[Log(Title = "PLC通讯首位码", BusinessType = BusinessType.DELETE)]
public IActionResult DeletePlcFirstCode([FromRoute]string ids)
{
var idArr = Tools.SplitAndConvert<long>(ids);
return ToResponse(_PlcFirstCodeService.Delete(idArr));
}
}
}

13
RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderController.cs → RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs
View File

@ -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
{
/// <summary>
/// 工单主表
@ -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<WorkOrderInfo>().ToCreate(HttpContext);
var modal = parm.Adapt<WorkOrder>().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<WorkOrderInfo>().ToUpdate(HttpContext);
var modal = parm.Adapt<WorkOrder>().ToUpdate(HttpContext);
var response = _WorkOrderService.UpdateWorkOrder(modal);
return ToResponse(response);

9
RIZO.Admin.WebApi/Controllers/Mes/WorkOrder/WorkOrderItemController.cs → RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderItemController.cs
View File

@ -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
{
/// <summary>
/// 工单从表（存储工单所需物料明细及物料流转状态）

2
RIZO.Admin.WebApi/Extensions/SwaggerExtension.cs
View File

@ -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); //->修改界面打开时自动折叠

2
RIZO.Admin.WebApi/RIZO.Admin.WebApi.csproj
View File

@ -28,7 +28,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Controllers\Mes\WorkOrder\" />
<Folder Include="Controllers\Mes\WorkOrderInfo\" />
<Folder Include="Controllers\Mes\GatherData\" />
<Folder Include="Controllers\Mes\PassWord\" />
<Folder Include="Properties\PublishProfiles\" />

13
RIZO.Model/Mes/Dto/GatherData/ProcessParameterDto.cs
View File

@ -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; }
}
}

28
RIZO.Model/Mes/Dto/MasterData/PlcFirstCodeDto.cs Normal file
View File

@ -0,0 +1,28 @@
namespace RIZO.Model.Mes.Dto.MasterData
{
/// <summary>
/// PLC通讯首位码查询对象
/// </summary>
public class PlcFirstCodeQueryDto : PagerInfo
{
}
/// <summary>
/// PLC通讯首位码输入输出对象
/// </summary>
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; }
}
}

73
RIZO.Model/Mes/Dto/WorkOrder/WorkOrderDto.cs
View File

@ -1,73 +0,0 @@
namespace RIZO.Model.Mes.Dto.WorkOrder
{
/// <summary>
/// 工单主表查询对象
/// </summary>
public class WorkOrderQueryDto : PagerInfo
{
}
/// <summary>
/// 工单主表输入输出对象
/// </summary>
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; }
}
}

58
RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs Normal file
View File

@ -0,0 +1,58 @@
namespace RIZO.Model.Mes.Dto.WorkOrderInfo
{
/// <summary>
/// 工单主表查询对象
/// </summary>
public class WorkOrderQueryDto : PagerInfo
{
}
/// <summary>
/// 工单主表输入输出对象
/// </summary>
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; }
}
}

17
RIZO.Model/Mes/Dto/WorkOrder/WorkOrderItemDto.cs → RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderItemDto.cs
View File

@ -1,5 +1,5 @@
namespace RIZO.Model.Mes.Dto.WorkOrder
namespace RIZO.Model.Mes.Dto.WorkOrderInfo
{
/// <summary>
/// 工单从表（存储工单所需物料明细及物料流转状态）查询对象
@ -13,44 +13,35 @@ namespace RIZO.Model.Mes.Dto.WorkOrder
/// </summary>
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-已完成等）")]

34
RIZO.Model/Mes/MasterData/PlcFirstCode.cs Normal file
View File

@ -0,0 +1,34 @@
namespace RIZO.Model.Mes.MasterData
{
/// <summary>
/// PLC通讯首位码
/// </summary>
[SugarTable("plc_first_code")]
public class PlcFirstCode
{
/// <summary>
/// Id
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public long Id { get; set; }
/// <summary>
/// 产线编码
/// </summary>
[SugarColumn(ColumnName = "line_code")]
public string LineCode { get; set; }
/// <summary>
/// 灵敏度等级
/// </summary>
public string Feature { get; set; }
/// <summary>
/// PLC通讯首位编码
/// </summary>
[SugarColumn(ColumnName = "plc_first_code")]
public string FirstCode { get; set; }
}
}

18
RIZO.Model/Mes/WorkOrder/WorkOrderInfo.cs → RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs
View File

@ -1,11 +1,11 @@
namespace RIZO.Model.Mes.WorkOrder
namespace RIZO.Model.Mes.WorkOrderInfo
{
/// <summary>
/// 工单主表
/// </summary>
[SugarTable("work_order")]
public class WorkOrderInfo
public class WorkOrder
{
/// <summary>
/// 主键ID
@ -19,18 +19,6 @@ namespace RIZO.Model.Mes.WorkOrder
[SugarColumn(ColumnName = "work_order_code")]
public string WorkOrderCode { get; set; }
/// <summary>
/// 工艺编码
/// </summary>
[SugarColumn(ColumnName = "process_code")]
public string ProcessCode { get; set; }
/// <summary>
/// 工艺名称
/// </summary>
[SugarColumn(ColumnName = "process_name")]
public string ProcessName { get; set; }
/// <summary>
/// 产线Code
/// </summary>
@ -47,7 +35,7 @@ namespace RIZO.Model.Mes.WorkOrder
/// 订单日期
/// </summary>
[SugarColumn(ColumnName = "order_date")]
public DateTime? OrderDate { get; set; }
public string OrderDate { get; set; }
/// <summary>
/// 产品编码

27
RIZO.Model/Mes/WorkOrder/WorkOrderItem.cs → RIZO.Model/Mes/WorkOrderInfo/WorkOrderItem.cs
View File

@ -1,5 +1,5 @@
namespace RIZO.Model.Mes.WorkOrder
namespace RIZO.Model.Mes.WorkOrderInfo
{
/// <summary>
/// 工单从表（存储工单所需物料明细及物料流转状态）
@ -31,6 +31,18 @@ namespace RIZO.Model.Mes.WorkOrder
[SugarColumn(ColumnName = "plc_code")]
public string PlcCode { get; set; }
/// <summary>
/// 工艺编码
/// </summary>
[SugarColumn(ColumnName = "process_code")]
public string ProcessCode { get; set; }
/// <summary>
/// 工艺名称
/// </summary>
[SugarColumn(ColumnName = "process_name")]
public string ProcessName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
@ -84,5 +96,18 @@ namespace RIZO.Model.Mes.WorkOrder
[SugarColumn(ColumnName = "update_time")]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 序号
/// </summary>
[SugarColumn(ColumnName = "sequcence")]
public int Sequcence { get; set; }
/// <summary>
/// 唯一标识码
/// </summary>
[SugarColumn(ColumnName = "identification_code")]
public int IdentificationCode { get; set; }
}
}

2
RIZO.Model/RIZO.Model.csproj
View File

@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Mes\Dto\WorkOrder\" />
<Folder Include="Mes\Dto\WorkOrderInfo\" />
<Folder Include="Mes\Dto\GatherData\" />
<Folder Include="Mes\Dto\PassWord\" />
<Folder Include="Mes\GatherData\" />

8
RIZO.Service/Mes/GatherData/ProcessParameterService.cs
View File

@ -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;
}
}
}

3
RIZO.Service/Mes/IMesService/GatherData/IProcessParameterService.cs
View File

@ -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);
}
}

21
RIZO.Service/Mes/IMesService/MasterData/IPlcFirstCodeService.cs Normal file
View File

@ -0,0 +1,21 @@
using RIZO.Model.Mes.Dto.MasterData;
using RIZO.Model.Mes.MasterData;
namespace RIZO.Service.Mes.IMesService.MasterData
{
/// <summary>
/// PLC通讯首位码service接口
/// </summary>
public interface IPlcFirstCodeService : IBaseService<PlcFirstCode>
{
PagedInfo<PlcFirstCodeDto> GetList(PlcFirstCodeQueryDto parm);
PlcFirstCode GetInfo(long Id);
PlcFirstCode AddPlcFirstCode(PlcFirstCode parm);
int UpdatePlcFirstCode(PlcFirstCode parm);
}
}

21
RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderService.cs
View File

@ -1,21 +0,0 @@
using RIZO.Model.Mes.Dto.WorkOrder;
using RIZO.Model.Mes.WorkOrder;
namespace RIZO.Service.Mes.IMesService.WorkOrder
{
/// <summary>
/// 工单主表service接口
/// </summary>
public interface IWorkOrderService : IBaseService<WorkOrderInfo>
{
PagedInfo<WorkOrderDto> GetList(WorkOrderQueryDto parm);
WorkOrderInfo GetInfo(long Id);
WorkOrderInfo AddWorkOrder(WorkOrderInfo parm);
int UpdateWorkOrder(WorkOrderInfo parm);
}
}

7
RIZO.Service/Mes/IMesService/WorkOrder/IWorkOrderItemService.cs → RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderItemService.cs
View File

@ -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
{
/// <summary>
/// 工单从表（存储工单所需物料明细及物料流转状态）service接口

21
RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs Normal file
View File

@ -0,0 +1,21 @@
using RIZO.Model.Mes.Dto.WorkOrderInfo;
using RIZO.Model.Mes.WorkOrderInfo;
namespace RIZO.Service.Mes.IMesService.WorkOrderInfo
{
/// <summary>
/// 工单主表service接口
/// </summary>
public interface IWorkOrderService : IBaseService<WorkOrder>
{
PagedInfo<WorkOrderDto> GetList(WorkOrderQueryDto parm);
WorkOrder GetInfo(long Id);
WorkOrder AddWorkOrder(WorkOrder parm);
int UpdateWorkOrder(WorkOrder parm);
}
}

79
RIZO.Service/Mes/MasterData/PlcFirstCodeService.cs Normal file
View File

@ -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
{
/// <summary>
/// PLC通讯首位码Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IPlcFirstCodeService), ServiceLifetime = LifeTime.Transient)]
public class PlcFirstCodeService : BaseService<PlcFirstCode>, IPlcFirstCodeService
{
/// <summary>
/// 查询PLC通讯首位码列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<PlcFirstCodeDto> GetList(PlcFirstCodeQueryDto parm)
{
var predicate = QueryExp(parm);
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<PlcFirstCode, PlcFirstCodeDto>(parm);
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public PlcFirstCode GetInfo(long Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
return response;
}
/// <summary>
/// 添加PLC通讯首位码
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public PlcFirstCode AddPlcFirstCode(PlcFirstCode model)
{
return Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改PLC通讯首位码
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdatePlcFirstCode(PlcFirstCode model)
{
return Update(model, true);
}
/// <summary>
/// 查询导出表达式
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
private static Expressionable<PlcFirstCode> QueryExp(PlcFirstCodeQueryDto parm)
{
var predicate = Expressionable.Create<PlcFirstCode>();
return predicate;
}
}
}

8
RIZO.Service/Mes/WorkOrder/WorkOrderItemService.cs → RIZO.Service/Mes/WorkOrderInfo/WorkOrderItemService.cs
View File

@ -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
{
/// <summary>
/// 工单从表（存储工单所需物料明细及物料流转状态）Service业务层处理

23
RIZO.Service/Mes/WorkOrder/WorkOrderService.cs → RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs
View File

@ -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
{
/// <summary>
/// 工单主表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWorkOrderService), ServiceLifetime = LifeTime.Transient)]
public class WorkOrderService : BaseService<WorkOrderInfo>, IWorkOrderService
public class WorkOrderService : BaseService<WorkOrder>, IWorkOrderService
{
/// <summary>
/// 查询工单主表列表
@ -25,7 +24,7 @@ namespace RIZO.Service.Mes
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WorkOrderInfo, WorkOrderDto>(parm);
.ToPage<WorkOrder, WorkOrderDto>(parm);
return response;
}
@ -36,7 +35,7 @@ namespace RIZO.Service.Mes
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
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
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WorkOrderInfo AddWorkOrder(WorkOrderInfo model)
public WorkOrder AddWorkOrder(WorkOrder model)
{
return Insertable(model).ExecuteReturnEntity();
}
@ -60,7 +59,7 @@ namespace RIZO.Service.Mes
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWorkOrder(WorkOrderInfo model)
public int UpdateWorkOrder(WorkOrder model)
{
return Update(model, true);
}
@ -70,9 +69,9 @@ namespace RIZO.Service.Mes
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
private static Expressionable<WorkOrderInfo> QueryExp(WorkOrderQueryDto parm)
private static Expressionable<WorkOrder> QueryExp(WorkOrderQueryDto parm)
{
var predicate = Expressionable.Create<WorkOrderInfo>();
var predicate = Expressionable.Create<WorkOrder>();
return predicate;
}

4
RIZO.Service/RIZO.Service.csproj
View File

@ -16,10 +16,10 @@
<ProjectReference Include="..\RIZO.ServiceCore\RIZO.ServiceCore.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Mes\IMesService\WorkOrder\" />
<Folder Include="Mes\IMesService\WorkOrderInfo\" />
<Folder Include="Mes\IMesService\GatherData\" />
<Folder Include="Mes\IMesService\PassWord\" />
<Folder Include="Mes\WorkOrder\" />
<Folder Include="Mes\WorkOrderInfo\" />
<Folder Include="Mes\GatherData\" />
<Folder Include="Mes\PassWord\" />
</ItemGroup>