From 054c4b3be788b870026fdd1da916be18931161e7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 30 4月 2025 16:24:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts b/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts
index fc700db..2b0e6f5 100644
--- a/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts
+++ b/HIAWms/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/Config.ts
@@ -5,12 +5,56 @@
     title: '搴忓彿',
   },
   {
-    field: 'name',
-    title: '鍚嶇О',
+    field: 'materialCode',
+    title: '鐗╂枡缂栫爜',
   },
   {
-    field: 'code',
-    title: '缂栧彿',
+    field: 'materialName',
+    title: '鐗╂枡鍚嶇О',
+  },
+  {
+    field: 'purchaseTypeDesc',
+    title: '閲囪喘绫诲瀷',
+  },
+  {
+    field: 'materialTypeDesc',
+    title: '鐗╂枡绫诲瀷',
+  },
+  {
+    field: 'primaryUnit',
+    title: '涓诲崟浣�',
+  },
+  {
+    field: 'standard',
+    title: '瑙勬牸/鏍囧噯',
+  },
+  {
+    field: 'outerDiameter',
+    title: '澶栧緞(mm)',
+  },
+  {
+    field: 'wallThickness',
+    title: '澹佸帤(mm)',
+  },
+  {
+    field: 'materialQuality',
+    title: '鏉愯川',
+  },
+  {
+    field: 'length',
+    title: '闀垮害(m)',
+  },
+  {
+    field: 'isMainBranchDesc',
+    title: '鏄惁涓绘敮绠�',
+  },
+  {
+    field: 'factory',
+    title: '鐢熶骇宸ュ巶',
+  },
+  {
+    field: 'certification',
+    title: '璇佷功缂栧彿',
   },
   {
     field: 'remark',

--
Gitblit v1.9.3