From 7f780dd36e098bdfa6e765ae54563f8fcb7be122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=AD=94=E4=BB=99?= <13068499+willowhh@user.noreply.gitee.com> Date: Mon, 26 May 2025 16:25:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=95=B0=E6=8D=AE=E9=87=87?= =?UTF-8?q?=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/dc/FnproductionController.cs | 109 ++++++++++++++++++ ZR.Admin.WebApi/appsettings.production.json | 3 +- ...in.NET-机器人涂装数据采集表-0523133113.zip | Bin 0 -> 8529 bytes ZR.Model/MES/dc/Dto/FnproductionDto.cs | 48 ++++++++ ZR.Model/MES/dc/Fnproduction.cs | 95 +++++++++++++++ ZR.Service/mes/dc/FnproductionService.cs | 92 +++++++++++++++ .../mes/dc/IService/IFnproductionService.cs | 25 ++++ .../wms/WMentryWarehousing_productService.cs | 5 + 8 files changed, 376 insertions(+), 1 deletion(-) create mode 100644 ZR.Admin.WebApi/Controllers/mes/dc/FnproductionController.cs create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-机器人涂装数据采集表-0523133113.zip create mode 100644 ZR.Model/MES/dc/Dto/FnproductionDto.cs create mode 100644 ZR.Model/MES/dc/Fnproduction.cs create mode 100644 ZR.Service/mes/dc/FnproductionService.cs create mode 100644 ZR.Service/mes/dc/IService/IFnproductionService.cs 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 0000000000000000000000000000000000000000..f35180aa902bb2cf92764aba4419d18fc7802d73 GIT binary patch literal 8529 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 Le6BD5arA!xORPk} literal 0 HcmV?d00001 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();