From 1bcccbe20fc973961418663de789b513784f490c Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 14 七月 2024 15:01:40 +0800
Subject: [PATCH] 修复bug
---
Tiger.Business.MES/Transaction/CollectNode.cs | 2
Tiger.Business.MES/Transaction/PackingNode.cs | 2
Tiger.Business.MES/WorkAction/PrintLabel.cs | 3
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 248 +++++++++++++++++++++++++------------------------
4 files changed, 130 insertions(+), 125 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 48f92d4..087315d 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -281,7 +281,7 @@
}
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
- action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+ action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME,CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
return action;
}
#endregion Functions
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 21930ca..0f5833d 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -280,7 +280,7 @@
}
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
- action.LocaleMsg = new("MES.Transaction.PackingNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+ action.LocaleMsg = new("MES.Transaction.PackingNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
return action;
}
#endregion Functions
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index 2a11f3b..52b001d 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -109,6 +109,9 @@
{
case "GetSN":
return CurPosition.CurWipSN.SN;
+ case "GetBAS_ITEM":
+ var itemInfo = Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == CurPosition.CurWipSN.ITEM_CODE).First();
+ return itemInfo.ToJson();
default:
return "";
}
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index 32c922c..d8968d8 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -7,294 +7,296 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：在制品信息表
+ /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
/// </summary>
[Description("Primary:ID")]
- [DisplayName("在制品信息表")]
+ [DisplayName("鍦ㄥ埗鍝佷俊鎭〃")]
[Serializable]
[SugarTable("MES_WIP_DATA")]
public class MES_WIP_DATA : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：在制品信息表
+ /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
/// </summary>
public MES_WIP_DATA() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 过站条码
+ /// 杩囩珯鏉＄爜
/// </summary>
- [DisplayName("过站条码")]
+ [DisplayName("杩囩珯鏉＄爜")]
public string SN { get; set; }
/// <summary>
- /// 状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)
+ /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
/// </summary>
- [DisplayName("状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)")]
+ [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
public int STATUS { get; set; }
/// <summary>
- /// 物料编码
+ /// 鐗╂枡缂栫爜
/// </summary>
- [DisplayName("物料编码")]
+ [DisplayName("鐗╂枡缂栫爜")]
public string ITEM_CODE { get; set; }
/// <summary>
- /// 工单号
+ /// 宸ュ崟鍙�
/// </summary>
- [DisplayName("工单号")]
+ [DisplayName("宸ュ崟鍙�")]
public string WORK_ORDER { get; set; }
/// <summary>
- /// 工单批次号
+ /// 宸ュ崟鎵规鍙�
/// </summary>
- [DisplayName("工单批次号")]
+ [DisplayName("宸ュ崟鎵规鍙�")]
public string BATCH_NO { get; set; }
/// <summary>
- /// 工艺路线编码
+ /// 宸ヨ壓璺嚎缂栫爜
/// </summary>
- [DisplayName("工艺路线编码")]
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
public string ROT_CODE { get; set; }
/// <summary>
- /// 工艺路线节点ID
+ /// 宸ヨ壓璺嚎鑺傜偣ID
/// </summary>
- [DisplayName("工艺路线节点ID")]
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
public string NODE_ID { get; set; }
/// <summary>
- /// 工艺路线节点名称
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
/// </summary>
- [DisplayName("工艺路线节点名称")]
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
public string NODE_NAME { get; set; }
/// <summary>
- /// 工厂编码
+ /// 宸ュ巶缂栫爜
/// </summary>
- [DisplayName("工厂编码")]
+ [DisplayName("宸ュ巶缂栫爜")]
public string FTY_CODE { get; set; }
/// <summary>
- /// 车间编码
+ /// 杞﹂棿缂栫爜
/// </summary>
- [DisplayName("车间编码")]
+ [DisplayName("杞﹂棿缂栫爜")]
public string WS_CODE { get; set; }
/// <summary>
- /// 产线编码
+ /// 浜х嚎缂栫爜
/// </summary>
- [DisplayName("产线编码")]
+ [DisplayName("浜х嚎缂栫爜")]
public string LINE_CODE { get; set; }
/// <summary>
- /// 岗位编码
+ /// 宀椾綅缂栫爜
/// </summary>
- [DisplayName("岗位编码")]
+ [DisplayName("宀椾綅缂栫爜")]
public string POST_CODE { get; set; }
/// <summary>
- /// 工序编码
+ /// 宸ュ簭缂栫爜
/// </summary>
- [DisplayName("工序编码")]
+ [DisplayName("宸ュ簭缂栫爜")]
public string OPER_CODE { get; set; }
/// <summary>
- /// 加工段
+ /// 鍔犲伐娈�
/// </summary>
- [DisplayName("加工段")]
+ [DisplayName("鍔犲伐娈�")]
public string SEGMENT { get; set; }
/// <summary>
- /// 锁定标记
+ /// 閿佸畾鏍囪
/// </summary>
- [DisplayName("锁定标记")]
+ [DisplayName("閿佸畾鏍囪")]
public string HOLD_FLAG { get; set; }
/// <summary>
- /// 返工标记
+ /// 杩斿伐鏍囪
/// </summary>
- [DisplayName("返工标记")]
+ [DisplayName("杩斿伐鏍囪")]
public string REWORK_FLAG { get; set; }
/// <summary>
- /// 是否完工
+ /// 鏄惁瀹屽伐
/// </summary>
- [DisplayName("是否完工")]
+ [DisplayName("鏄惁瀹屽伐")]
public string FINISHED_FLAG { get; set; }
/// <summary>
- /// 是否不良
+ /// 鏄惁涓嶈壇
/// </summary>
- [DisplayName("是否不良")]
+ [DisplayName("鏄惁涓嶈壇")]
public string DFT_FLAG { get; set; }
/// <summary>
- /// 不良计数
+ /// 涓嶈壇璁℃暟
/// </summary>
- [DisplayName("不良计数")]
+ [DisplayName("涓嶈壇璁℃暟")]
public int DFT_COUNT { get; set; }
/// <summary>
- /// 不良代码编码
+ /// 涓嶈壇浠ｇ爜缂栫爜
/// </summary>
- [DisplayName("不良代码编码")]
+ [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
public string DFT_CODE { get; set; }
/// <summary>
- /// 托盘/载具条码
+ /// 鎵樼洏/杞藉叿鏉＄爜
/// </summary>
- [DisplayName("托盘/载具条码")]
+ [DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
public string TRAY_SN { get; set; }
/// <summary>
- /// 容器/内包装条码
+ /// 瀹瑰櫒/鍐呭寘瑁呮潯鐮�
/// </summary>
- [DisplayName("容器/内包装条码")]
+ [DisplayName("瀹瑰櫒/鍐呭寘瑁呮潯鐮�")]
public string CONTAINER_SN { get; set; }
/// <summary>
- /// 外箱条码
+ /// 澶栫鏉＄爜
/// </summary>
- [DisplayName("外箱条码")]
+ [DisplayName("澶栫鏉＄爜")]
public string CARTON_SN { get; set; }
/// <summary>
- /// 栈板条码
+ /// 鏍堟澘鏉＄爜
/// </summary>
- [DisplayName("栈板条码")]
+ [DisplayName("鏍堟澘鏉＄爜")]
public string PALLET_SN { get; set; }
/// <summary>
- /// 是否入库
+ /// 鏄惁鍏ュ簱
/// </summary>
- [DisplayName("是否入库")]
+ [DisplayName("鏄惁鍏ュ簱")]
public string INV_FLAG { get; set; }
/// <summary>
- /// 入库日期
+ /// 鍏ュ簱鏃ユ湡
/// </summary>
- [DisplayName("入库日期")]
+ [DisplayName("鍏ュ簱鏃ユ湡")]
public DateTime INV_DATE { get; set; } = DateTime.MinValue;
/// <summary>
- /// 投入时间
+ /// 鎶曞叆鏃堕棿
/// </summary>
- [DisplayName("投入时间")]
+ [DisplayName("鎶曞叆鏃堕棿")]
public DateTime INLINE_DATE { get; set; } = DateTime.MinValue;
/// <summary>
- /// 产出时间
+ /// 浜у嚭鏃堕棿
/// </summary>
- [DisplayName("产出时间")]
+ [DisplayName("浜у嚭鏃堕棿")]
public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue;
/// <summary>
- /// 当前操作时间
+ /// 褰撳墠鎿嶄綔鏃堕棿
/// </summary>
- [DisplayName("当前操作时间")]
+ [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
/// <summary>
- /// 班制编码
+ /// 鐝埗缂栫爜
/// </summary>
- [DisplayName("班制编码")]
+ [DisplayName("鐝埗缂栫爜")]
public string SFTS_CODE { get; set; }
/// <summary>
- /// 班次编码
+ /// 鐝缂栫爜
/// </summary>
- [DisplayName("班次编码")]
+ [DisplayName("鐝缂栫爜")]
public string SFT_CODE { get; set; }
/// <summary>
- /// 时段编码
+ /// 鏃舵缂栫爜
/// </summary>
- [DisplayName("时段编码")]
+ [DisplayName("鏃舵缂栫爜")]
public string PRD_CODE { get; set; }
/// <summary>
- /// 抽检状态(0Unsampled未抽检|1NoSampling不抽检|2WaitCheck待检验|3Checking检验中|4Completed检验完|5Locked已锁定)
+ /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
/// </summary>
- [DisplayName("抽检状态(0Unsampled未抽检|1NoSampling不抽检|2WaitCheck待检验|3Checking检验中|4Completed检验完|5Locked已锁定)")]
+ [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")]
public int OBA_STATUS { get; set; }
/// <summary>
- /// 抽检批次号
+ /// 鎶芥鎵规鍙�
/// </summary>
- [DisplayName("抽检批次号")]
+ [DisplayName("鎶芥鎵规鍙�")]
public string OBA_BATCH { get; set; }
/// <summary>
- /// 锁定批次号
+ /// 閿佸畾鎵规鍙�
/// </summary>
- [DisplayName("锁定批次号")]
+ [DisplayName("閿佸畾鎵规鍙�")]
public string LOCK_BATCH { get; set; }
/// <summary>
- /// 出货时间
+ /// 鍑鸿揣鏃堕棿
/// </summary>
- [DisplayName("出货时间")]
+ [DisplayName("鍑鸿揣鏃堕棿")]
public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue;
/// <summary>
- /// 出货单号
+ /// 鍑鸿揣鍗曞彿
/// </summary>
- [DisplayName("出货单号")]
+ [DisplayName("鍑鸿揣鍗曞彿")]
public string SHIPPING_ORDER { get; set; }
/// <summary>
- /// 备注
+ /// 澶囨敞
/// </summary>
- [DisplayName("备注")]
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_DATA类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA表中的MES_WIP_DATAId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ [Navigate(NavigateType.OneToOne, nameof(ITEM_CODE), nameof(BAS_ITEM.ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public BAS_ITEM ItemInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #endregion
- #region 枚举变量
- /*例子
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
- [Description("枚举描述0")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
- /// <summary>
- /// 枚举：状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)
- /// </summary>
- public enum STATUSs
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// </summary>
+ public enum STATUSs
{
- [Description("初始化")]
+ [Description("鍒濆鍖�")]
Init = 0,
- [Description("已投入")]
+ [Description("宸叉姇鍏�")]
Input = 1,
- [Description("良品过站")]
+ [Description("鑹搧杩囩珯")]
OK = 2,
- [Description("不良过站")]
+ [Description("涓嶈壇杩囩珯")]
NG = 3,
- [Description("维修中")]
+ [Description("缁翠慨涓�")]
Repair = 4,
- [Description("已完工")]
+ [Description("宸插畬宸�")]
Finished = 5,
- [Description("已报废")]
+ [Description("宸叉姤搴�")]
Scrap = 6,
- [Description("已入库")]
+ [Description("宸插叆搴�")]
InStorage = 7,
- [Description("已拒收")]
+ [Description("宸叉嫆鏀�")]
Reject = 8,
- [Description("已出货")]
+ [Description("宸插嚭璐�")]
Shipped = 9,
}
/// <summary>
- /// 枚举：抽检状态(0Unsampled未抽检|1NoSampling不抽检|2WaitCheck待检验|3Checking检验中|4Completed检验完|5Locked已锁定)
+ /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
/// </summary>
public enum OBA_STATUSs
{
- [Description("未抽检")]
+ [Description("鏈娊妫�")]
Unsampled = 0,
- [Description("不抽检")]
+ [Description("涓嶆娊妫�")]
NoSampling = 1,
- [Description("待检验")]
+ [Description("寰呮楠�")]
WaitCheck = 2,
- [Description("检验中")]
+ [Description("妫�楠屼腑")]
Checking = 3,
- [Description("检验完")]
+ [Description("妫�楠屽畬")]
Completed = 4,
- [Description("已锁定")]
+ [Description("宸查攣瀹�")]
Locked = 5,
}
#endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
#endregion
--
Gitblit v1.9.3