diff --git a/ZR.Admin.WebApi/Controllers/mes/dc/FnproductionController.cs b/ZR.Admin.WebApi/Controllers/mes/dc/FnproductionController.cs new file mode 100644 index 00000000..3915f2dc --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/dc/FnproductionController.cs @@ -0,0 +1,109 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Filters; +using ZR.Model.dc; +using ZR.Model.MES.dc.Dto; +using ZR.Service.Business.IBusinessService; + +//创建时间：2025-05-23 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 机器人涂装数据采集表 + /// + [Verify] + [Route("business/Fnproduction")] + public class FnproductionController : BaseController + { + /// + /// 机器人涂装数据采集表接口 + /// + private readonly IFnproductionService _FnproductionService; + + public FnproductionController(IFnproductionService FnproductionService) + { + _FnproductionService = FnproductionService; + } + + /// + /// 查询机器人涂装数据采集表列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "business:fnproduction:list")] + public IActionResult QueryFnproduction([FromQuery] FnproductionQueryDto parm) + { + var response = _FnproductionService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询机器人涂装数据采集表详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "business:fnproduction:query")] + public IActionResult GetFnproduction(int Id) + { + var response = _FnproductionService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加机器人涂装数据采集表 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "business:fnproduction:add")] + [Log(Title = "机器人涂装数据采集表", BusinessType = BusinessType.INSERT)] + public IActionResult AddFnproduction([FromBody] FnproductionDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _FnproductionService.AddFnproduction(modal); + + return SUCCESS(response); + } + + /// + /// 更新机器人涂装数据采集表 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "business:fnproduction:edit")] + [Log(Title = "机器人涂装数据采集表", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateFnproduction([FromBody] FnproductionDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _FnproductionService.UpdateFnproduction(modal); + + return ToResponse(response); + } + + /// + /// 删除机器人涂装数据采集表 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "business:fnproduction:delete")] + [Log(Title = "机器人涂装数据采集表", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteFnproduction(string ids) + { + int[] idsArr = Tools.SpitIntArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + var response = _FnproductionService.Delete(idsArr); + + return ToResponse(response); + } + + + + + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/appsettings.production.json b/ZR.Admin.WebApi/appsettings.production.json index 4d394642..1ed63606 100644 --- a/ZR.Admin.WebApi/appsettings.production.json +++ b/ZR.Admin.WebApi/appsettings.production.json @@ -11,7 +11,8 @@ { //"Conn": "Data Source=147.116.122.230;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", - "Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + //"Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=shgx_injection_mes_db;Port=3308", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-机器人涂装数据采集表-0523133113.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-机器人涂装数据采集表-0523133113.zip new file mode 100644 index 00000000..f35180aa Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-机器人涂装数据采集表-0523133113.zip differ diff --git a/ZR.Model/MES/dc/Dto/FnproductionDto.cs b/ZR.Model/MES/dc/Dto/FnproductionDto.cs new file mode 100644 index 00000000..cfb86831 --- /dev/null +++ b/ZR.Model/MES/dc/Dto/FnproductionDto.cs @@ -0,0 +1,48 @@ +using System.ComponentModel.DataAnnotations; + +namespace ZR.Model.MES.dc.Dto +{ + /// + /// 机器人涂装数据采集表查询对象 + /// + public class FnproductionQueryDto : PagerInfo + { + } + + /// + /// 机器人涂装数据采集表输入输出对象 + /// + public class FnproductionDto + { + public string DateTimeSt { get; set; } + + public string DateTimeEnd { get; set; } + + public string PlcStyle { get; set; } + + public string PlcColor { get; set; } + + public string PlcVar { get; set; } + + public int? PlcStartphoncount { get; set; } + + public int? PlcStartlsshiftcount { get; set; } + + public string RobotNo { get; set; } + + public string RobotProNo { get; set; } + + public string RobotCcv { get; set; } + + public string RobotVar { get; set; } + + public int? RobotFlux { get; set; } + + public string RobotBrushNo { get; set; } + + public string EndStatus { get; set; } + + + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/dc/Fnproduction.cs b/ZR.Model/MES/dc/Fnproduction.cs new file mode 100644 index 00000000..56af3061 --- /dev/null +++ b/ZR.Model/MES/dc/Fnproduction.cs @@ -0,0 +1,95 @@ + +namespace ZR.Model.dc +{ + /// + /// 机器人涂装数据采集表 + /// + [SugarTable("fnproduction")] + public class Fnproduction + { + /// + /// DateTimeSt + /// + [SugarColumn(ColumnName = "date_time_st")] + public string DateTimeSt { get; set; } + + /// + /// DateTimeEnd + /// + [SugarColumn(ColumnName = "date_time_end")] + public string DateTimeEnd { get; set; } + + /// + /// PlcStyle + /// + [SugarColumn(ColumnName = "plc_style")] + public string PlcStyle { get; set; } + + /// + /// PlcColor + /// + [SugarColumn(ColumnName = "plc_color")] + public string PlcColor { get; set; } + + /// + /// PlcVar + /// + [SugarColumn(ColumnName = "plc_var")] + public string PlcVar { get; set; } + + /// + /// PlcStartphoncount + /// + [SugarColumn(ColumnName = "plc_startPHoncount")] + public int? PlcStartphoncount { get; set; } + + /// + /// PlcStartlsshiftcount + /// + [SugarColumn(ColumnName = "plc_startLSshiftcount")] + public int? PlcStartlsshiftcount { get; set; } + + /// + /// RobotNo + /// + [SugarColumn(ColumnName = "robot_no")] + public string RobotNo { get; set; } + + /// + /// RobotProNo + /// + [SugarColumn(ColumnName = "robot_pro_no")] + public string RobotProNo { get; set; } + + /// + /// RobotCcv + /// + [SugarColumn(ColumnName = "robot_ccv")] + public string RobotCcv { get; set; } + + /// + /// RobotVar + /// + [SugarColumn(ColumnName = "robot_var")] + public string RobotVar { get; set; } + + /// + /// RobotFlux + /// + [SugarColumn(ColumnName = "robot_flux")] + public int? RobotFlux { get; set; } + + /// + /// RobotBrushNo + /// + [SugarColumn(ColumnName = "robot_brush_no")] + public string RobotBrushNo { get; set; } + + /// + /// EndStatus + /// + [SugarColumn(ColumnName = "end_status")] + public string EndStatus { get; set; } + + } +} \ No newline at end of file diff --git a/ZR.Service/mes/dc/FnproductionService.cs b/ZR.Service/mes/dc/FnproductionService.cs new file mode 100644 index 00000000..c176ca49 --- /dev/null +++ b/ZR.Service/mes/dc/FnproductionService.cs @@ -0,0 +1,92 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using ZR.Model; +using ZR.Model.Dto; +using ZR.Model.Business; +using ZR.Repository; +using ZR.Service.Business.IBusinessService; +using System.Linq; +using ZR.Model.dc; +using ZR.Model.MES.dc.Dto; + +namespace ZR.Service.Business +{ + /// + /// 机器人涂装数据采集表Service业务层处理 + /// + [AppService(ServiceType = typeof(IFnproductionService), ServiceLifetime = LifeTime.Transient)] + public class FnproductionService : BaseService, IFnproductionService + { + /// + /// 查询机器人涂装数据采集表列表 + /// + /// + /// + public PagedInfo GetList(FnproductionQueryDto parm) + { + var predicate = Expressionable.Create(); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public Fnproduction GetInfo(int Id) + { + var response = Queryable() + //.Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加机器人涂装数据采集表 + /// + /// + /// + public Fnproduction AddFnproduction(Fnproduction model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改机器人涂装数据采集表 + /// + /// + /// + public int UpdateFnproduction(Fnproduction model) + { + //var response = Update(w => w.Id == model.Id, it => new Fnproduction() + //{ + // DateTimeSt = model.DateTimeSt, + // DateTimeEnd = model.DateTimeEnd, + // PlcStyle = model.PlcStyle, + // PlcColor = model.PlcColor, + // PlcVar = model.PlcVar, + // PlcStartphoncount = model.PlcStartphoncount, + // PlcStartlsshiftcount = model.PlcStartlsshiftcount, + // RobotNo = model.RobotNo, + // RobotProNo = model.RobotProNo, + // RobotCcv = model.RobotCcv, + // RobotVar = model.RobotVar, + // RobotFlux = model.RobotFlux, + // RobotBrushNo = model.RobotBrushNo, + // EndStatus = model.EndStatus, + //}); + //return response; + return Update(model, true); + } + + } +} \ No newline at end of file diff --git a/ZR.Service/mes/dc/IService/IFnproductionService.cs b/ZR.Service/mes/dc/IService/IFnproductionService.cs new file mode 100644 index 00000000..8a874765 --- /dev/null +++ b/ZR.Service/mes/dc/IService/IFnproductionService.cs @@ -0,0 +1,25 @@ +using System; +using ZR.Model; +using ZR.Model.Dto; +using ZR.Model.Business; +using System.Collections.Generic; +using ZR.Model.MES.dc.Dto; +using ZR.Model.dc; + +namespace ZR.Service.Business.IBusinessService +{ + /// + /// 机器人涂装数据采集表service接口 + /// + public interface IFnproductionService : IBaseService + { + PagedInfo GetList(FnproductionQueryDto parm); + + Fnproduction GetInfo(int Id); + + Fnproduction AddFnproduction(Fnproduction parm); + + int UpdateFnproduction(Fnproduction parm); + + } +} diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs index 5453d7f7..e0d1c1f7 100644 --- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs +++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Security.Cryptography; using System.Text.RegularExpressions; using Infrastructure.Attribute; using SqlSugar; @@ -158,6 +159,10 @@ namespace ZR.Service.mes.wms CreatedTime = DateTime.Now, }; int recordNum = Context.Insertable(record).ExecuteCommand(); + + Context.Ado.UseTran(() =>{ + Context.Insertable(record).ExecuteCommand(); + }); if (recordNum == 0) { Context.Ado.RollbackTran();