From ae70754daf7c8542677d05506b066a7499ca95ad Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 30 一月 2026 08:59:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 12 ++++++------
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx | 5 ++++-
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx | 14 ++++++++++----
rsf-admin/src/i18n/zh.js | 8 ++++----
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 4 ++--
rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx | 10 +++++++---
rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx | 4 ++--
7 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 1fff9bb..96ff5d9 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -278,7 +278,7 @@
isWcs: '鏄惁WCS绔欑珯鐐�',
wcsData: 'wcs鏁版嵁',
containerType: '瀹瑰櫒绫诲瀷',
- barcode: '鏉＄爜',
+ barcode: '瀹瑰櫒缂栫爜',
autoTransfer: '鑷姩璋冩嫧',
},
host: {
@@ -465,7 +465,7 @@
flagMix: "鍏佽娣锋斁",
},
warehouseAreasItem: {
- asnCode: '鍗曞彿',
+ asnCode: '鍗曟嵁缂栫爜',
areaId: "搴撳尯ID",
areaName: "搴撳尯鍚嶇О ",
matnrId: "鐗╂枡鏍囪瘑",
@@ -1163,8 +1163,8 @@
sourceCode: "婧愬崟鎹�",
},
taskItemLog: {
- taskItemId: "taskItemId",
- taskId: "taskId",
+ taskItemId: "浠诲姟鏄庣粏鍙�",
+ taskId: "浠诲姟鍙�",
orderId: "璁㈠崟ID",
orderType: "鍗曟嵁绫诲瀷",
orderItemId: "璁㈠崟鏄庣粏ID",
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index 8b9e6dd..02ecb3c 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -133,16 +133,16 @@
omit={['id', 'createTime', 'createBy', 'memo', 'updateBy', 'autoTransfer']}
>
<NumberField source="id" />
- <TextField source="type$" label="table.field.basStation.type" />
+ {/* <TextField source="type$" label="table.field.basStation.type" /> */}
+ <FunctionField
+ source="type"
+ label="table.field.basStation.type"
+ render={record => record.type === 1 ? '鏅�氱珯鐐�' : '鏅鸿兘绔欑偣'}
+ />
<TextField source="stationName" label="table.field.basStation.stationName" />
<TextField source="stationId" label="table.field.basStation.stationId" />
<TextField source="useStatus$" label="table.field.basStation.useStatus" />
<TextField source="barcode" label="table.field.basStation.barcode" />
- <FunctionField
- source="type"
- label="table.field.basStation.type"
- render={record => record.type === 1 ? '鏃犲厜鐢�' : '鍏夌數'}
- />
<FunctionField
source="inAble"
label="table.field.basStation.inAble"
diff --git a/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx b/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
index e571383..4ca857f 100644
--- a/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
@@ -124,18 +124,22 @@
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'trackCode', 'spec', 'model']}
>
<NumberField source="id" />
<NumberField source="taskId" label="table.field.taskItemLog.taskId" />
<NumberField source="orderId" label="table.field.taskItemLog.orderId" />
<TextField source="orderType" label="table.field.taskItemLog.orderType" />
<NumberField source="orderItemId" label="table.field.taskItemLog.orderItemId" />
+ <NumberField source="orderType$" label="table.field.taskItem.orderType" />,
+ <NumberField source="wkType$" label="table.field.taskItem.wkType" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />,
+ <TextField source="trackCode" label="table.field.taskItemLog.trackCode" />
<NumberField source="source" label="table.field.taskItemLog.source" />
<NumberField source="matnrId" label="table.field.taskItemLog.matnrId" />
<TextField source="maktx" label="table.field.taskItemLog.maktx" />
- <TextField source="matnrCode" label="table.field.taskItemLog.matnrCode" />
- <TextField source="trackCode" label="table.field.taskItemLog.trackCode" />
+ <TextField source="matnrCode" label="table.field.taskItemLog.matnrCode" />
<TextField source="unit" label="table.field.taskItemLog.unit" />
<NumberField source="anfme" label="table.field.taskItemLog.anfme" />
<TextField source="batch" label="table.field.taskItemLog.batch" />
diff --git a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
index 68179fb..5706485 100644
--- a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
@@ -132,9 +132,9 @@
<TextField source="id" />
</ReferenceField>
<NumberField source="pakinItemId" label="table.field.waitPakinItemLog.pakinItemId" />
- <NumberField source="asnId" label="table.field.waitPakinItemLog.asnId" />
+ {/* <NumberField source="asnId" label="table.field.waitPakinItemLog.asnId" />
<TextField source="asnCode" label="table.field.waitPakinItemLog.asnCode" />
- <NumberField source="asnItemId" label="table.field.waitPakinItemLog.asnItemId" />
+ <NumberField source="asnItemId" label="table.field.waitPakinItemLog.asnItemId" /> */}
<TextField source="trackCode" label="table.field.waitPakinItemLog.trackCode" />
<TextField source="maktx" label="table.field.waitPakinItemLog.maktx" />
<ReferenceField source="matnrId" label="table.field.waitPakinItemLog.matnrId" reference="matnr" link={false} sortable={false}>
diff --git a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx
index 33c6fcd..1ba7171 100644
--- a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx
@@ -76,12 +76,12 @@
{translate('common.edit.title.main')}
</Typography>
<Stack direction='row' gap={2}>
- <NumberInput
+ {/* <NumberInput
label="table.field.waitPakinLog.pakinId"
source="pakinId"
readOnly
autoFocus
- />
+ /> */}
<TextInput
label="table.field.waitPakinLog.code"
source="code"
@@ -99,7 +99,13 @@
readOnly
source="anfme"
/>
- <SelectInput
+ <TextInput
+ label="table.field.waitPakin.ioStatus"
+ readOnly
+ source="ioStatus$"
+ parse={v => v}
+ />
+ {/* <SelectInput
label="table.field.waitPakinLog.ioStatus"
source="ioStatus"
readOnly
@@ -108,7 +114,7 @@
{ id: 1, name: ' 鍏ュ簱涓�' },
]}
validate={required()}
- />
+ /> */}
</Stack>
</Grid>
</Grid>
diff --git a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
index e2e6e12..876773e 100644
--- a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
@@ -115,7 +115,7 @@
rowClick={'edit'}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
+ omit={['id', 'pakinId', 'createTime', 'createBy', 'memo','statusBool']}
>
<NumberField source="id" />
<NumberField source="pakinId" label="table.field.waitPakinLog.pakinId" />
@@ -133,6 +133,9 @@
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} />
+ </WrapperField>
</StyledDatagrid>
</List>
<PageDrawer
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index e5bc9bf..3e6af78 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -193,7 +193,7 @@
<TextField key="unit" source="unit" label="table.field.warehouseAreasItem.unit" />,
<NumberField key="anfme" source="anfme" label="table.field.warehouseAreasItem.anfme" />,
<NumberField key="workQty" source="workQty" label="table.field.warehouseAreasItem.workQty" />,
- <NumberField key="qty" source="qty" label="table.field.warehouseAreasItem.qty" />,
+ <NumberField key="ableQty" source="ableQty" label="table.field.warehouseAreasItem.qty" />,
<TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
<TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
// <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
@@ -215,8 +215,8 @@
]
const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
const lastArr = [
- <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,
<TextField key="updateBy" source="updateBy$" label="common.field.updateBy" />,
+ <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,
<TextField key="createBy" source="createBy$" label="common.field.createBy" />,
<DateField key="createTime" source="createTime" label="common.field.createTime" showTime />,
<BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />,
--
Gitblit v1.9.1