From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新

---
 项目代码/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs |   48 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 33 insertions(+), 15 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
index 11cd0da..aa15472 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
@@ -6,16 +6,20 @@
 using System.Threading.Tasks;
 using WIDESEAWCS_Core.DB.Models;
 
-namespace WIDESEAWCS_Model.Models.PackInfo
+namespace WIDESEAWCS_Model.Models
 {
-    [SugarTable(nameof(Dt_Packaxis), "鐮佸灈鍧愭爣")]
+    [SugarTable(nameof(Dt_Packaxis), "鐮佸灈鍧愭爣琛�")]
     public class Dt_Packaxis : BaseEntity
     {
         /// <summary>
         /// 涓婚敭
         /// </summary>
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+<<<<<<< HEAD
         public int id { get; set; }
+=======
+        public int Id { get; set; }
+>>>>>>> main
 
         /// <summary>
         /// 璁惧缂栧彿
@@ -27,72 +31,86 @@
         /// 绔欏彴缂栧彿
         /// </summary>
         [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴缂栧彿")]
-        public int StationCode { get; set; }
+        public string StationCode { get; set; }
 
         /// <summary>
         /// 鍨涘瀷
         /// </summary>
-        [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鍨涘瀷")]
-        public string PackType { get; set; }
+        [SugarColumn(IsNullable = false, ColumnDescription = "鍨涘瀷")]
+        public int PackType { get; set; }
 
         /// <summary>
         /// 鐮佸灈鏁伴噺
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐮佸灈鏁伴噺")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "鐮佸灈鏁伴噺")]
+<<<<<<< HEAD
         public int PackNum { get; set; }
+=======
+        public int PackNum { get; set; } = 0;
+>>>>>>> main
 
         /// <summary>
         /// X鍧愭爣
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "X鍧愭爣")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "X鍧愭爣")]
         public int AxisX { get; set; }
 
         /// <summary>
         /// X鍧愭爣涓暟
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "X鍧愭爣涓暟")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "X鍧愭爣涓暟")]
         public int AxisXCount { get; set; }
 
         /// <summary>
         /// X鍧愭爣闂磋窛
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "X鍧愭爣闂磋窛")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "X鍧愭爣闂磋窛")]
         public int AxisXSpacing { get; set; }
 
         /// <summary>
         /// Y鍧愭爣
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "Y鍧愭爣")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "Y鍧愭爣")]
         public int AxisY { get; set; }
 
         /// <summary>
         /// Y鍧愭爣涓暟
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "Y鍧愭爣涓暟")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "Y鍧愭爣涓暟")]
         public int AxisYCount { get; set; }
 
         /// <summary>
         /// Y鍧愭爣闂磋窛
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "Y鍧愭爣闂磋窛")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "Y鍧愭爣闂磋窛")]
         public int AxisYSpacing { get; set; }
 
         /// <summary>
         /// Z鍧愭爣
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "Z鍧愭爣")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "Z鍧愭爣")]
         public int AxisZ { get; set; }
 
         /// <summary>
         /// Z鍧愭爣涓暟
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "Z鍧愭爣涓暟")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "Z鍧愭爣涓暟")]
         public int AxisZCount { get; set; }
 
         /// <summary>
         /// Z鍧愭爣闂磋窛
         /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "Z鍧愭爣闂磋窛")]
+        [SugarColumn(IsNullable = true,  ColumnDescription = "Z鍧愭爣闂磋窛")]
         public int AxisZSpacing { get; set; }
+
+        /// <summary>
+        /// 澶囨敞
+        /// </summary>
+<<<<<<< HEAD
+        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "澶囨敞")]
+=======
+        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
+>>>>>>> main
+        public string Remark { get; set; }
     }
 }

--
Gitblit v1.9.3