From 6ca8cf6f5713c27aa499388cbb73a43d92901a85 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 02 四月 2025 10:59:11 +0800
Subject: [PATCH] feat:质检单物料编码
---
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 8 ++++----
rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx | 8 +++++++-
rsf-admin/src/page/asnOrder/AsnWareModal.jsx | 2 +-
rsf-admin/src/page/qlyInspect/QlyInspectList.jsx | 4 ++--
rsf-admin/src/i18n/zh.js | 5 +++--
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 2 +-
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 4 ++--
8 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 8e79beb..b790701 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -436,6 +436,7 @@
disQty: "disQty",
safeQty: "safeQty",
picPath: "picPath",
+ trackCode: "trackCode",
},
dictType: {
code: "Code",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 1546884..06efe6e 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -422,7 +422,7 @@
qlyInspect: {
asnId: "鏀惰揣閫氱煡鍗曞彿",
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
- code: "缂栫爜",
+ code: "璐ㄦ鍗曠紪鐮�",
wkType: "涓氬姟绫诲瀷",
safeQty: "鍚堟牸鏁伴噺",
dlyQty: "閫佽揣鏁伴噺",
@@ -445,6 +445,7 @@
disQty: "涓嶅悎鏁伴噺",
safeQty: "鍚堟牸鏁伴噺",
picPath: "鍥剧墖璺緞",
+ trackCode: "鏉″舰鐮�",
},
dictType: {
code: "瀛楀吀缂栫爜",
@@ -520,7 +521,7 @@
poDetlCode: "PO鍗曠紪鐮�",
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
- maktxCode: "鐗╂枡缂栫爜",
+ matnrCode: "鐗╂枡缂栫爜",
anfme: "鏁伴噺",
stockUnit: "搴撳瓨鍗曚綅",
purQty: "璁″垝鏀惰揣鏁伴噺",
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 1f301cd..9bb5800 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -264,8 +264,8 @@
editable: false,
},
{
- field: 'maktxCode',
- headerName: translate('table.field.asnOrderItem.maktxCode'),
+ field: 'matnrCode',
+ headerName: translate('table.field.asnOrderItem.matnrCode'),
width: 130,
editable: false,
},
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 2b674ec..221fe55 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -59,10 +59,10 @@
field: 'poDetlCode',
headerName: translate('table.field.asnOrderItem.poDetlCode')
},
- // {
- // field: 'matnrCode',
- // headerName: translate('table.field.asnOrderItem.matnrCode')
- // },
+ {
+ field: 'matnrCode',
+ headerName: translate('table.field.asnOrderItem.matnrCode')
+ },
{
field: 'maktx',
headerName: translate('table.field.asnOrderItem.maktx'),
diff --git a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
index 3c08bfe..08e80dd 100644
--- a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
@@ -71,7 +71,7 @@
return {
matnrId: el.id,
maktx: el.name,
- maktxCode: el.code,
+ matnrCode: el.code,
stockUnit: el.stockUnit || '',
purUnit: el.purchaseUnit || '',
...dynamicFields
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
index 0cb65c3..b30ce29 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
@@ -129,11 +129,11 @@
omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool']}
>
<NumberField source="id" />
- <NumberField source="asnId" label="table.field.qlyInspect.asnId" />
- <NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
<TextField source="code" label="table.field.qlyInspect.code" />
<TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
<TextField source="wkType$" label="table.field.qlyInspect.wkType" />
+ <NumberField source="asnId" label="table.field.qlyInspect.asnId" />
+ <NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
<NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
<NumberField source="dlyQty" label="table.field.qlyInspect.dlyQty" />
<NumberField source="rcptQty" label="table.field.qlyInspect.rcptQty" />
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
index 6abfaa5..e28b83f 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
@@ -47,7 +47,8 @@
},
{
field: 'matnrCode',
- headerName: translate('table.field.qlyIsptItem.matnrCode')
+ headerName: translate('table.field.qlyIsptItem.matnrCode'),
+ width: 200
},
{
field: 'maktx',
@@ -55,6 +56,11 @@
width: 200
},
// {
+ // field: 'trackCode',
+ // headerName: translate('table.field.qlyIsptItem.trackCode'),
+ // width: 200
+ // },
+ // {
// field: 'label',
// headerName: translate('table.field.qlyIsptItem.label')
// },
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index 566972b..999b8d4 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -135,7 +135,7 @@
<NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />
<TextField source="matnrName" label="table.field.warehouseAreasItem.matnrName" />
<TextField source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />
- <TextField source="trackCode" label="table.field.warehouseAreasItem.barcode" />
+ <TextField source="barcode" label="table.field.warehouseAreasItem.barcode" />
<NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />
<TextField source="batch" label="table.field.warehouseAreasItem.batch" />
<TextField source="unit" label="table.field.warehouseAreasItem.unit" />
--
Gitblit v1.9.1