From ef15173349452a1507510f3a656dbed0b70e359b Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 11 Apr 2024 16:23:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=86=85=E5=AE=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcQualityStatisticsFirstController.cs | 109 ++++++++++++++ .../mes/wms/WmOutOrderController.cs | 18 +++ .../ZrAdmin.NET-质量统计-首检-0411092559.zip | Bin 0 -> 12256 bytes .../MES/qc/DTO/QcQualityStatisticsFirstDto.cs | 132 +++++++++++++++++ .../IQcQualityStatisticsFirstService.cs | 24 ++++ .../mes/qc/QcQualityStatisticsFirstService.cs | 134 ++++++++++++++++++ .../mes/wms/IService/IWmOutOrderService.cs | 2 + .../mes/wms/WmGoodsNowProductionService.cs | 8 ++ ZR.Service/mes/wms/WmOutOrderService.cs | 15 ++ 9 files changed, 442 insertions(+) create mode 100644 ZR.Admin.WebApi/Controllers/mes/qc/FQC/CRUD/QcQualityStatisticsFirstController.cs create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-质量统计-首检-0411092559.zip create mode 100644 ZR.Model/MES/qc/DTO/QcQualityStatisticsFirstDto.cs create mode 100644 ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs create mode 100644 ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CRUD/QcQualityStatisticsFirstController.cs b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CRUD/QcQualityStatisticsFirstController.cs new file mode 100644 index 00000000..3792017a --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CRUD/QcQualityStatisticsFirstController.cs @@ -0,0 +1,109 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Filters; +using ZR.Service.mes.qc.IService; +using ZR.Model.MES.qc.DTO; +using ZR.Model.MES.qc; + +//创建时间：2024-04-11 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 质量统计-首检 + /// + [Verify] + [Route("mes/qc/FQC/QcQualityStatisticsFirst")] + public class QcQualityStatisticsFirstController : BaseController + { + /// + /// 质量统计-首检接口 + /// + private readonly IQcQualityStatisticsFirstService _QcQualityStatisticsFirstService; + + public QcQualityStatisticsFirstController(IQcQualityStatisticsFirstService QcQualityStatisticsFirstService) + { + _QcQualityStatisticsFirstService = QcQualityStatisticsFirstService; + } + + /// + /// 查询质量统计-首检列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "hidepage:qcqualitystatisticsfirst:list")] + public IActionResult QueryQcQualityStatisticsFirst([FromQuery] QcQualityStatisticsFirstQueryDto parm) + { + var response = _QcQualityStatisticsFirstService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询质量统计-首检详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "hidepage:qcqualitystatisticsfirst:query")] + public IActionResult GetQcQualityStatisticsFirst(string Id) + { + var response = _QcQualityStatisticsFirstService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加质量统计-首检 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "hidepage:qcqualitystatisticsfirst:add")] + [Log(Title = "质量统计-首检", BusinessType = BusinessType.INSERT)] + public IActionResult AddQcQualityStatisticsFirst([FromBody] QcQualityStatisticsFirstDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _QcQualityStatisticsFirstService.AddQcQualityStatisticsFirst(modal); + + return SUCCESS(response); + } + + /// + /// 更新质量统计-首检 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "hidepage:qcqualitystatisticsfirst:edit")] + [Log(Title = "质量统计-首检", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateQcQualityStatisticsFirst([FromBody] QcQualityStatisticsFirstDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _QcQualityStatisticsFirstService.UpdateQcQualityStatisticsFirst(modal); + + return ToResponse(response); + } + + /// + /// 删除质量统计-首检 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "hidepage:qcqualitystatisticsfirst:delete")] + [Log(Title = "质量统计-首检", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteQcQualityStatisticsFirst(string ids) + { + long[] idsArr = Tools.SpitLongArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + var response = _QcQualityStatisticsFirstService.Delete(idsArr); + + return ToResponse(response); + } + + + + + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs index ac4e68f0..3bac6e71 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs @@ -169,6 +169,24 @@ namespace ZR.Admin.WebApi.Controllers return SUCCESS(WmOutOrderPlanList); } + /// + /// 持久化存储出货单的出货计划 + /// + /// + /// + [HttpGet("persistenceOutorderplan")] + public IActionResult PersistenceOutorderplan(string shipment_num) + { + if (shipment_num == null) + { + return SUCCESS(null); + } + int result= _WmOutOrderService.PersistenceOutorderplan(shipment_num); + + return SUCCESS(result); + + } + /// /// 5 成品出库 /// diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-质量统计-首检-0411092559.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-质量统计-首检-0411092559.zip new file mode 100644 index 0000000000000000000000000000000000000000..f87013e6a568d1f6f822cddbd7bf82bef34e0f3f GIT binary patch literal 12256 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 literal 0 HcmV?d00001 diff --git a/ZR.Model/MES/qc/DTO/QcQualityStatisticsFirstDto.cs b/ZR.Model/MES/qc/DTO/QcQualityStatisticsFirstDto.cs new file mode 100644 index 00000000..bc3e621d --- /dev/null +++ b/ZR.Model/MES/qc/DTO/QcQualityStatisticsFirstDto.cs @@ -0,0 +1,132 @@ +using System.ComponentModel.DataAnnotations; + +namespace ZR.Model.MES.qc.DTO +{ + /// + /// 质量统计-首检输入输出对象 + /// + public class QcQualityStatisticsFirstDto + { + [Required(ErrorMessage = "id不能为空")] + public string Id { get; set; } + + public string WorkorderId { get; set; } + + public string FinishedPartNumber { get; set; } + + public string ProductDescription { get; set; } + + public string Color { get; set; } + + public int? RequireNumber { get; set; } + + public string Team { get; set; } + + public int? QualifiedNumber { get; set; } + + public decimal QualifiedRate { get; set; } + + public int? PaoguangTotal { get; set; } + + public int? DamoTotal { get; set; } + + public int? BaofeiTotal { get; set; } + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + + public string Remark { get; set; } + + public int? PaintSuokong { get; set; } + + public int? PaintZhengkong { get; set; } + + public int? PaintShiguang { get; set; } + + public int? PaintSecha { get; set; } + + public int? PaintDianzi { get; set; } + + public int? PaintOther { get; set; } + + public int? DeviceShuiban { get; set; } + + public int? DeviceZandian { get; set; } + + public int? DeviceBianxing { get; set; } + + public int? DeviceYouzhu { get; set; } + + public int? DeviceTuoluo { get; set; } + + public int? DeviceZhuangshang { get; set; } + + public int? DeviceOther { get; set; } + + public int? BlankMaoci { get; set; } + + public int? BlankSuoyin { get; set; } + + public int? BlankCanshuang { get; set; } + + public int? BlankShaying { get; set; } + + public int? BlankZangdian { get; set; } + + public int? BlankDamo { get; set; } + + public int? ProgramLiuguang { get; set; } + + public int? ProgramSeqiqueqi { get; set; } + + public int? ProgramQingqiqueqi { get; set; } + + public int? ProgramJupi { get; set; } + + public int? ProgramOther { get; set; } + + public int? TeamTuoluocanshuang { get; set; } + + public int? TeamQingqiqikuai { get; set; } + + public int? TeamSeqiqikuai { get; set; } + + public int? TeamFahua { get; set; } + + public int? TeamLiangbang { get; set; } + + public int? TeamPenglou { get; set; } + + public DateTime? UpdatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string CreatedBy { get; set; } + + public int? Remark2 { get; set; } + + + + } + /// + /// 质量统计-首检查询对象 + /// + public class QcQualityStatisticsFirstQueryDto : PagerInfo + { + public string WorkorderId { get; set; } + + public string FinishedPartNumber { get; set; } + + public string ProductDescription { get; set; } + + public string Team { get; set; } + + public DateTime starttime { get; set; } + public DateTime endtime { get; set; } + } + + +} \ No newline at end of file diff --git a/ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs b/ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs new file mode 100644 index 00000000..c7a71c4f --- /dev/null +++ b/ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs @@ -0,0 +1,24 @@ +using System; +using ZR.Model; +using ZR.Model.Dto; +using System.Collections.Generic; +using ZR.Model.MES.qc; +using ZR.Model.MES.qc.DTO; + +namespace ZR.Service.mes.qc.IService +{ + /// + /// 质量统计-首检service接口 + /// + public interface IQcQualityStatisticsFirstService : IBaseService + { + PagedInfo GetList(QcQualityStatisticsFirstQueryDto parm); + + QcQualityStatisticsFirst GetInfo(string Id); + + QcQualityStatisticsFirst AddQcQualityStatisticsFirst(QcQualityStatisticsFirst parm); + + int UpdateQcQualityStatisticsFirst(QcQualityStatisticsFirst parm); + + } +} diff --git a/ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs b/ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs new file mode 100644 index 00000000..c1fc9914 --- /dev/null +++ b/ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs @@ -0,0 +1,134 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; + +using ZR.Repository; +using System.Linq; +using ZR.Service.mes.qc.IService; +using ZR.Model.MES.qc; +using ZR.Model.MES.qc.DTO; +using ZR.Model; + +namespace ZR.Service.mes.qc +{ + /// + /// 质量统计-首检Service业务层处理 + /// + [AppService(ServiceType = typeof(IQcQualityStatisticsFirstService), ServiceLifetime = LifeTime.Transient)] + public class QcQualityStatisticsFirstService : BaseService, IQcQualityStatisticsFirstService + { + /// + /// 查询质量统计-首检列表 + /// + /// + /// + public PagedInfo GetList(QcQualityStatisticsFirstQueryDto parm) + { + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.WorkorderId), it => it.WorkorderId == parm.WorkorderId) + .AndIF(!string.IsNullOrEmpty(parm.FinishedPartNumber), it => it.FinishedPartNumber == parm.FinishedPartNumber) + .AndIF(!string.IsNullOrEmpty(parm.ProductDescription), it => it.ProductDescription.Contains(parm.ProductDescription)) + .AndIF(!string.IsNullOrEmpty(parm.Team), it => it.Team == parm.Team) + .AndIF(parm.starttime> new DateTime(2000, 1, 1), it => it.CreatedTime>=parm.starttime) + .AndIF(parm.endtime> new DateTime(2000, 1, 1), it => it.CreatedTime<=parm.endtime) + ; + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public QcQualityStatisticsFirst GetInfo(string Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加质量统计-首检 + /// + /// + /// + public QcQualityStatisticsFirst AddQcQualityStatisticsFirst(QcQualityStatisticsFirst model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改质量统计-首检 + /// + /// + /// + public int UpdateQcQualityStatisticsFirst(QcQualityStatisticsFirst model) + { + return Update(model, true); + //var response = Update(w => w.Id == model.Id, it => new QcQualityStatisticsFirst() + //{ + // FinishedPartNumber = model.FinishedPartNumber, + // ProductDescription = model.ProductDescription, + // Color = model.Color, + // RequireNumber = model.RequireNumber, + // Team = model.Team, + // QualifiedNumber = model.QualifiedNumber, + // QualifiedRate = model.QualifiedRate, + // PaoguangTotal = model.PaoguangTotal, + // DamoTotal = model.DamoTotal, + // BaofeiTotal = model.BaofeiTotal, + // StartTime = model.StartTime, + // EndTime = model.EndTime, + // Remark = model.Remark, + // PaintSuokong = model.PaintSuokong, + // PaintZhengkong = model.PaintZhengkong, + // PaintShiguang = model.PaintShiguang, + // PaintSecha = model.PaintSecha, + // PaintDianzi = model.PaintDianzi, + // PaintOther = model.PaintOther, + // DeviceShuiban = model.DeviceShuiban, + // DeviceZandian = model.DeviceZandian, + // DeviceBianxing = model.DeviceBianxing, + // DeviceYouzhu = model.DeviceYouzhu, + // DeviceTuoluo = model.DeviceTuoluo, + // DeviceZhuangshang = model.DeviceZhuangshang, + // DeviceOther = model.DeviceOther, + // BlankMaoci = model.BlankMaoci, + // BlankSuoyin = model.BlankSuoyin, + // BlankCanshuang = model.BlankCanshuang, + // BlankShaying = model.BlankShaying, + // BlankZangdian = model.BlankZangdian, + // BlankDamo = model.BlankDamo, + // ProgramLiuguang = model.ProgramLiuguang, + // ProgramSeqiqueqi = model.ProgramSeqiqueqi, + // ProgramQingqiqueqi = model.ProgramQingqiqueqi, + // ProgramJupi = model.ProgramJupi, + // ProgramOther = model.ProgramOther, + // TeamTuoluocanshuang = model.TeamTuoluocanshuang, + // TeamQingqiqikuai = model.TeamQingqiqikuai, + // TeamSeqiqikuai = model.TeamSeqiqikuai, + // TeamFahua = model.TeamFahua, + // TeamLiangbang = model.TeamLiangbang, + // TeamPenglou = model.TeamPenglou, + // UpdatedTime = model.UpdatedTime, + // UpdatedBy = model.UpdatedBy, + // CreatedTime = model.CreatedTime, + // CreatedBy = model.CreatedBy, + // Remark2 = model.Remark2, + //}); + //return response; + + } + + + } +} \ No newline at end of file diff --git a/ZR.Service/mes/wms/IService/IWmOutOrderService.cs b/ZR.Service/mes/wms/IService/IWmOutOrderService.cs index a1dd5e81..d1de2339 100644 --- a/ZR.Service/mes/wms/IService/IWmOutOrderService.cs +++ b/ZR.Service/mes/wms/IService/IWmOutOrderService.cs @@ -32,6 +32,8 @@ namespace ZR.Service.mes.wms.IService List Generate_outorderplan(string shipment_num); + int PersistenceOutorderplan(string shipment_num); + (int, int) DoMaterialOut(WmDoMaterialOut_Dto doMaterialOut, string Createby); diff --git a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs index c3206711..0475eb0f 100644 --- a/ZR.Service/mes/wms/WmGoodsNowProductionService.cs +++ b/ZR.Service/mes/wms/WmGoodsNowProductionService.cs @@ -196,6 +196,14 @@ namespace ZR.Service.mes.wms { model.Id = SnowFlakeSingle.Instance.NextId().ToString();//也可以在程序中直接获取ID } + if(string.IsNullOrEmpty(model.PackageCode)) + { + model.PackageCode=model.PackageCodeClient; + } + if (string.IsNullOrEmpty(model.PackageCodeOriginal)) + { + model.PackageCodeOriginal = model.PackageCodeClient; + } return Context.Insertable(model).ExecuteReturnEntity(); } diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs index d00ac87f..42596e73 100644 --- a/ZR.Service/mes/wms/WmOutOrderService.cs +++ b/ZR.Service/mes/wms/WmOutOrderService.cs @@ -567,5 +567,20 @@ namespace ZR.Service.mes.wms } } + + + /// + /// 持久化存储 + /// + /// + /// + /// + public int PersistenceOutorderplan(string shipment_num) + { + throw new NotImplementedException(); + } + + + } } \ No newline at end of file