From eb64567d5da7d6a5c80b7579b486234b89b0e6ee Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 25 十一月 2024 15:19:01 +0800
Subject: [PATCH] 包装完成标志
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 2 +-
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index ada7107..2755254 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -619,7 +619,7 @@
wo = woSn.WORK_ORDER;
}
}
- var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64() && q.Status == 2 && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now)).First();
+ var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64() && q.Status == 2 ).First();
if (!ship.IsNullOrEmpty())
{
result.Data = ship.BusinessDate.Date == DateTime.Now.Date ? new()
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 63d1b41..44db428 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -195,9 +195,10 @@
public string SN { get; set; }
public MES_WIP_PKG Package { get; set; }
public bool IsFinished { get; set; } = false;
+ public bool PkgComplete => PKG_LEVEL == 1 || Items.Count(q => q.IsFinished) == PKG_QTY;
public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>();
public Dictionary<string, string> WipSNs { get; set; } = new Dictionary<string, string>();
- public double TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : Package.QTY;
+ public double TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : Package?.QTY ?? 0;
public List<MES_WIP_PKG> GetMinPackageList()
{
--
Gitblit v1.9.3