Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 修正查询条件和注释掉不必要限制

Browse Source 
将MaterialCode和SupplierCode的模糊查询改为精确匹配
调整Orderindicator的查询条件范围
注释掉库存数量必须大于0的限制
This commit is contained in:
git_rabbit
2026-02-03 13:37:44 +08:00
parent c6efde0593
commit 846a913a66
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Service/MES/Material/MmInventoryService.cs
View File

@@ -80,11 +80,11 @@ namespace DOAN.Service.BZFM
.Create<MmInventory>() .Create<MmInventory>()
.AndIF( .AndIF(
!string.IsNullOrEmpty(parm.MaterialCode), !string.IsNullOrEmpty(parm.MaterialCode),
m => m.MaterialCode.Contains(parm.MaterialCode) m => m.MaterialCode == parm.MaterialCode
) )
.AndIF( .AndIF(
!string.IsNullOrEmpty(parm.SupplierCode), !string.IsNullOrEmpty(parm.SupplierCode),
m => m.SupplierCode.Contains(parm.SupplierCode) m => m.SupplierCode == parm.SupplierCode
) )
.AndIF( .AndIF(
!string.IsNullOrEmpty(parm.WarehouseName), !string.IsNullOrEmpty(parm.WarehouseName),

2
DOAN.Service/MES/Order/OrderPurchaseService.cs
View File

@@ -187,7 +187,7 @@ namespace DOAN.Service.MES.order
.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode)) .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode))
.AndIF(parm.ImportDate != null && parm.ImportDate[0] > DateTime.MinValue, it => it.ImportDate >= parm.ImportDate[0]) .AndIF(parm.ImportDate != null && parm.ImportDate[0] > DateTime.MinValue, it => it.ImportDate >= parm.ImportDate[0])
.AndIF(parm.ImportDate != null && parm.ImportDate[1] > DateTime.MinValue, it => it.ImportDate <= parm.ImportDate[1]) .AndIF(parm.ImportDate != null && parm.ImportDate[1] > DateTime.MinValue, it => it.ImportDate <= parm.ImportDate[1])
.AndIF(parm.Orderindicator > -1, it => it.Orderindicator == parm.Orderindicator) .AndIF(parm.Orderindicator > -2, it => it.Orderindicator == parm.Orderindicator)
; ;
return predicate; return predicate;

5
DOAN.Service/MES/Product/ProWorkorderMaterialService.cs
View File

@@ -479,7 +479,8 @@ namespace DOAN.Service.MES.product
var orderPurchaseList = Context var orderPurchaseList = Context
.Queryable<OrderPurchase>() .Queryable<OrderPurchase>()
.Where(o => o.MaterialCode == workorderInfo.productionCode) .Where(o => o.MaterialCode == workorderInfo.productionCode)
.Where(it => it.Orderindicator != -1) .Where(it => it.Orderindicator != 1)
//.Where(it => it.Orderindicator != -1)
.OrderBy(it => it.DeliveryDate) .OrderBy(it => it.DeliveryDate)
.Select( .Select(
o => new OrderPurchaseDto o => new OrderPurchaseDto
@@ -533,7 +534,7 @@ namespace DOAN.Service.MES.product
.Queryable<MmInventory>() .Queryable<MmInventory>()
.Where(it => it.MaterialCode == workorderInfo.productionCode) .Where(it => it.MaterialCode == workorderInfo.productionCode)
.Where(it => it.LocationCode == "CP001") .Where(it => it.LocationCode == "CP001")
.Where(it => it.CurrentQty > 0) //.Where(it => it.CurrentQty > 0)
.Select(it => new MaterialInventoryDto .Select(it => new MaterialInventoryDto
{ {
MaterialId = it.Id, MaterialId = it.Id,