From 8643fdb53ea2487ac5dccca3f9a01a9188334d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E6=B1=9F=E6=B5=B7?= <18360817963@163.com> Date: Fri, 21 Mar 2025 13:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/mm/line/Dto/MmLineInventoryDto.cs | 4 ++-- DOAN.Model/MES/mm/line/Dto/MmLineLocationDto.cs | 4 ++-- DOAN.Model/MES/mm/line/Dto/MmLineTransactionLogDto.cs | 4 ++-- DOAN.Model/MES/mm/line/MmLineInventory.cs | 3 ++- DOAN.Model/MES/mm/line/MmLineLocation.cs | 3 ++- DOAN.Model/MES/mm/line/MmLineTransactionLog.cs | 3 ++- DOAN.Service/MES/mm/line/MmLineInventoryService.cs | 2 +- DOAN.Service/MES/mm/line/MmLineLocationService.cs | 2 +- DOAN.Service/MES/mm/line/MmLineTransactionLogService.cs | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/DOAN.Model/MES/mm/line/Dto/MmLineInventoryDto.cs b/DOAN.Model/MES/mm/line/Dto/MmLineInventoryDto.cs index 045c254..065ad4b 100644 --- a/DOAN.Model/MES/mm/line/Dto/MmLineInventoryDto.cs +++ b/DOAN.Model/MES/mm/line/Dto/MmLineInventoryDto.cs @@ -11,7 +11,7 @@ namespace DOAN.Model.MES.mm.line.Dto public string MaterialName { get; set; } - public string Line_code { get; set; } + public string Line_Code { get; set; } } /// @@ -28,7 +28,7 @@ namespace DOAN.Model.MES.mm.line.Dto public string MaterialName { get; set; } - public string Line_code { get; set; } + public string Line_Code { get; set; } public int? Quantity { get; set; } diff --git a/DOAN.Model/MES/mm/line/Dto/MmLineLocationDto.cs b/DOAN.Model/MES/mm/line/Dto/MmLineLocationDto.cs index 65abd83..950d317 100644 --- a/DOAN.Model/MES/mm/line/Dto/MmLineLocationDto.cs +++ b/DOAN.Model/MES/mm/line/Dto/MmLineLocationDto.cs @@ -7,7 +7,7 @@ namespace DOAN.Model.MES.mm.line.Dto /// public class MmLineLocationQueryDto : PagerInfo { - public string Line_code { get; set; } + public string Line_Code { get; set; } } /// @@ -22,7 +22,7 @@ namespace DOAN.Model.MES.mm.line.Dto public string LocationCode { get; set; } - public string Line_code { get; set; } + public string Line_Code { get; set; } public string Description { get; set; } diff --git a/DOAN.Model/MES/mm/line/Dto/MmLineTransactionLogDto.cs b/DOAN.Model/MES/mm/line/Dto/MmLineTransactionLogDto.cs index 9970a53..d155f5a 100644 --- a/DOAN.Model/MES/mm/line/Dto/MmLineTransactionLogDto.cs +++ b/DOAN.Model/MES/mm/line/Dto/MmLineTransactionLogDto.cs @@ -11,7 +11,7 @@ namespace DOAN.Model.MES.mm.line.Dto public string MaterialName { get; set; } - public string Line_code { get; set; } + public string Line_Code { get; set; } public DateTime[] searchDate { get; set; } = new DateTime[2]; @@ -32,7 +32,7 @@ namespace DOAN.Model.MES.mm.line.Dto public string MaterialName { get; set; } - public string Line_code { get; set; } + public string Line_Code { get; set; } public int? Quantity { get; set; } diff --git a/DOAN.Model/MES/mm/line/MmLineInventory.cs b/DOAN.Model/MES/mm/line/MmLineInventory.cs index 2355134..5a422e4 100644 --- a/DOAN.Model/MES/mm/line/MmLineInventory.cs +++ b/DOAN.Model/MES/mm/line/MmLineInventory.cs @@ -33,7 +33,8 @@ namespace DOAN.Model.MES.mm.line /// /// 线别 /// - public string Line_code { get; set; } + [SugarColumn(ColumnName = "line_code")] + public string Line_Code { get; set; } /// /// 当前库存数量 diff --git a/DOAN.Model/MES/mm/line/MmLineLocation.cs b/DOAN.Model/MES/mm/line/MmLineLocation.cs index f69d001..5542542 100644 --- a/DOAN.Model/MES/mm/line/MmLineLocation.cs +++ b/DOAN.Model/MES/mm/line/MmLineLocation.cs @@ -27,7 +27,8 @@ namespace DOAN.Model.MES.mm.line /// /// 线别 /// - public string Line_code { get; set; } + [SugarColumn(ColumnName = "line_code")] + public string Line_Code { get; set; } /// /// 库位的描述信息 diff --git a/DOAN.Model/MES/mm/line/MmLineTransactionLog.cs b/DOAN.Model/MES/mm/line/MmLineTransactionLog.cs index 26f46fd..5cf0caa 100644 --- a/DOAN.Model/MES/mm/line/MmLineTransactionLog.cs +++ b/DOAN.Model/MES/mm/line/MmLineTransactionLog.cs @@ -33,7 +33,8 @@ namespace DOAN.Model.MES.mm.line /// /// 线别 /// - public string Line_code { get; set; } + [SugarColumn(ColumnName = "line_code")] + public string Line_Code { get; set; } /// /// 操作的数量 diff --git a/DOAN.Service/MES/mm/line/MmLineInventoryService.cs b/DOAN.Service/MES/mm/line/MmLineInventoryService.cs index e72b280..9d07fec 100644 --- a/DOAN.Service/MES/mm/line/MmLineInventoryService.cs +++ b/DOAN.Service/MES/mm/line/MmLineInventoryService.cs @@ -25,7 +25,7 @@ namespace DOAN.Service.MES.mm.line public PagedInfo GetList(MmLineInventoryQueryDto parm) { var predicate = Expressionable.Create() - .AndIF(!string.IsNullOrEmpty(parm.Line_code), o => o.Line_code == parm.Line_code) + .AndIF(!string.IsNullOrEmpty(parm.Line_Code), o => o.Line_Code == parm.Line_Code) .AndIF(!string.IsNullOrEmpty(parm.MaterialName), o => o.MaterialName.Contains(parm.MaterialName)) .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), o => o.MaterialCode.Contains(parm.MaterialCode)) ; diff --git a/DOAN.Service/MES/mm/line/MmLineLocationService.cs b/DOAN.Service/MES/mm/line/MmLineLocationService.cs index 18480a6..408fb56 100644 --- a/DOAN.Service/MES/mm/line/MmLineLocationService.cs +++ b/DOAN.Service/MES/mm/line/MmLineLocationService.cs @@ -24,7 +24,7 @@ namespace DOAN.Service.MES.mm.line /// public PagedInfo GetList(MmLineLocationQueryDto parm) { - var predicate = Expressionable.Create().AndIF(!string.IsNullOrEmpty(parm.Line_code), o => o.Line_code == parm.Line_code); + var predicate = Expressionable.Create().AndIF(!string.IsNullOrEmpty(parm.Line_Code), o => o.Line_Code == parm.Line_Code); var response = Queryable() .Where(predicate.ToExpression()) diff --git a/DOAN.Service/MES/mm/line/MmLineTransactionLogService.cs b/DOAN.Service/MES/mm/line/MmLineTransactionLogService.cs index eb79c04..8b7b491 100644 --- a/DOAN.Service/MES/mm/line/MmLineTransactionLogService.cs +++ b/DOAN.Service/MES/mm/line/MmLineTransactionLogService.cs @@ -25,7 +25,7 @@ namespace DOAN.Service.MES.mm.line public PagedInfo GetList(MmLineTransactionLogQueryDto parm) { var predicate = Expressionable.Create() - .AndIF(!string.IsNullOrEmpty(parm.Line_code), o => o.Line_code == parm.Line_code) + .AndIF(!string.IsNullOrEmpty(parm.Line_Code), o => o.Line_Code == parm.Line_Code) .AndIF(!string.IsNullOrEmpty(parm.MaterialName), o => o.MaterialName.Contains(parm.MaterialName)) .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), o => o.MaterialCode.Contains(parm.MaterialCode)) .AndIF(parm.searchDate != null && parm.searchDate[0] > DateTime.MinValue, it => it.Createtime >= parm.searchDate[0])