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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index e3e7a1f..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', 'createBy', 'memo', 'areaId', 'matnrId', 'batch', 'shipperId', 'splrId']}
+ 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" />
@@ -137,15 +138,18 @@
<TextField source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />
<TextField source="trackCode" label="table.field.warehouseAreasItem.barcode" />
<NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />
+ <NumberField source="workQty" label="table.field.warehouseAreasItem.workQty" />
+ <NumberField source="qty" label="table.field.warehouseAreasItem.qty" />
+ <TextField source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />
<TextField source="batch" label="table.field.warehouseAreasItem.batch" />
<TextField source="unit" label="table.field.warehouseAreasItem.unit" />
<TextField source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />
<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="splrBtch" label="table.field.warehouseAreasItem.splrBtch" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
--
Gitblit v1.9.1