From d2e0994f67495fd436a2e8ad02cb7e4a7e53fe0c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 08:04:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 15 +++++++++++----
rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx | 28 ++++++++++++++++++++++------
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
index feaa543..99d2114 100644
--- a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
@@ -60,8 +60,24 @@
const refresh = useRefresh();
const translate = useTranslate();
const notify = useNotify();
- const contentRef = useRef(null);
- const reactToPrintFn = useReactToPrint({ contentRef });
+ const contentRef = useRef();
+ const reactToPrintFn = useReactToPrint({
+ content: () => {
+ return contentRef.current
+ },
+ documentTitle: `鐗╂枡淇℃伅`,
+ pageStyle: `
+ @page {
+
+ margin: 10mm;
+ }
+ @media print {
+ html, body {
+ width: 70mm; // A4妯悜瀹藉害
+ height: 40mm; // A4妯悜楂樺害
+ }
+ }`
+ });
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
@@ -259,11 +275,11 @@
colSpan={9}
style={{ border: '1px solid black' }}
>
- <img id={"barcode" + item.code} style={{ width: '70%', verticalAlign: 'middle' }} />
- {/* <img className="template-code" src={item.barcode} style={{ width: '90%', verticalAlign: 'middle' }} alt="Barcode" /> */}
- {/* <div style={{ letterSpacing: '2px', marginTop: '1px', textAlign: 'center' }}>
+ {/* <img id={"barcode" + item.code} style={{ width: '70%', verticalAlign: 'middle' }} /> */}
+ <img className="template-code" src={item.barcode} style={{ width: '90%', verticalAlign: 'middle' }} alt="Barcode" />
+ <div style={{ letterSpacing: '2px', marginTop: '1px', textAlign: 'center' }}>
<span>{item.code}</span>
- </div> */}
+ </div>
</td>
</tr>
<tr style={{ height: '74px' }}>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index 52bc2c6..7026595 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -108,17 +108,24 @@
@Override
public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
- QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
+ List<Long> longs = new ArrayList<>();
if (params.containsKey("groupId")) {
Object groupId = params.get("groupId");
- if (!Objects.isNull(groupId)) {
+ MatnrGroup group = matnrGroupService.getById(groupId.toString());
+ if (null != group){
+ pageParam.getWhere().getMap().remove("groupId");
List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString())).select(MatnrGroup::getId));
if (!matnrGroups.isEmpty()) {
- List<Long> longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
- queryWrapper.or().in("group_id", longs);
+ longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+
}
+ longs.add(group.getId());
+
}
}
+ QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.in(!longs.isEmpty(),"group_id", longs);
+
FieldsUtils.setFieldsFilters(queryWrapper,pageParam,Matnr.class);
/**鎷兼帴鎵╁睍瀛楁*/
PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
--
Gitblit v1.9.1