From fdf29b90b20454c0328fbeb2e122c5f2dfbb5698 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 02 十一月 2024 17:44:28 +0800 Subject: [PATCH] 加了guid --- DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs | 23 +++-- DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs | 117 ++++++++++++++-------------- DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs | 50 ++++++------ 3 files changed, 97 insertions(+), 93 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs index f373efb..e575c80 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs @@ -1,76 +1,75 @@ 锘縰sing System; using System.Collections.Generic; using System.Linq; - + namespace MES.Service.Modes { - + /// <summary> + /// + ///</summary> + public class MesQaItemsDetect01 { /// <summary> /// - ///</summary> - - public Guid? Guid { get; set; } - /// <summary> - /// + /// 榛樿鍊�: (newid()) ///</summary> - public int Id { get; set; } + public Guid Guid { get; set; } /// <summary> /// 妫�楠屽崟鍙� ///</summary> - + public string ReleaseNo { get; set; } /// <summary> /// 妫�楠屾棩鏈� ///</summary> - + public DateTime? FcheckDate { get; set; } /// <summary> /// 妫�楠屼汉鍛� ///</summary> - + public string FcheckBy { get; set; } /// <summary> /// 鐗╂枡缂栫爜 ///</summary> - + public string ItemNo { get; set; } /// <summary> /// 鏉ユ枡鏁伴噺 ///</summary> - + public decimal? FbatchQty { get; set; } /// <summary> /// 鍒ゅ畾缁撴灉 ///</summary> - + public string FreceQty { get; set; } /// <summary> /// ///</summary> - + public string SuppNo { get; set; } /// <summary> /// ///</summary> - + public string FngDesc { get; set; } /// <summary> /// 妫�楠岀粨鏋� ///</summary> - + public string FcheckResu { get; set; } /// <summary> /// ///</summary> - + public string Freview { get; set; } /// <summary> /// 妫�楠屾按鍑� ///</summary> - + public string SampleSizeNo { get; set; } /// <summary> /// 妫�楠屾按骞� @@ -80,17 +79,17 @@ /// <summary> /// 鎷掓敹姘村钩 ///</summary> - + public string FacLevel { get; set; } /// <summary> /// 鎶芥鏁伴噺 ///</summary> - + public string CheckQty { get; set; } /// <summary> /// 鎵规鍙� --鍒拌揣鍗曞彿 ///</summary> - + public string LotNo { get; set; } /// <summary> /// 鏄惁鎺ㄩ�� @@ -100,47 +99,47 @@ /// <summary> /// 鏄惁澶勭悊 ///</summary> - + public string Fhandle { get; set; } /// <summary> /// 鍒涘缓浜� ///</summary> - + public string CreateBy { get; set; } /// <summary> /// 鍒涘缓鏃ユ湡 ///</summary> - + public DateTime? CreateDate { get; set; } /// <summary> /// 鏇存柊浜� ///</summary> - + public string LastupdateBy { get; set; } /// <summary> /// 鏇存柊鏃ユ湡 ///</summary> - + public DateTime? LastupdateDate { get; set; } /// <summary> /// 鏄惁瀹℃牳 ///</summary> - + public int? Modify1Flag { get; set; } /// <summary> /// ///</summary> - + public string Modify1By { get; set; } /// <summary> /// ///</summary> - + public DateTime? Modify1Date { get; set; } /// <summary> /// ///</summary> - + public string Factory { get; set; } /// <summary> /// XRF娴嬭瘯鎶ュ憡缂栧彿 @@ -150,32 +149,32 @@ /// <summary> /// 绗笁鏂规姤鍛� ///</summary> - + public string FthirdRep { get; set; } /// <summary> /// 鏄惁浣滃簾 ///</summary> - + public int? Fcancel { get; set; } /// <summary> /// 鎻愪氦鏍囪瘑 ///</summary> - + public int? Fsubmit { get; set; } /// <summary> /// 妫�楠屼緷鎹� ///</summary> - + public string FcheckAccord { get; set; } /// <summary> /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱) ///</summary> - + public int? Ftype { get; set; } /// <summary> /// 鍗曚綅 ///</summary> - + public string ItemUnit { get; set; } /// <summary> /// 鍑鸿揣鏃ユ湡 @@ -185,17 +184,17 @@ /// <summary> /// 鏄惁鍏嶆 ///</summary> - + public int? Fexemption { get; set; } /// <summary> /// 妗d綅鏍囧噯 ///</summary> - + public string FgearStand { get; set; } /// <summary> /// 涓嶈壇澶勭悊鏂规硶 ///</summary> - + public string FngHandle { get; set; } /// <summary> /// 绠$悊缂栧彿 @@ -205,12 +204,12 @@ /// <summary> /// 杞崲鏁伴噺 ///</summary> - + public string FcovertQty { get; set; } /// <summary> /// 鐗堟湰 ///</summary> - + public int? Fversion { get; set; } /// <summary> /// @@ -235,7 +234,7 @@ /// <summary> /// 鐗瑰畾淇敼瀹℃牳浜� ///</summary> - + public string Modify1By1 { get; set; } /// <summary> /// 鐗瑰畾淇敼瀹℃牳鏃堕棿 @@ -245,72 +244,72 @@ /// <summary> /// 灏忔壒娆″彿 ///</summary> - + public string LotNo1 { get; set; } /// <summary> /// 閲囪喘鍗曞彿 ///</summary> - + public string LotNo2 { get; set; } /// <summary> /// 浜у搧鍨嬪彿 ///</summary> - + public string BoardStyle { get; set; } /// <summary> /// 浠诲姟鍗曞彿 ///</summary> - + public string WorkNo { get; set; } /// <summary> /// 鍒拌揣鏃堕棿 ///</summary> - + public string Dha018 { get; set; } /// <summary> /// 琛屽彿 ///</summary> - + public int? Dhb002 { get; set; } /// <summary> /// 鍒拌揣鍗曞彿 ///</summary> - + public string Dhb001 { get; set; } /// <summary> /// 渚涘簲鍟� ///</summary> - + public string Lifnr { get; set; } /// <summary> /// 閫�鏂欐柟寮� ///</summary> - + public string Fmrmode { get; set; } /// <summary> /// erp杩斿洖淇℃伅 ///</summary> - + public string Msg { get; set; } /// <summary> /// 鐘舵�� ///</summary> - + public string States { get; set; } /// <summary> /// IQC鎻愪氦鏃堕棿 ///</summary> - + public DateTime? IqcDate { get; set; } /// <summary> /// 閲囪喘璁㈠崟ID ///</summary> - + public int? EbelnK3id { get; set; } /// <summary> /// 閲囪喘璁㈠崟琛孖D ///</summary> - + public int? LineK3id { get; set; } /// <summary> /// 璐ㄩ噺瀹℃牳鏍囪瘑 @@ -321,12 +320,12 @@ /// <summary> /// 鐗╂枡ID ///</summary> - + public int? ItemId { get; set; } /// <summary> /// 涓嶈壇鎻忚堪 ///</summary> - + public string Remarks { get; set; } } } diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs index 7358aa5..3907e3d 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs @@ -16,10 +16,15 @@ public Guid Guid { get; set; } /// <summary> - /// + /// 鐖朵翰Guid ///</summary> - public int Id { get; set; } + public Guid? ParentGuid { get; set; } + /// <summary> + /// 鐖风埛Guid + ///</summary> + + public Guid? GrandpaGuid { get; set; } /// <summary> /// 妫�楠岀粨鏋� ///</summary> @@ -33,12 +38,12 @@ /// <summary> /// 鐗╂枡鏉$爜 ///</summary> - + public string ItemBarcode { get; set; } /// <summary> /// ///</summary> - + public string ReleaseNo { get; set; } /// <summary> /// @@ -48,27 +53,27 @@ /// <summary> /// ///</summary> - + public DateTime? CreateDate { get; set; } /// <summary> /// ///</summary> - + public string Company { get; set; } /// <summary> /// ///</summary> - + public string Factory { get; set; } /// <summary> /// ///</summary> - + public string Fstand { get; set; } /// <summary> /// 鐢熸垚浜� ///</summary> - + public string LastupdateBy { get; set; } /// <summary> /// diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs index 04ed58a..c426902 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs @@ -13,27 +13,27 @@ /// <summary> /// ///</summary> - + public Guid Guid { get; set; } /// <summary> /// ///</summary> - - public int Id { get; set; } + + public Guid? ParentGuid { get; set; } /// <summary> /// 鏍囧噯鍊肩被鍨� ///</summary> - + public string FtextType { get; set; } /// <summary> /// 鏍囧噯鍊� ///</summary> - + public int? Fstand { get; set; } /// <summary> /// 涓婂叕宸� ///</summary> - + public string FupAllow { get; set; } /// <summary> /// 涓嬪叕宸� @@ -43,12 +43,12 @@ /// <summary> /// 妫�楠屾按鍑� ///</summary> - + public string SampleSizeNo { get; set; } /// <summary> /// 妫�楠屾按骞� ///</summary> - + public string FcheckLevel { get; set; } /// <summary> /// 鎷掓敹姘村钩 @@ -58,7 +58,7 @@ /// <summary> /// 妫�楠岄」鐩� ///</summary> - + public string FcheckItem { get; set; } /// <summary> /// 瑙勬牸瑕佹眰 @@ -73,7 +73,7 @@ /// <summary> /// 妫�楠岀粨鏋� ///</summary> - + public string FcheckResu { get; set; } /// <summary> /// AC鏁伴噺 @@ -83,78 +83,78 @@ /// <summary> /// RE鏁伴噺 ///</summary> - + public int? FreQty { get; set; } /// <summary> /// 涓嶅悎鏍兼暟 ///</summary> - + public int? FngQty { get; set; } /// <summary> /// 涓嶈壇鐜� ///</summary> - + public decimal? FngRate { get; set; } /// <summary> /// 宸插綍鍏ユ暟閲� ///</summary> - + public decimal? FenterQty { get; set; } /// <summary> /// ///</summary> - + public string ReleaseNo { get; set; } /// <summary> /// ///</summary> - + public string Company { get; set; } /// <summary> /// ///</summary> - + public string Factory { get; set; } /// <summary> /// 妫�楠岄」鐩弿杩� ///</summary> - + public string FcheckItemDesc { get; set; } /// <summary> /// 宸ュ簭鍙� ///</summary> - + public string ProcNo { get; set; } /// <summary> /// 宸ヤ綔涓績缂栫爜 ///</summary> - + public string WorkshopCenterCode { get; set; } /// <summary> /// 鍗曚綅 ///</summary> - + public string Funit { get; set; } /// <summary> /// 鐗瑰畾淇敼 /// 榛樿鍊�: ((0)) ///</summary> - + public int? GivenModify { get; set; } /// <summary> /// 妫�楠屽伐鍏� ///</summary> - + public string FcheckTool { get; set; } /// <summary> /// 鏇存柊浜� ///</summary> - + public string LastupdateBy { get; set; } /// <summary> /// 鏇存柊鏃堕棿 ///</summary> - + public DateTime? LastupdateDate { get; set; } /// <summary> /// 涓嶅悎鏍兼弿杩� -- Gitblit v1.9.3