From 7ba84f96cdc20c9742f46df44df9c795818b26d0 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 24 Nov 2023 20:40:45 +0800 Subject: [PATCH] =?UTF-8?q?IQC=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcRoughController.cs} | 6 +- .../mes/wm/MaterialReturnController.cs | 46 +++++++++++ ZR.Model/MES/{qu => qc}/QuRough.cs | 48 ++++++----- ZR.Model/MES/wm/WmMaterialreturn.cs | 81 +++++++++++++++++++ ZR.Model/ZR.Model.csproj | 2 +- .../IService/IQcRoughService.cs} | 2 +- .../QcRoughService.cs} | 4 +- .../mes/wm/IService/IMaterialreturnService.cs | 15 ++++ .../mes/wm/MaterialRequisitionService.cs | 6 +- ZR.Service/mes/wm/MaterialreturnService.cs | 35 ++++++++ 10 files changed, 212 insertions(+), 33 deletions(-) rename ZR.Admin.WebApi/Controllers/mes/{qu/QuRoughController.cs => qc/QcRoughController.cs} (87%) create mode 100644 ZR.Admin.WebApi/Controllers/mes/wm/MaterialReturnController.cs rename ZR.Model/MES/{qu => qc}/QuRough.cs (69%) create mode 100644 ZR.Model/MES/wm/WmMaterialreturn.cs rename ZR.Service/mes/{qu/IService/IQuRoughService.cs => qc/IService/IQcRoughService.cs} (90%) rename ZR.Service/mes/{qu/QuRoughService.cs => qc/QcRoughService.cs} (90%) create mode 100644 ZR.Service/mes/wm/IService/IMaterialreturnService.cs create mode 100644 ZR.Service/mes/wm/MaterialreturnService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/qu/QuRoughController.cs b/ZR.Admin.WebApi/Controllers/mes/qc/QcRoughController.cs similarity index 87% rename from ZR.Admin.WebApi/Controllers/mes/qu/QuRoughController.cs rename to ZR.Admin.WebApi/Controllers/mes/qc/QcRoughController.cs index b4e6cc7f..efc11583 100644 --- a/ZR.Admin.WebApi/Controllers/mes/qu/QuRoughController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/qc/QcRoughController.cs @@ -14,11 +14,11 @@ using ZR.Service.mes.qu.IService; namespace ZR.Admin.WebApi.Controllers.mes.qu { [Route("mes/qu/rough")] - public class QuRoughController : BaseController + public class QcRoughController : BaseController { - private readonly IQuRoughService quRoughService; + private readonly IQcRoughService quRoughService; - public QuRoughController(IQuRoughService quRoughService) + public QcRoughController(IQcRoughService quRoughService) { this.quRoughService = quRoughService; } diff --git a/ZR.Admin.WebApi/Controllers/mes/wm/MaterialReturnController.cs b/ZR.Admin.WebApi/Controllers/mes/wm/MaterialReturnController.cs new file mode 100644 index 00000000..f3581fd7 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wm/MaterialReturnController.cs @@ -0,0 +1,46 @@ +using Infrastructure.Extensions; +using JinianNet.JNTemplate; +using Microsoft.AspNetCore.Mvc; +using Microsoft.IdentityModel.Tokens; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System.Text.Json; +using ZR.Admin.WebApi.Controllers; +using ZR.Admin.WebApi.Extensions; +using ZR.Model.MES.wm; +using ZR.Service.mes.pro; +using ZR.Service.mes.wm; +using ZR.Service.mes.wm.IService; + + +[Route("mes/wm/return")] +public class MaterialReturnController : BaseController +{ + private readonly IMaterialreturnService materialreturn; + + public MaterialReturnController(IMaterialreturnService materialreturn) + { + this.materialreturn = materialreturn; + } + + /// + /// 查询领料单 + /// + /// + /// + /// + /// + /// + /// + [HttpGet("getmaterialreturn")] + public IActionResult Getmaterialreturn(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1) + { + + (List, int) data = materialreturn.Getmaterialreturn(pageNum, pageSize, year, week, date); + + return ToResponse(new ApiResult(200, "success", data)); + } + +} + + diff --git a/ZR.Model/MES/qu/QuRough.cs b/ZR.Model/MES/qc/QuRough.cs similarity index 69% rename from ZR.Model/MES/qu/QuRough.cs rename to ZR.Model/MES/qc/QuRough.cs index 6c59d826..e52c910d 100644 --- a/ZR.Model/MES/qu/QuRough.cs +++ b/ZR.Model/MES/qc/QuRough.cs @@ -6,61 +6,63 @@ using System.Threading.Tasks; namespace ZR.Model.MES.qu { + /// /// 毛坯统计表 /// - [SugarTable("qu_rough")] - public class QuRough + [SugarTable("qc_rough")] + public class QcRough { /// /// 流水号 /// [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] public string Id { get; set; } - /// - /// 生产工单id + /// 领料单id /// - [SugarColumn(ColumnName = "fk_pro_order_id")] - public string FkProOrderId { get; set; } - + [SugarColumn(ColumnName = "fk_materialRequisition_id")] + public string FkMaterialrequisitionId { get; set; } /// - /// 需要数量 + /// 应到数量 /// [SugarColumn(ColumnName = "require_num")] public int? RequireNum { get; set; } - /// - /// 实际数量 + /// 实际到达数量 /// [SugarColumn(ColumnName = "actual_number")] public int? ActualNumber { get; set; } - /// - /// 合格数 + /// 抽检比例% + /// + [SugarColumn(ColumnName = "randomRate")] + public int? RandomRate { get; set; } + /// + /// 合格数 /// [SugarColumn(ColumnName = "oks")] public int? Oks { get; set; } - /// - /// 不合格数 + /// 不合格数 /// [SugarColumn(ColumnName = "ngs")] - public string Ngs { get; set; } - + public int? Ngs { get; set; } /// /// 合格率 /// [SugarColumn(ColumnName = "oks_ratio")] - public string OksRatio { get; set; } - - + public decimal? OksRatio { get; set; } /// - /// 是否上料 + /// 是否可以上料 /// [SugarColumn(ColumnName = "isFeeding")] - public int IsFeeding { get; set; } - + public string IsFeeding { get; set; } + /// + /// 乐观锁 + /// + [SugarColumn(ColumnName = "REVISION")] + public int? Revision { get; set; } /// /// 创建人 /// @@ -82,4 +84,6 @@ namespace ZR.Model.MES.qu [SugarColumn(ColumnName = "UPDATED_TIME")] public DateTime? UpdatedTime { get; set; } } + + } diff --git a/ZR.Model/MES/wm/WmMaterialreturn.cs b/ZR.Model/MES/wm/WmMaterialreturn.cs new file mode 100644 index 00000000..d4604fd7 --- /dev/null +++ b/ZR.Model/MES/wm/WmMaterialreturn.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Model.MES.wm +{ + /// + /// 生产退料 + /// + [SugarTable("wm_materialreturn")] + public class WmMaterialreturn + { + /// + /// 流水号 + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] + public string Id { get; set; } + /// + /// 领料单id + /// + [SugarColumn(ColumnName = "fk_mrqr_id")] + public string FkMrqrId { get; set; } + /// + /// 年 + /// + [SugarColumn(ColumnName = "year")] + public int? Year { get; set; } + /// + /// 周 + /// + [SugarColumn(ColumnName = "week")] + public int? Week { get; set; } + /// + /// 日 + /// + [SugarColumn(ColumnName = "date")] + public int? Date { get; set; } + /// + /// 毛坯零件号 + /// + [SugarColumn(ColumnName = "workblankpartnumber")] + public string Workblankpartnumber { get; set; } + /// + /// 退料数量 + /// + [SugarColumn(ColumnName = "requirenum")] + public int? Requirenum { get; set; } + /// + /// 租户号 + /// + [SugarColumn(ColumnName = "TENANT_ID")] + public string TenantId { get; set; } + /// + /// 乐观锁 + /// + [SugarColumn(ColumnName = "REVISION")] + public int? Revision { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime? CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "UPDATED_BY")] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "UPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/ZR.Model.csproj b/ZR.Model/ZR.Model.csproj index 318b0d47..d1315fb2 100644 --- a/ZR.Model/ZR.Model.csproj +++ b/ZR.Model/ZR.Model.csproj @@ -26,6 +26,6 @@ - + diff --git a/ZR.Service/mes/qu/IService/IQuRoughService.cs b/ZR.Service/mes/qc/IService/IQcRoughService.cs similarity index 90% rename from ZR.Service/mes/qu/IService/IQuRoughService.cs rename to ZR.Service/mes/qc/IService/IQcRoughService.cs index 1a208121..2a2f11a4 100644 --- a/ZR.Service/mes/qu/IService/IQuRoughService.cs +++ b/ZR.Service/mes/qc/IService/IQcRoughService.cs @@ -9,7 +9,7 @@ using ZR.Model.MES.qu; namespace ZR.Service.mes.qu.IService { - public interface IQuRoughService + public interface IQcRoughService { public (List, int) GetWorkorderList(int pageNum, int pageSize, int year, int week, int date, int isSchedule); } diff --git a/ZR.Service/mes/qu/QuRoughService.cs b/ZR.Service/mes/qc/QcRoughService.cs similarity index 90% rename from ZR.Service/mes/qu/QuRoughService.cs rename to ZR.Service/mes/qc/QcRoughService.cs index 92322482..fc6f9297 100644 --- a/ZR.Service/mes/qu/QuRoughService.cs +++ b/ZR.Service/mes/qc/QcRoughService.cs @@ -14,8 +14,8 @@ using ZR.Service.mes.qu.IService; namespace ZR.Service.mes.qu { - [AppService(ServiceType = typeof(IQuRoughService), ServiceLifetime = LifeTime.Transient)] - public class QuRoughService : BaseService, IQuRoughService + [AppService(ServiceType = typeof(IQcRoughService), ServiceLifetime = LifeTime.Transient)] + public class QcRoughService : BaseService, IQcRoughService { public (List, int) GetWorkorderList(int pageNum, int pageSize, int year, int week, int date, int isSchedule) diff --git a/ZR.Service/mes/wm/IService/IMaterialreturnService.cs b/ZR.Service/mes/wm/IService/IMaterialreturnService.cs new file mode 100644 index 00000000..5b606dbd --- /dev/null +++ b/ZR.Service/mes/wm/IService/IMaterialreturnService.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.MES.wm; + +namespace ZR.Service.mes.wm.IService +{ + public interface IMaterialreturnService + { + + public (List, int) Getmaterialreturn(int pageNum, int pageSize, int year, int week, int date); + } +} diff --git a/ZR.Service/mes/wm/MaterialRequisitionService.cs b/ZR.Service/mes/wm/MaterialRequisitionService.cs index 9f369c2b..927f810b 100644 --- a/ZR.Service/mes/wm/MaterialRequisitionService.cs +++ b/ZR.Service/mes/wm/MaterialRequisitionService.cs @@ -17,11 +17,9 @@ namespace ZR.Service.mes.wm [AppService(ServiceType = typeof(IMaterialRequisitionService), ServiceLifetime = LifeTime.Transient)] - public class MaterialRequisitionService : BaseService, IMaterialRequisitionService + public class MaterialRequisitionService : BaseService, IMaterialRequisitionService { - public MaterialRequisitionService() { - - } + public (List, int) GetmaterialsRequisition(int pageNum, int pageSize, int year, int week, int date) { diff --git a/ZR.Service/mes/wm/MaterialreturnService.cs b/ZR.Service/mes/wm/MaterialreturnService.cs new file mode 100644 index 00000000..e65e651f --- /dev/null +++ b/ZR.Service/mes/wm/MaterialreturnService.cs @@ -0,0 +1,35 @@ +using Infrastructure.Attribute; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.MES.qu; +using ZR.Model.MES.wm; +using ZR.Service.mes.wm.IService; + +namespace ZR.Service.mes.wm +{ + + + [AppService(ServiceType = typeof(IMaterialreturnService), ServiceLifetime = LifeTime.Transient)] + public class MaterialreturnService : BaseService, IMaterialreturnService + { + public (List, int) Getmaterialreturn(int pageNum, int pageSize, int year, int week, int date) + { + var predicate = Expressionable.Create() + .AndIF(year > 0, it => it.Year == year) + .AndIF(week > 0, it => it.Week == week) + .AndIF(date > 0, it => it.Date == date) + .ToExpression(); + + int totalCount = 0; + + List materialreturnsList = Context.Queryable().Where(predicate).OrderBy(it => it.Id).ToPageList(pageNum, pageSize, ref totalCount); + + return (materialreturnsList, totalCount); + } + } +}