From a4709a1df483a897aba358c3c52d1331997d8949 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 二月 2025 15:56:45 +0800
Subject: [PATCH] #修改 1. 物料分类选择显示问题修复
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 10 +++++-----
rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 11 ++++++-----
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 2 +-
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
index 6e5f23e..dffba6b 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
@@ -347,7 +347,7 @@
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="rglarId"
- reference="rglarId"
+ reference="batchRegular"
>
<AutocompleteInput
label="table.field.matnr.rglarId"
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index d90d6ff..9cf4ddd 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -163,7 +163,7 @@
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="rglarId"
- reference="rglarId"
+ reference="batchRegular"
perPage={REFERENCE_INPUT_PAGESIZE}
>
<AutocompleteInput
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 47c7b15..5f4ddcd 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -67,10 +67,10 @@
<TextInput source="name" label="table.field.matnr.name" />,
<TextInput source="code" label="table.field.matnr.code" />,
- <ReferenceInput source="shipperId" label="table.field.matnr.shipperId" reference="shipper">
+ <ReferenceInput source="shipperId$" label="table.field.matnr.shipperId" reference="shipper">
<AutocompleteInput label="table.field.matnr.shipperId" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <ReferenceInput source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" >
+ <ReferenceInput source="groupId$" label="table.field.matnr.groupId" reference="matnrGroup" >
<AutocompleteInput label="table.field.matnr.groupId" optionText="code" filterToQuery={(val) => ({ code: val })} />
</ReferenceInput>,
<ReferenceInput source="rglarId" label="table.field.matnr.rglarId" reference="rglarId">
@@ -151,13 +151,13 @@
<NumberField source="id" />
<TextField source="name" label="table.field.matnr.name" />
<TextField source="code" label="table.field.matnr.code" />
- <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
+ <ReferenceField source="shipperId$" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
- <ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
+ <ReferenceField source="groupId$" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
- <ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="rglarId" link={false} sortable={false}>
+ <ReferenceField source="rglarId$" label="table.field.matnr.rglarId" reference="batchRegular" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
<TextField source="erpCode" label="table.field.matnr.erpCode" />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 7e6e58b..99d544c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -6,6 +6,7 @@
import java.util.Date;
import com.vincent.rsf.server.manager.service.BatchRegularService;
+import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -327,10 +328,10 @@
// );
public String getShipperId$(){
- ShipperService service = SpringUtils.getBean(ShipperService.class);
- Shipper shipper = service.getById(this.shipperId);
- if (!Cools.isEmpty(shipper)){
- return String.valueOf(shipper.getName());
+ CompanysService service = SpringUtils.getBean(CompanysService.class);
+ Companys companys = service.getById(this.shipperId);
+ if (!Cools.isEmpty(companys)){
+ return String.valueOf(companys.getName());
}
return null;
}
@@ -344,7 +345,7 @@
return null;
}
- public String getRglarId(){
+ public String getRglarId$(){
BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
BatchRegular batchRegular = service.getById(this.rglarId);
if (!Cools.isEmpty(batchRegular)){
--
Gitblit v1.9.1