From 6f2b846473954a32f37c1d230a374ffe3cd61265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Fri, 24 May 2024 10:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B8=85=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0Type=201-=E6=88=90=E5=93=81=202-=E6=AF=9B=E5=9D=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/ImportTemplate/物料清单模版.xlsx | Bin 9637 -> 9642 bytes ZR.Model/MES/wms/Dto/WmMaterialDto.cs | 3 +++ ZR.Model/MES/wms/WmMaterial.cs | 8 +++++++- ZR.Service/mes/wms/WmBlankInventoryService.cs | 4 ++-- ZR.Service/mes/wms/WmMaterialService.cs | 3 ++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/物料清单模版.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/物料清单模版.xlsx index a5e7578269b1636fc2c7f8860269dd6c0bfcd64b..f794251341abc583859f26c34ee9634073680bc9 100644 GIT binary patch literal 9642 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 literal 9637 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 [SugarColumn(ColumnName="search2" )] public string Search2 { get; set; } + + /// + /// 类别(1-成品 2-毛坯) + /// + [SugarColumn(ColumnName = "type")] + public int? Type { get; set; } /// /// 状态(0-不可见 1-可见) /// - [SugarColumn(ColumnName="status" )] + [SugarColumn(ColumnName="status" )] public int? Status { get; set; } /// /// 创建人 diff --git a/ZR.Service/mes/wms/WmBlankInventoryService.cs b/ZR.Service/mes/wms/WmBlankInventoryService.cs index 71f13c48..b1d6b332 100644 --- a/ZR.Service/mes/wms/WmBlankInventoryService.cs +++ b/ZR.Service/mes/wms/WmBlankInventoryService.cs @@ -42,7 +42,7 @@ namespace ZR.Service.mes.wms { WmMaterial material = Context.Queryable() .Where(it => it.BlankNum == item.BlankNum) - .Where(it => it.Remarks == "毛坯") + .Where(it => it.Type == 2) .First(); if (material == null) { @@ -125,7 +125,7 @@ namespace ZR.Service.mes.wms { int num = 0; List materials = Context.Queryable() - .Where(it => it.Remarks == "毛坯") + .Where(it => it.Type == 2) .Where(it => !string.IsNullOrEmpty(it.BlankNum)) .OrderBy(it => it.BlankNum) .ToList(); diff --git a/ZR.Service/mes/wms/WmMaterialService.cs b/ZR.Service/mes/wms/WmMaterialService.cs index c089294b..04113be9 100644 --- a/ZR.Service/mes/wms/WmMaterialService.cs +++ b/ZR.Service/mes/wms/WmMaterialService.cs @@ -34,7 +34,8 @@ namespace ZR.Service.mes.wms .AndIF(parm.Color != null, it => it.Color.Contains(parm.Color)) .AndIF(parm.Specification != null, it => it.Specification.Contains(parm.Specification)) .AndIF(parm.Description != null, it => it.Description.Contains(parm.Description)) - .AndIF(parm.Search1 != null, it => it.Search1.Contains(parm.Search1) || it.Search2.Contains(parm.Search1)) + .AndIF(!string.IsNullOrEmpty( parm.Search1), it => it.Search1.Contains(parm.Search1) || it.Search1.Contains(parm.Search2)) + .AndIF(parm.Type > 0, it => it.Type == parm.Type) .AndIF(parm.Status > -1, it => it.Status == parm.Status);