From efe6984c4e0e91b16b2704e174d610e180045dc5 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期一, 19 八月 2024 09:01:56 +0800
Subject: [PATCH] 合并上格-8.19

---
 MES.Service/Dto/service/SJPageResult.cs |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index fb35a4c..0064430 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -1,4 +1,4 @@
-锘縰sing MES.Service.Dto.@base;
+using MES.Service.Dto.@base;
 using SqlSugar;
 
 namespace MES.Service.Dto.service;
@@ -57,37 +57,29 @@
     [SugarColumn(ColumnName = "DAA001")] //鐢ㄤ簬SqlSugar
     public string? daa001 { get; set; }
 
-    [SugarColumn(ColumnName = "CAT_QTY")] //鐢ㄤ簬SqlSugar
-    public decimal? catQty { get; set; }
-
-    [SugarColumn(ColumnName = "DETAIL_MEM")] //鐢ㄤ簬SqlSugar
-    public string? detailMem { get; set; }
-
-    [SugarColumn(ColumnName = "TASK_NO")] //鐢ㄤ簬SqlSugar
-    public string? taskNo { get; set; }
-
     //LINE
     [SugarColumn(ColumnName = "LINE")] //鐢ㄤ簬SqlSugar
     public string? line { get; set; }
 
-    /// <summary>
-    ///     妯″叿鍙�
-    /// </summary>
-
-    [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
-    public string? MoidNum { get; set; }
 
     [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
     public string? Remarks { get; set; }
 
-    //BOARD_MODEL
-    [SugarColumn(ColumnName = "BOARD_MODEL")]
-    public string? BoardModel { get; set; }
+    /// <summary>
+    ///     浜у搧鍚嶇О
+    /// </summary>
+    [SugarColumn(ColumnName = "DAA003")]
+    public string? Daa003 { get; set; }
 
-    [SugarColumn(ColumnName = "PLAN_QTY")] public decimal? PlanQty { get; set; }
+    /// <summary>
+    ///     浜у搧瑙勬牸
+    /// </summary>
+    [SugarColumn(ColumnName = "DAA004")]
+    public string? Daa004 { get; set; }
 
-    [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }
-
-    [SugarColumn(ColumnName = "BOARD_STYLE")]
-    public string? BoardStyle { get; set; }
+    /// <summary>
+    ///     宸ュ崟鏁伴噺
+    /// </summary>
+    [SugarColumn(ColumnName = "DAA008")]
+    public decimal? Daa008 { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3