From 3ec65a96dd073e598e58c12fb0b5af31e38bc20e Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 14:48:51 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStocksExportModel.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStocksExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStocksExportModel.cs
index 46f79ea..e9a10eb 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStocksExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterialStocks/WmsMaterialStocksExportModel.cs
@@ -102,11 +102,16 @@
public string AreaName { get; set; }
/// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ public MaterialCheckStatusEnum? CheckStatus { get; set; }
+
+ /// <summary>
/// 閿佸畾鐘舵��
/// <para>0-鏈攣瀹� 1-宸查攣瀹�</para>
/// </summary>
[ExcelColumn(Name = "鏄惁閿佸畾", Width = 25)]
- public int IsLock { get; set; }
+ public YesNoEnum IsLock { get; set; }
/// <summary>
/// 鏄惁绌烘墭
--
Gitblit v1.9.3