From 91151a1c608da15115fd5edeff35e69bb78c2e9f Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周五, 16 5月 2025 17:38:05 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialStocks/WmsMaterialStock.cs | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialStocks/WmsMaterialStock.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialStocks/WmsMaterialStock.cs index 1b3279e..dc2982c 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialStocks/WmsMaterialStock.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialStocks/WmsMaterialStock.cs @@ -87,14 +87,19 @@ public string AreaName { get; set; } /// <summary> + /// 妫�楠岀姸鎬� + /// </summary> + public MaterialCheckStatusEnum? CheckStatus { get; set; } + + /// <summary> /// 鏄惁閿佸畾 /// </summary> - public int IsLock { get; set; } + public YesNoEnum IsLock { get; set; } /// <summary> /// 鏄惁绌烘墭 /// </summary> - public YesNoEnum EmptyContainer { get; protected set; } + public YesNoEnum EmptyContainer { get; set; } /// <summary> /// 鍏ュ簱鏃堕棿 @@ -111,6 +116,22 @@ /// </summary> public virtual string Remark { get; set; } + + /// <summary> + /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ�� + /// </summary> + public string RedundantField1 { get; set; } + + /// <summary> + /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ�� + /// </summary> + public string RedundantField2 { get; set; } + + /// <summary> + /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ�� + /// </summary> + public string RedundantField3 { get; set; } + /// <summary> /// 鏄惁绂佺敤 /// </summary> -- Gitblit v1.9.3