From 69952578d64d8ef8ad6158f47a2b334c8bdfca91 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 20 八月 2024 20:55:58 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Model.Net/Entitys/BAS/BAS_PROD_ARCH.cs | 11 +++++++++--
Tiger.Business/MES/Biz.WorkBatch.cs | 6 ++++--
Tiger.Model.Net/Entitys/BAS/BAS_ITEM_TYPE.cs | 16 +++++++++++++++-
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business/MES/Biz.WorkBatch.cs b/Tiger.Business/MES/Biz.WorkBatch.cs
index a4e0b4e..c2861ef 100644
--- a/Tiger.Business/MES/Biz.WorkBatch.cs
+++ b/Tiger.Business/MES/Biz.WorkBatch.cs
@@ -57,7 +57,8 @@
LineCode = lineCode;
WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).IncludesAllFirstLayer().First();
Product = Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == WO.ITEM_CODE && q.AUTH_ORG == WO.AUTH_ORG).First();
- Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.ORDER_NO == OrderNo && q.ACT_LINE == LineCode).First();
+ Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.ORDER_NO == OrderNo && q.ACT_LINE == LineCode &&
+ (q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())).First();
Customer = Biz.Db.Queryable<BAS_CUSTOMER>().Where(q => q.CUST_CODE == WO.CUST_CODE).First();
WoSNs = Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.WORK_ORDER == OrderNo).ToList();
Edges = Biz.Db.Queryable<MES_WO_EDGE>().Where(q => q.WORK_ORDER == OrderNo).ToList();
@@ -133,7 +134,8 @@
action.LocaleMsg = new("MES.WorkBatch.WoStatusCanNotWork", WO.ORDER_NO, Batch.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
}
//宸ュ崟鎵规鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
- if (curNode.IS_INPUT == "Y" && Batch.INPUT_QTY - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
+ //if (curNode.IS_INPUT == "Y" && Batch.INPUT_QTY - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
+ if (curNode.IS_INPUT == "Y" && WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO) - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_ITEM_TYPE.cs b/Tiger.Model.Net/Entitys/BAS/BAS_ITEM_TYPE.cs
index 7356ebf..94021bb 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_ITEM_TYPE.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_ITEM_TYPE.cs
@@ -10,6 +10,7 @@
/// 实体：物品分类
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("物品分类")]
[Serializable]
[SugarTable("BAS_ITEM_TYPE")]
public class BAS_ITEM_TYPE : DbEntityWithAuth
@@ -23,16 +24,29 @@
#region 公共属性
/// <summary>
- /// 物品分类代码
+ /// 物品分类编码
/// </summary>
+ [DisplayName("物品分类编码")]
public string TYPE_CODE { get; set; }
/// <summary>
/// 物品分类名称
/// </summary>
+ [DisplayName("物品分类名称")]
public string TYPE_NAME { get; set; }
+ /// <summary>
+ /// 物品分类简称
+ /// </summary>
+ [DisplayName("物品分类简称")]
+ public string SHORT_NAME { get; set; }
+ /// <summary>
+ /// 父阶物品分类
+ /// </summary>
+ [DisplayName("父阶物品分类")]
+ public string PARENT { get; set; }
/// <summary>
/// 备注
/// </summary>
+ [DisplayName("备注")]
public string REMARK { get; set; }
#endregion
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_PROD_ARCH.cs b/Tiger.Model.Net/Entitys/BAS/BAS_PROD_ARCH.cs
index 1d17049..65203d2 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_PROD_ARCH.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_PROD_ARCH.cs
@@ -10,6 +10,7 @@
/// 实体：产品架构
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("产品架构")]
[Serializable]
[SugarTable("BAS_PROD_ARCH")]
public class BAS_PROD_ARCH : DbEntityWithAuth
@@ -23,28 +24,34 @@
#region 公共属性
/// <summary>
- /// 产品架构代码
+ /// 产品架构编码
/// </summary>
+ [DisplayName("产品架构编码")]
public string ARCH_CODE { get; set; }
/// <summary>
/// 产品架构名称
/// </summary>
+ [DisplayName("产品架构名称")]
public string ARCH_NAME { get; set; }
/// <summary>
/// 产品架构简称
/// </summary>
+ [DisplayName("产品架构简称")]
public string SHORT_NAME { get; set; }
/// <summary>
- /// 产品架构类型(机型机种)
+ /// 产品架构类型
/// </summary>
+ [DisplayName("产品架构类型")]
public string ARCH_TYPE { get; set; }
/// <summary>
/// 父阶产品架构
/// </summary>
+ [DisplayName("父阶产品架构")]
public string PARENT { get; set; }
/// <summary>
/// 备注
/// </summary>
+ [DisplayName("备注")]
public string REMARK { get; set; }
#endregion
--
Gitblit v1.9.3