From 3116311d2743ea81b4cfd8aa9aaeb58fd121a2a1 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期一, 26 一月 2026 09:56:00 +0800
Subject: [PATCH] 订单明细字段顺序优化
---
rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx | 26 ++++----
rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx | 2
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 12 ++-
rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx | 8 ++
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java | 1
rsf-admin/src/i18n/zh.js | 14 ++--
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx | 2
rsf-admin/src/page/histories/taskLog/TaskLogList.jsx | 2
rsf-admin/src/page/task/TaskPanel.jsx | 2
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx | 77 ++++++++++++++++++-------
11 files changed, 96 insertions(+), 52 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 6d68e04..23409cb 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -841,6 +841,8 @@
packName: "鍖呰",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
+ targetWarehouseId: "浠撳簱",
+ sourceWarehouseId: "璋冨嚭浠�",
},
outStockItem: {
orderId: "涓诲崟鏍囪瘑",
@@ -882,19 +884,19 @@
ntyStatus: "璐ㄦ涓婃姤鐘舵��",
},
asnOrderItemLog: {
- orderId: "涓诲崟鏍囪瘑",
- orderCode: "涓诲崟缂栫爜",
- platItemId: "erp鏍囪瘑",
+ orderId: "鍗曟嵁鏍囪瘑",
+ orderCode: "鍗曟嵁缂栫爜",
+ platItemId: "琛屽彿",
poDetlId: "PO鍗曟爣璇�",
poDetlCode: "PO鍗曠紪鐮�",
fieldsIndex: "瀛楁绱㈠紩",
matnrId: "鐗╂枡鏍囪瘑",
matnrCode: "鐗╂枡缂栫爜",
- maktx: "鐗╂枡",
- anfme: "璁″垝鏁伴噺",
+ maktx: "鐗╂枡鍚嶇О",
+ anfme: "搴旀敹鏁伴噺",
purQty: "閲囪喘鏁伴噺",
purUnit: "閲囪喘鍗曚綅",
- qty: "宸插畬鎴愭暟閲�",
+ qty: "瀹炴敹鏁伴噺",
splrCode: "渚涘簲鍟嗙紪鐮�",
splrBatch: "鎵规",
splrName: "渚涘簲鍟嗗悕绉�",
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
index dc87470..69f731c 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
@@ -141,11 +141,14 @@
preferenceKey='asnOrderItemLog'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'poDetlId', 'poCode', 'qrcode', 'packName', 'createTime', 'memo', 'fieldsIndex', 'matnrId', 'splrCode', 'status', 'createBy$']}
+ omit={['id', 'orderId', 'poDetlId', 'poCode', 'qrcode', 'packName', 'createTime', 'memo', 'fieldsIndex', 'matnrId', 'splrCode', 'status', 'createBy$',
+ 'asnId', 'purQty', 'purUnit', 'splrName', 'trackCode', 'ntyStatus$', 'asnCode'
+ ]}
>
<NumberField source="id" />
<NumberField source="asnId" label="table.field.asnOrderItemLog.orderId" />
<TextField source="asnCode" label="table.field.asnOrderItemLog.orderCode" />
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
<TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />
<NumberField source="poDetlId" label="table.field.asnOrderItemLog.poDetlId" />
<TextField source="poCode" label="table.field.asnOrderItemLog.poCode" />
@@ -153,18 +156,19 @@
<TextField source="matnrId" label="table.field.asnOrderItemLog.matnrId" />
<TextField source="matnrCode" label="table.field.asnOrderItemLog.matnrCode" />
<TextField source="maktx" label="table.field.asnOrderItemLog.maktx" />
+ <TextField source="splrBatch" label="table.field.asnOrderItemLog.splrBatch" />
<NumberField source="anfme" label="table.field.asnOrderItemLog.anfme" />
<NumberField source="purQty" label="table.field.asnOrderItemLog.purQty" />
<TextField source="purUnit" label="table.field.asnOrderItemLog.purUnit" />
<NumberField source="qty" label="table.field.asnOrderItemLog.qty" />
<TextField source="splrCode" label="table.field.asnOrderItemLog.splrCode" />
- <TextField source="splrBatch" label="table.field.asnOrderItemLog.splrBatch" />
<TextField source="splrName" label="table.field.asnOrderItemLog.splrName" />
<TextField source="qrcode" label="table.field.asnOrderItemLog.qrcode" />
<TextField source="trackCode" label="table.field.asnOrderItemLog.trackCode" />
<TextField source="packName" label="table.field.asnOrderItemLog.packName" />
<TextField source="ntyStatus$" label="table.field.asnOrderItemLog.ntyStatus" sortable={false} />
<TextField source="updateBy$" label="common.field.updateBy" />
+ <DateField source="updateTime" label="common.field.createTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
<TextField source="memo" label="common.field.memo" sortable={false} />
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx
index e737102..40e34de 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx
@@ -53,18 +53,23 @@
defaultValues={{}}
// validate={(values) => { }}
>
- <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={24} md={12} sx={{
- "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled":{
- bgcolor : 'white',
- WebkitTextFillColor: "rgba(0, 0, 0)"
+ <Grid container width={{ xs: '100%', xl: '100%' }} rowSpacing={3} columnSpacing={3}
+ sx={{
+ "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
+ bgcolor: 'white',
+ WebkitTextFillColor: "rgba(0, 0, 0)"
},
- "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled":{
- bgcolor : 'white',
- WebkitTextFillColor: "rgba(0, 0, 0)"
- }
- }}>
+ "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
+ bgcolor: 'white',
+ WebkitTextFillColor: "rgba(0, 0, 0)"
+ },
+ "& .MuiFilledInput-root.MuiInputBase-sizeSmall": {
+ bgcolor: 'white',
+ }
+ }}
+ >
+ <Grid item xs={24} md={12} >
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
@@ -76,24 +81,24 @@
parse={v => v}
readOnly
/>
- <TextInput
+ {/* <TextInput
label="table.field.asnOrderLog.poCode"
source="poCode"
readOnly
parse={v => v}
- />
- <NumberInput
+ /> */}
+ {/* <NumberInput
label="table.field.asnOrderLog.poId"
readOnly
source="poId"
- />
- <TextInput
+ /> */}
+ {/* <TextInput
label="table.field.asnOrderLog.type"
source="type$"
readOnly
parse={v => v}
validate={required()}
- />
+ /> */}
<TextInput
label="table.field.asnOrderLog.wkType"
source="wkType$"
@@ -101,8 +106,6 @@
parse={v => v}
validate={required()}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<NumberInput
label="table.field.asnOrderLog.anfme"
source="anfme"
@@ -115,7 +118,39 @@
readOnly
validate={required()}
/>
+ </Stack>
+ <Stack direction='row' gap={2}>
<TextInput
+ label="閲囪喘缁勭粐" //table.field.asnOrder.purchaseOrgName
+ source="purchaseOrgName"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="閲囪喘鍛�" //table.field.asnOrder.purchaseOrgName
+ source="purchaseUserName"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="閲囪喘鏃ユ湡" //table.field.asnOrder.purchaseOrgName
+ source="purchaseDate"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="渚涘簲鍟嗙紪鐮�" //table.field.asnOrder.purchaseOrgName
+ source="supplierId"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="渚涘簲鍟�" //table.field.asnOrder.purchaseOrgName
+ source="supplierName"
+ readOnly
+ parse={v => v}
+ />
+ {/* <TextInput
label="table.field.asnOrderLog.logisNo"
source="logisNo"
readOnly
@@ -136,17 +171,17 @@
{ id: 2, name: ' 閮ㄥ垎涓婃姤' },
]}
validate={required()}
- />
+ /> */}
</Stack>
</Grid>
</Grid>
</SimpleForm>
</Edit >
- <Grid item xs={24} md={16} sx={{ marginTop: '1em' }}>
+ {/* <Grid item xs={24} md={16} sx={{ marginTop: '1em' }}>
<Typography variant="h6" gutterBottom >
{translate('common.edit.title.common')}
</Typography>
- </Grid>
+ </Grid> */}
<AsnOrderItemLogList />
</>
)
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
index 382bfa6..d1aa9d9 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
@@ -170,8 +170,8 @@
<TextField source="supplierName" label="渚涘簲鍟�" />
<TextField source="ntyStatus$" label="table.field.asnOrderLog.ntyStatus" sortable={false} />
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="updateBy$" label="common.field.updateBy" />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
diff --git a/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx b/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
index 46226d0..aacaff6 100644
--- a/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
@@ -79,6 +79,19 @@
readOnly
/>
<TextInput
+ label="table.field.task.barcode"
+ source="barcode"
+ readOnly
+ parse={v => v}
+ />
+ <NumberInput
+ label="table.field.task.sort"
+ readOnly
+ source="sort"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
label="table.field.task.orgLoc"
source="orgLoc"
readOnly
@@ -96,24 +109,11 @@
readOnly
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.task.targSite"
source="targSite"
readOnly
parse={v => v}
- />
- <TextInput
- label="table.field.task.barcode"
- source="barcode"
- readOnly
- parse={v => v}
- />
- <NumberInput
- label="table.field.task.sort"
- readOnly
- source="sort"
/>
</Stack>
</Grid>
diff --git a/rsf-admin/src/page/histories/taskLog/TaskLogList.jsx b/rsf-admin/src/page/histories/taskLog/TaskLogList.jsx
index bf00454..da7d0df 100644
--- a/rsf-admin/src/page/histories/taskLog/TaskLogList.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskLogList.jsx
@@ -126,7 +126,7 @@
rowClick={'edit'}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'robotCode', 'exceStatus', 'sort', 'expCode']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'robotCode', 'exceStatus', 'sort', 'expCode', 'createBy$']}
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
index 7bd2671..d81c5aa 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
@@ -130,7 +130,7 @@
/>
<TextInput
label="閲囪喘鏃ユ湡" //table.field.asnOrder.purchaseOrgName
- source="purchaseDate"
+ source="businessTime"
readOnly
parse={v => v}
/>
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index ffe1aaf..e017e03 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -172,7 +172,7 @@
{/* 閾跺骇鏂板 */}
<TextField source="purchaseOrgName" label="閲囪喘缁勭粐" />
<TextField source="purchaseUserName" label="閲囪喘鍛�" />
- <TextField source="purchaseDate" label="閲囪喘鏃ユ湡" />
+ <DateField source="businessTime" label="閲囪喘鏃ユ湡" />
<TextField source="supplierId" label="渚涘簲鍟嗙紪鐮�" />
<TextField source="supplierName" label="渚涘簲鍟�" />
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 3c1578f..1e947d1 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -22,9 +22,10 @@
<TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //鐗╂枡鍚嶇О
<TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
<TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
+ <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
<NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
+ <TextField source="sourceWareHouseId" label="table.field.asnOrderItem.sourceWareHouseId" key="sourceWareHouseId" />, //璋冨嚭浠�
];
/**
@@ -42,9 +43,10 @@
<TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //鐗╂枡鍚嶇О
<TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
<TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
+ <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
- <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
+ <TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
];
/**
@@ -68,10 +70,10 @@
* @returns {Array} 灏鹃儴鍒楁暟缁�
*/
export const getLastColumns = () => [
- <DateField source="updateTime" label="common.field.updateTime" showTime key="updateTime" />,
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
<TextField source="nickname" />
</ReferenceField>,
+ <DateField source="updateTime" label="common.field.updateTime" showTime key="updateTime" />,
<ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false} key="createBy">
<TextField source="nickname" />
</ReferenceField>,
diff --git a/rsf-admin/src/page/task/TaskPanel.jsx b/rsf-admin/src/page/task/TaskPanel.jsx
index c9c429d..02e8bc6 100644
--- a/rsf-admin/src/page/task/TaskPanel.jsx
+++ b/rsf-admin/src/page/task/TaskPanel.jsx
@@ -67,8 +67,8 @@
<TextField source="sourceCode" label="table.field.taskItem.sourceCode" />
<NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />
<NumberField source="matnrId" label="table.field.taskItem.matnrId" />
- <TextField source="maktx" label="table.field.taskItem.maktx" />
<TextField source="matnrCode" label="table.field.taskItem.matnrCode" />
+ <TextField source="maktx" label="table.field.taskItem.maktx" />
<TextField source="unit" label="table.field.taskItem.unit" />
<NumberField source="anfme" label="table.field.taskItem.anfme" />
<TextField source="batch" label="table.field.taskItem.batch" />
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
index db4405e..4d823a4 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
@@ -94,6 +94,7 @@
JSONObject params = JSONObject.parseObject(JSON.toJSONString(order));
JSONObject mappedData = ParamsMapUtils.apiMaps("erp", "orderId", params);
+ mappedData.put("updateBy", "erp");
mapParams = objectToMap(mappedData);
maps.add(mapParams);
log.info("淇敼璁㈠崟淇℃伅鍙婄姸鎬侊細 {}锛� 璇锋眰鍙傛暟锛� {}", wmsUrl, JSONArray.toJSONString(maps));
--
Gitblit v1.9.1