wms-master.git - Gitblit

			@@ -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' }}>

			@@ -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);

	rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史