From 0330693f16b106cfd8dc451ff82b8a8ebdee8963 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期六, 29 三月 2025 16:29:55 +0800
Subject: [PATCH] feat:组盘
---
rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx | 6 +++++-
rsf-admin/src/page/waitPakin/WaitPakinList.jsx | 2 +-
rsf-admin/src/page/asnOrder/AsnWareModal.jsx | 1 +
rsf-admin/src/i18n/zh.js | 11 ++++++++---
rsf-admin/src/i18n/en.js | 4 ++++
rsf-admin/src/page/waitPakin/WaitPakinPanel.jsx | 10 +++++++++-
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 7 +++++++
7 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index a9f29d4..8f45034 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -623,6 +623,10 @@
maktx: "maktx",
matnrId: "matnrId",
matnrCode: "matnrCode",
+ asnId: "asnId",
+ asnCode: "asnCode",
+ asnItemId: "asnItemId",
+ trackCode: "trackCode",
anfme: "anfme",
workQty: "workQty",
unit: "unit",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 1a7617c..ea8aac8 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -512,6 +512,7 @@
poDetlCode: "PO鍗曠紪鐮�",
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
+ maktxCode: "鐗╂枡缂栫爜",
anfme: "鏁伴噺",
stockUnit: "搴撳瓨鍗曚綅",
purQty: "璁″垝鏀惰揣鏁伴噺",
@@ -622,7 +623,7 @@
code: "缂栫爜",
ansId: "鏀惰揣閫氱煡鍗曞彿",
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
- barcode: "鏉″舰鐮�",
+ barcode: "瀹瑰櫒鐮�",
anfme: "鏁伴噺",
ioStatus: "鐘舵��",
},
@@ -631,6 +632,10 @@
maktx: "鐗╂枡",
matnrId: "鐗╂枡id",
matnrCode: "鐗╂枡缂栫爜",
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
+ asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+ asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
+ trackCode: "鏉″舰鐮�",
anfme: "鏁伴噺",
workQty: "鎵ц涓暟閲�",
unit: "鍗曚綅",
@@ -641,14 +646,14 @@
waitPakinLog: {
pakinId: "缁勬墭Id",
code: "缂栫爜",
- barcode: "鏉″舰鐮�",
+ barcode: "瀹瑰櫒鐮�",
anfme: "鏁伴噺",
ioStatus: "鐘舵��",
},
waitPakinItemLog: {
pakinId: "缁勬墭Id",
pakinItemId: "缁勬墭鏄庣粏Id",
- ansId: "鏀惰揣閫氱煡鍗曞彿",
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
trackCode: "鏉″舰鐮�",
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 94bbfef..cce1a27 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -275,6 +275,13 @@
editable: true,
},
{
+ field: 'maktxCode',
+ headerName: translate('table.field.asnOrderItem.maktxCode'),
+ minWidth: 100,
+ flex: 1,
+ editable: true,
+ },
+ {
field: 'poDetlId',
headerName: translate('table.field.asnOrderItem.poDetlId'),
minWidth: 100,
diff --git a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
index 612eab5..63b4c63 100644
--- a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
@@ -69,6 +69,7 @@
return {
matnrId: el.id,
maktx: el.name,
+ maktxCode: el.code,
stockUnit: el.stockUnit || '',
purUnit: el.purchaseUnit || '',
...dynamicFields
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index eb097b3..b8cd4cd 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -127,7 +127,7 @@
<NumberField source="id" />
<TextField source="code" label="table.field.waitPakin.code" />
{/* <NumberField source="ansId" label="table.field.waitPakin.ansId" /> */}
- <TextField source="asnCode" label="table.field.waitPakin.asnCode" />
+ {/* <TextField source="asnCode" label="table.field.waitPakin.asnCode" /> */}
<TextField source="barcode" label="table.field.waitPakin.barcode" />
<NumberField source="anfme" label="table.field.waitPakin.anfme" />
<TextField source="ioStatus$" label="table.field.waitPakin.ioStatus" sortable={false} />
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinPanel.jsx b/rsf-admin/src/page/waitPakin/WaitPakinPanel.jsx
index e00ce74..433c2e8 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinPanel.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinPanel.jsx
@@ -47,7 +47,7 @@
{
field: 'maktx',
headerName: translate('table.field.waitPakinItem.maktx'),
- width: 300
+ width: 200
},
{
field: 'matnrId',
@@ -58,6 +58,14 @@
headerName: translate('table.field.waitPakinItem.matnrCode')
},
{
+ field: 'asnCode',
+ headerName: translate('table.field.waitPakinItem.asnCode')
+ },
+ {
+ field: 'trackCode',
+ headerName: translate('table.field.waitPakinItem.trackCode')
+ },
+ {
field: 'anfme',
headerName: translate('table.field.waitPakinItem.anfme')
},
diff --git a/rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx b/rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx
index d2935c3..492ade2 100644
--- a/rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx
+++ b/rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx
@@ -23,8 +23,12 @@
const [maktx, setMaktx] = useState('');
const pakinId = record.id;
+ useEffect(() => {
+ debouncedHttp({ maktx });
+ }, [pakinId, maktx]);
+
const http = async (parmas) => {
- const res = await request.post('/WaitPakinLog/page', { ...parmas, pakinId });
+ const res = await request.post('/waitPakinItemLog/page', { ...parmas, pakinId });
if (res?.data?.code === 200) {
setRows(res.data.data.records)
} else {
--
Gitblit v1.9.1