From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index b953009..214c32b 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -125,11 +125,12 @@
             >
                 <StyledDatagrid
                     preferenceKey='warehouseAreasItem'
-                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+                    bulkActionButtons={false}
                     rowClick={(id, resource, record) => false}
                     omit={['id', 'createTime', 'memo', 'areaId', 'brand',  'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId']}
                 >
                     <NumberField source="id" />
+                    <TextField source="asnCode" label="table.field.warehouseAreasItem.asnCode" />
                     <NumberField source="areaId" label="table.field.warehouseAreasItem.areaId" />
                     <TextField source="areaName" label="table.field.warehouseAreasItem.areaName" />
                     <NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />
@@ -146,6 +147,7 @@
                     <TextField source="brand" label="table.field.warehouseAreasItem.brand" />
                     <TextField source="shipperId" label="table.field.warehouseAreasItem.shipperId"  />
                     <TextField source="splrId" label="table.field.warehouseAreasItem.splrId" />
+                    <TextField source="isptResult$" label="table.field.warehouseAreasItem.isptResult" sortable={false} />
                     <NumberField source="weight" label="table.field.warehouseAreasItem.weight" />
                     <TextField source="prodTime" label="table.field.warehouseAreasItem.prodTime" />
                     <TextField source="updateBy$" label="common.field.updateBy"  />

--
Gitblit v1.9.1