From 1b6830d5f8671e48bdc13d7155b848aa938283f5 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周五, 29 11月 2024 15:53:16 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
index 8ca808c..f6c5d16 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
@@ -15,6 +15,16 @@
{
[Required]
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ public string PackageCode { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
+ public string? Info5 { get; set; }
+
+ [Required]
[SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
public string PlanNo { get; set; }
@@ -22,11 +32,7 @@
[SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
public string OrderId { get; set; }
- /// <summary>
- /// 鐢熶骇鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
- public string? Info5 { get; set; }
+
#region wms鏂板瀛楁 銆怑ditby shaocx,2024-11-20銆�
@@ -45,16 +51,12 @@
[SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")]
public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.鍒濆;
- #endregion
-
- #region 鍖呰绾挎湁鍏�
-
- [Required]
- [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
- public string PackageCode { get; set; }
-
-
+ /// <summary>
+ /// 鏄惁榻愬寘
+ /// </summary>
+ [SugarColumn(ColumnName = "IsQiBao", ColumnDescription = "鏄惁榻愬寘")]
+ public bool? IsQiBao { get; set; }
#endregion
@@ -99,12 +101,6 @@
/// </summary>
[SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
public string? Info10 { get; set; }
-
- /// <summary>
- /// 鍖呰缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
- public string? Info9 { get; set; }
/// <summary>
/// 鑷彁or鍙戣揣
--
Gitblit v1.9.3