From 8dfeb952db4c7a7b24ed658341c59d4b99f3494e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 11 三月 2025 09:24:31 +0800
Subject: [PATCH] 雅达-简化收货单创建逻辑并更新数据类型
---
Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 153 insertions(+), 19 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
index f1a49f2..bd6eeaf 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
@@ -20,24 +20,96 @@
/// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
/// </summary>
public MES_WIP_HIS() { }
+
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
+ /// </summary>
+ /// <param name="data">鍘嗗彶鐨勬潵婧怚tem</param>
+ /// <param name="traceInfo">杩芥函淇℃伅</param>
+ public MES_WIP_HIS(MES_WIP_DATA data, string traceInfo)
+ {
+ ID = Guid.NewGuid().ToString("N");
+ CREATE_USER = data.CREATE_USER;
+ UPDATE_USER = data.UPDATE_USER;
+ AUTH_ORG = data.AUTH_ORG;
+ AUTH_PROD = data.AUTH_PROD;
+ AUTH_WH = data.AUTH_WH;
+ WIP_ID = data.ID;
+ SN = data.SN;
+ STATUS = data.STATUS;
+ ITEM_CODE = data.ITEM_CODE;
+ QTY = data.QTY;
+ WORK_ORDER = data.WORK_ORDER;
+ BATCH_NO = data.BATCH_NO;
+ ROT_CODE = data.ROT_CODE;
+ NODE_ID = data.NODE_ID;
+ NODE_NAME = data.NODE_NAME;
+ FTY_CODE = data.FTY_CODE;
+ WS_CODE = data.WS_CODE;
+ LINE_CODE = data.LINE_CODE;
+ POST_CODE = data.POST_CODE;
+ OPER_CODE = data.OPER_CODE;
+ SEGMENT = data.SEGMENT;
+ HOLD_FLAG = data.HOLD_FLAG;
+ REWORK_FLAG = data.REWORK_FLAG;
+ UNBIND_FLAG = data.UNBIND_FLAG;
+ FINISHED_FLAG = data.FINISHED_FLAG;
+ DFT_FLAG = data.DFT_FLAG;
+ DFT_COUNT = data.DFT_COUNT;
+ DFT_CODE = data.DFT_CODE;
+ REFLOW_NODE = data.REFLOW_NODE;
+ FLOW_SN = data.FLOW_SN;
+ TRAY_SN = data.TRAY_SN;
+ INNER_SN = data.INNER_SN;
+ CARTON_SN = data.CARTON_SN;
+ PALLET_SN = data.PALLET_SN;
+ INV_FLAG = data.INV_FLAG;
+ INV_DATE = data.INV_DATE;
+ INLINE_DATE = data.INLINE_DATE;
+ OUTLINE_DATE = data.OUTLINE_DATE;
+ OPERATION_TIME = data.OPERATION_TIME;
+ OPERATION_END = data.OPERATION_END;
+ DFT_QTY = data.DFT_QTY;
+ SCRAP_QTY = data.SCRAP_QTY;
+ SFTS_CODE = data.SFTS_CODE;
+ SFT_CODE = data.SFT_CODE;
+ PRD_CODE = data.PRD_CODE;
+ OBA_STATUS = data.OBA_STATUS;
+ OBA_BATCH = data.OBA_BATCH;
+ LOCK_BATCH = data.LOCK_BATCH;
+ SHIPPING_DATE = data.SHIPPING_DATE;
+ SHIPPING_ORDER = data.SHIPPING_ORDER;
+ REMARK = data.REMARK;
+ TRACE_INFO = traceInfo;
+ }
#endregion
#region 鍏叡灞炴��
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D")]
+ public string WIP_ID { get; set; }
/// <summary>
/// 杩囩珯鏉＄爜
/// </summary>
[DisplayName("杩囩珯鏉＄爜")]
public string SN { get; set; }
/// <summary>
- /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// 鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
/// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
+ [DisplayName("鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)")]
public int STATUS { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
[DisplayName("鐗╂枡缂栫爜")]
public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [DisplayName("鏁伴噺")]
+ public double QTY { get; set; } = 1;
/// <summary>
/// 宸ュ崟鍙�
/// </summary>
@@ -49,20 +121,20 @@
[DisplayName("宸ュ崟鎵规鍙�")]
public string BATCH_NO { get; set; }
/// <summary>
- /// 鍔犲伐娈�
+ /// 宸ヨ壓璺嚎缂栫爜
/// </summary>
- [DisplayName("鍔犲伐娈�")]
- public string SEGMENT { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎ID
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎ID")]
- public string ROT_ID { get; set; }
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
/// <summary>
/// 宸ヨ壓璺嚎鑺傜偣ID
/// </summary>
[DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { get; set; }
/// <summary>
/// 宸ュ巶缂栫爜
/// </summary>
@@ -89,6 +161,11 @@
[DisplayName("宸ュ簭缂栫爜")]
public string OPER_CODE { get; set; }
/// <summary>
+ /// 鍔犲伐娈�
+ /// </summary>
+ [DisplayName("鍔犲伐娈�")]
+ public string SEGMENT { get; set; }
+ /// <summary>
/// 閿佸畾鏍囪
/// </summary>
[DisplayName("閿佸畾鏍囪")]
@@ -99,20 +176,50 @@
[DisplayName("杩斿伐鏍囪")]
public string REWORK_FLAG { get; set; }
/// <summary>
+ /// 瑙ｇ粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻)
+ /// </summary>
+ [DisplayName("瑙ｇ粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻)")]
+ public string UNBIND_FLAG { get; set; }
+ /// <summary>
/// 鏄惁瀹屽伐
/// </summary>
[DisplayName("鏄惁瀹屽伐")]
public string FINISHED_FLAG { get; set; }
+ /// <summary>
+ /// 鏄惁涓嶈壇
+ /// </summary>
+ [DisplayName("鏄惁涓嶈壇")]
+ public string DFT_FLAG { get; set; }
+ /// <summary>
+ /// 涓嶈壇璁℃暟
+ /// </summary>
+ [DisplayName("涓嶈壇璁℃暟")]
+ public int DFT_COUNT { get; set; }
+ /// <summary>
+ /// 涓嶈壇浠ｇ爜缂栫爜
+ /// </summary>
+ [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
+ public string DFT_CODE { get; set; }
+ /// <summary>
+ /// 缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)
+ /// </summary>
+ [DisplayName("缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)")]
+ public string REFLOW_NODE { get; set; }
+ /// <summary>
+ /// 鍘傚唴娴佽浆鏉＄爜
+ /// </summary>
+ [DisplayName("鍘傚唴娴佽浆鏉＄爜")]
+ public string FLOW_SN { get; set; }
/// <summary>
/// 鎵樼洏/杞藉叿鏉＄爜
/// </summary>
[DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
public string TRAY_SN { get; set; }
/// <summary>
- /// 瀹瑰櫒/鍐呭寘瑁呮潯鐮�
+ /// 鍐呭寘瑁呮潯鐮�
/// </summary>
- [DisplayName("瀹瑰櫒/鍐呭寘瑁呮潯鐮�")]
- public string CONTAINER_SN { get; set; }
+ [DisplayName("鍐呭寘瑁呮潯鐮�")]
+ public string INNER_SN { get; set; }
/// <summary>
/// 澶栫鏉＄爜
/// </summary>
@@ -148,6 +255,21 @@
/// </summary>
[DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鎿嶄綔瀹屾垚鏃堕棿
+ /// </summary>
+ [DisplayName("鎿嶄綔瀹屾垚鏃堕棿")]
+ public DateTime OPERATION_END { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 涓嶈壇鏁伴噺
+ /// </summary>
+ [DisplayName("涓嶈壇鏁伴噺")]
+ public int DFT_QTY { get; set; } = 0;
+ /// <summary>
+ /// 鎶ュ簾鏁伴噺
+ /// </summary>
+ [DisplayName("鎶ュ簾鏁伴噺")]
+ public int SCRAP_QTY { get; set; } = 0;
/// <summary>
/// 鐝埗缂栫爜
/// </summary>
@@ -194,6 +316,11 @@
[DisplayName("澶囨敞")]
public string REMARK { get; set; }
/// <summary>
+ /// 鎿嶄綔鑰楁椂(s)
+ /// </summary>
+ [DisplayName("鎿嶄綔鑰楁椂(ms)")]
+ public long ELAPSED_TIME { get; set; } = 0;
+ /// <summary>
/// 杩芥函淇℃伅
/// </summary>
[DisplayName("杩芥函淇℃伅")]
@@ -205,6 +332,11 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
+ /// <summary>
+ /// 鏄惁宸茬粡鑹搧杩囩珯
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public bool IsFinished => DFT_FLAG != "Y";
#endregion
#region 澶栭敭灞炴��
@@ -233,7 +365,7 @@
*/
/// <summary>
- /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
/// </summary>
public enum STATUSs
{
@@ -249,14 +381,16 @@
Repair = 4,
[Description("宸插畬宸�")]
Finished = 5,
- [Description("宸叉姤搴�")]
- Scrap = 6,
[Description("宸插叆搴�")]
- InStorage = 7,
+ InStorage = 6,
[Description("宸叉嫆鏀�")]
- Reject = 8,
+ Reject = 7,
[Description("宸插嚭璐�")]
- Shipped = 9,
+ Shipped = 8,
+ [Description("寮傚父涓嬬嚎")]
+ Offline = 9,
+ [Description("宸叉姤搴�")]
+ Scrap = 10,
}
/// <summary>
--
Gitblit v1.9.3