From bf09baa9de79b67eec9aa72987c0fc325bc7241a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 09:57:48 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj | 6 ++++++
HIAWms/web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx | 8 ++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj
index b614f20..a934332 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/CMS.Plugin.HIAWms.Application.csproj
@@ -18,4 +18,10 @@
<ProjectReference Include="..\CMS.Plugin.HIAWms.Domain\CMS.Plugin.HIAWms.Domain.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Reference Include="CmsQueryExtensions">
+ <HintPath>..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+
</Project>
diff --git a/HIAWms/web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx b/HIAWms/web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
index f208e22..0aef04f 100644
--- a/HIAWms/web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
+++ b/HIAWms/web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
@@ -131,6 +131,14 @@
label: item.description,
value: item.value,
}))
+
+ const yesNoData = await getWmsEnumData({
+ EnumName: 'YesNoEnum',
+ })
+ enumOptions.yesOrNo = yesNoData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
} catch (error) {
console.error('鑾峰彇鏋氫妇鏁版嵁澶辫触:', error)
}
--
Gitblit v1.9.3