From 3571d8b2231e06e46774af86be502014d6974e1d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 07 四月 2026 16:16:53 +0800
Subject: [PATCH] 优化ERP接收单据逻辑，一期领料变更逻辑修改
---
项目代码/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs | 17 +----------------
1 files changed, 1 insertions(+), 16 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 aa15472..30da889 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"
@@ -15,11 +15,7 @@
/// 涓婚敭
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
-<<<<<<< HEAD
- public int id { get; set; }
-=======
- public int Id { get; set; }
->>>>>>> main
+ public int? Id { get; set; }
/// <summary>
/// 璁惧缂栧彿
@@ -43,11 +39,7 @@
/// 鐮佸灈鏁伴噺
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "鐮佸灈鏁伴噺")]
-<<<<<<< HEAD
- public int PackNum { get; set; }
-=======
public int PackNum { get; set; } = 0;
->>>>>>> main
/// <summary>
/// X鍧愭爣
@@ -103,14 +95,7 @@
[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