From f4f9cd966b0353323636c7aa19b38a6bb3f9936e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 18:26:24 +0800
Subject: [PATCH] no message
---
rsf-admin/src/page/basicInfo/loc/BindModal.jsx | 12 ++++++------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 6 +++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 5 +++++
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/BindModal.jsx b/rsf-admin/src/page/basicInfo/loc/BindModal.jsx
index dac65d2..6eca745 100644
--- a/rsf-admin/src/page/basicInfo/loc/BindModal.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/BindModal.jsx
@@ -76,16 +76,17 @@
const refresh = useRefresh();
const translate = useTranslate();
const notify = useNotify();
- const [options, setOptions] = useState[{
+ const [options, setOptions] = useState({
condition: null
- }];
+ });
+
const [formData, setFormData] = useState({
areaMatId: null,
groupId: null,
matnrId: null,
});
- const { selectedIds, onUnselectItems } = useListContext();
+ const { selectedIds, onUnselectItems, onSelectAll } = useListContext();
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
@@ -177,15 +178,14 @@
onChange={(e) => handleChange(e.target.value, 'groupId')}
/>
</Grid>
- <Grid item xs={4}>
- <TextInput></TextInput>
- </Grid>
+
</Grid>
<Grid item xs={4}>
<List
resource="matnr"
filter={{ groupId: formData.groupId }}
empty={false}
+ queryOptions={{options}}
actions={<></>}
>
<StyledDatagrid
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index fb9005b..9267a9d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -157,10 +157,14 @@
.setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
.setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))
.setAnfme(item.getAnfme() + "")
- .setMaktx(item.getMaktx()).setMemo(item.getMemo())
+ .setMaktx(item.getMaktx())
+ .setMemo(item.getMemo())
.setMatnrCode(item.getMatnrCode())
.setPoCode(item.getPoCode())
+ .setSplrName(item.getSplrName())
.setPoId(order.getPoId() + "")
+ .setTrackCode(item.getTrackCode())
+ .setBarcode(item.getBarcode())
.setPackName(item.getPackName())
.setPlatItemId(item.getPlatItemId())
.setSplrBatch(item.getSplrBatch())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index c1ffab9..1a89bd4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -134,6 +134,11 @@
@ExcelComment(value = "barcode",example = "2354788")
private String barcode;
+ @Excel(name = "璺熻釜鐮�")
+ @ApiModelProperty("璺熻釜鐮�")
+ @ExcelComment(value = "trackCode",example = "2354788")
+ private String trackCode;
+
@Excel(name = "鍖呰鍚嶇О")
@ApiModelProperty("鍖呰鍚嶇О")
@ExcelComment(value = "packName",example = "绠�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 2edc657..768ef85 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -123,6 +123,8 @@
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
.setQty(Double.parseDouble(orderTemplate.getQty()))
.setSplrName(orderTemplate.getSplrName())
+ .setBarcode(orderTemplate.getBarcode())
+ .setTrackCode(orderTemplate.getTrackCode())
.setSplrCode(orderTemplate.getSplrCode())
.setPoCode(orderTemplate.getPoCode())
.setMaktx(orderTemplate.getMaktx())
--
Gitblit v1.9.1