From 2812f65c7481ce10953fa1fbe9cc89a8768e07f6 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 23 四月 2025 17:13:55 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda

---
 MES.Service/Modes/QsItemOqcReq.cs |   80 ++++++++++++++++++++-------------------
 1 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
index a934f30..c1513b3 100644
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ b/MES.Service/Modes/QsItemOqcReq.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using SqlSugar;
 
@@ -20,104 +19,103 @@
     public decimal? Id { get; set; }
 
     /// <summary>
-    /// 妫�楠屽崟鍙� 
-    ///</summary>
+    ///     妫�楠屽崟鍙�
+    /// </summary>
     [SugarColumn(ColumnName = "RELEASE_NO")]
     public string? ReleaseNo { get; set; }
 
     /// <summary>
-    /// 妫�楠屾棩鏈� 
-    ///</summary>
+    ///     妫�楠屾棩鏈�
+    /// </summary>
     [SugarColumn(ColumnName = "FCHECK_DATE")]
     public DateTime? FcheckDate { get; set; }
 
     /// <summary>
-    /// 妫�楠屼汉鍛� 
-    ///</summary>
+    ///     妫�楠屼汉鍛�
+    /// </summary>
     [SugarColumn(ColumnName = "FCHECK_BY")]
     public string? FcheckBy { get; set; }
 
     /// <summary>
-    /// 鐗╂枡缂栫爜 
-    ///</summary>
+    ///     鐗╂枡缂栫爜
+    /// </summary>
     [SugarColumn(ColumnName = "ITEM_NO")]
     public string? ItemNo { get; set; }
 
     /// <summary>
-    /// 妫�楠岀粨鏋� 
-    ///</summary>
+    ///     妫�楠岀粨鏋�
+    /// </summary>
     [SugarColumn(ColumnName = "FCHECK_RESU")]
     public string? FcheckResu { get; set; }
 
     /// <summary>
-    /// 鍒涘缓浜� 
-    ///</summary>
+    ///     鍒涘缓浜�
+    /// </summary>
     [SugarColumn(ColumnName = "CREATE_BY")]
     public string? CreateBy { get; set; }
 
     /// <summary>
-    /// 鍒涘缓鏃ユ湡 
-    ///</summary>
+    ///     鍒涘缓鏃ユ湡
+    /// </summary>
     [SugarColumn(ColumnName = "CREATE_DATE")]
     public DateTime? CreateDate { get; set; }
 
     /// <summary>
-    /// 鏇存柊浜� 
-    ///</summary>
+    ///     鏇存柊浜�
+    /// </summary>
     [SugarColumn(ColumnName = "LASTUPDATE_BY")]
     public string? LastupdateBy { get; set; }
 
     /// <summary>
-    /// 鏇存柊鏃ユ湡 
-    ///</summary>
+    ///     鏇存柊鏃ユ湡
+    /// </summary>
     [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
     public DateTime? LastupdateDate { get; set; }
 
     /// <summary>
-    ///  
-    ///</summary>
+    /// </summary>
     [SugarColumn(ColumnName = "MODIFY1_BY")]
     public string? Modify1By { get; set; }
 
     /// <summary>
-    /// 宸ュ崟鍙� 
-    ///</summary>
+    ///     宸ュ崟鍙�
+    /// </summary>
     [SugarColumn(ColumnName = "BILL_NO")]
     public string? BillNo { get; set; }
 
     /// <summary>
-    /// 妯″叿鍙� 
-    ///</summary>
+    ///     妯″叿鍙�
+    /// </summary>
     [SugarColumn(ColumnName = "MOID_NUM")]
     public string? MoidNum { get; set; }
 
     /// <summary>
-    ///  瀹℃牳浜�
-    ///</summary>
+    ///     瀹℃牳浜�
+    /// </summary>
     [SugarColumn(ColumnName = "FSUBMIT_BY")]
     public string? FsubmitBy { get; set; }
 
     /// <summary>
-    ///  瀹℃牳鏃堕棿
-    ///</summary>
+    ///     瀹℃牳鏃堕棿
+    /// </summary>
     [SugarColumn(ColumnName = "FSUBMIT_DATE")]
     public DateTime? FsubmitDate { get; set; }
 
     /// <summary>
-    ///   瀹℃牳鐘舵��
-    ///</summary>
+    ///     瀹℃牳鐘舵��
+    /// </summary>
     [SugarColumn(ColumnName = "FSUBMIT")]
     public decimal? Fsubmit { get; set; }
 
     /// <summary>
-    /// 澶囨敞 
-    ///</summary>
+    ///     澶囨敞
+    /// </summary>
     [SugarColumn(ColumnName = "REMARKS")]
     public string? Remarks { get; set; }
 
     /// <summary>
-    /// 鐗╂枡ID 
-    ///</summary>
+    ///     鐗╂枡ID
+    /// </summary>
     [SugarColumn(ColumnName = "ITEM_ID")]
     public decimal? ItemId { get; set; }
 
@@ -126,10 +124,6 @@
 
     [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
 
-    [SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }
-
-    [SugarColumn(IsIgnore = true)] public string? CbillNo { get; set; }
-
     [SugarColumn(IsIgnore = true)] public string? Dab001 { get; set; }
 
     [SugarColumn(IsIgnore = true)] public string? Daa015 { get; set; }
@@ -137,4 +131,12 @@
     [SugarColumn(IsIgnore = true)] public string? LineNo { get; set; }
 
     [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
+
+    [SugarColumn(IsIgnore = true)] public decimal? ItemInId { get; set; }
+    
+    [SugarColumn(IsIgnore = true)] public string? Bgr { get; set; }
+
+    [SugarColumn(IsIgnore = true)] public string? Caa015 { get; set; }
+
+    [SugarColumn(IsIgnore = true)] public string? cust { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3