From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/locItem/LocItemList.jsx | 5 +++--
rsf-admin/src/page/waitPakin/SelectSiteModel.jsx | 5 +++--
rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx | 9 +++++++++
rsf-admin/src/i18n/zh.js | 6 ++++--
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 509be24..cd137a4 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -724,6 +724,7 @@
deviceCode: "璁惧缂栧彿",
deviceSite: "璁惧绔欑偣",
flagInit: "鏄惁鍒濆鍖�",
+ wcsCode: "wcs缂栧彿",
},
waitPakin: {
code: "缂栫爜",
@@ -809,7 +810,7 @@
orgSite: "婧愮珯鐐�",
targLoc: "鐩爣搴撲綅",
targSite: "鐩爣绔欑偣",
- barcode: "鎷栫洏鐮�",
+ barcode: "鎵樼洏鐮�",
robotCode: "鏈哄櫒缂栫爜",
exceStatus: "鎵ц鐘舵��",
expDesc: "寮傚父璇存槑",
@@ -827,7 +828,7 @@
orgSite: "婧愮珯鐐�",
targLoc: "鐩爣搴撲綅",
targSite: "鐩爣绔欑偣",
- barcode: "鎷栫洏鐮�",
+ barcode: "鎵樼洏鐮�",
robotCode: "鏈哄櫒缂栫爜",
exceStatus: "鎵ц鐘舵��",
expDesc: "寮傚父璇存槑",
@@ -900,6 +901,7 @@
},
locItem: {
locId: "搴撲綅ID",
+ locCode: "搴撲綅缂栫爜",
orderId: "璁㈠崟ID",
type: "鍗曟嵁绫诲瀷",
orderItemId: "鍗曟嵁鏄庣粏ID",
diff --git a/rsf-admin/src/page/locItem/LocItemList.jsx b/rsf-admin/src/page/locItem/LocItemList.jsx
index e215da0..95821c1 100644
--- a/rsf-admin/src/page/locItem/LocItemList.jsx
+++ b/rsf-admin/src/page/locItem/LocItemList.jsx
@@ -128,11 +128,12 @@
>
<StyledDatagrid
preferenceKey='locItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={() => <LocItemPanel />}
expandSingle={true}
- omit={['id', 'createTime','locId','workQty','qty', 'createBy', 'memo']}
+ omit={['id', 'createTime','locId','workQty','qty', 'createBy', 'memo','fieldsIndex','opt']}
+
>
<NumberField source="id" />
<NumberField source="locId" label="table.field.locItem.locId" />
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx
index 42a5404..123f364 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx
@@ -119,11 +119,20 @@
label="table.field.asnOrderItem.matnrId"
source="matnrId"
parse={v => v}
+ readOnly
/>
+ <TextInput
+ label="table.field.asnOrderItem.matnrCode"
+ source="matnrCode"
+ parse={v => v}
+ readOnly
+ />
+
<TextInput
label="table.field.asnOrderItem.maktx"
source="maktx"
parse={v => v}
+ readOnly
/>
<NumberInput
label="table.field.asnOrderItem.anfme"
diff --git a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
index 3c828af..bf21873 100644
--- a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
+++ b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
@@ -55,7 +55,7 @@
return (
<Box>
<Dialog
- sx={{width: '90%'}}
+ sx={{width: '100%'}}
open={open}
onClose={handleClose}
fullWidth
@@ -64,6 +64,7 @@
>
<DialogTitle>
{translate('toolbar.selectSite')}
+ <DialogCloseButton onClose={() => setOpen(false)} />
</DialogTitle>
<DialogContent>
<List
@@ -113,7 +114,7 @@
</WrapperField>
</StyledDatagrid>
</List>
- </DialogContent>
+ </DialogContent>
</Dialog>
</Box>
)
--
Gitblit v1.9.1