From d2fa8db4898426dd227113758f2b7b654dbe5387 Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Mon, 8 Sep 2025 17:26:53 +0800 Subject: [PATCH] =?UTF-8?q?2025-09-08=20=E7=8E=8B=E6=80=BB=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E6=A0=87=E7=AD=BE=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Impl/MaterialSplitServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java b/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java index 08cb3f7..cde4832 100644 --- a/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java @@ -1,10 +1,13 @@ package com.gaotao.modules.purchasingManagement.service.Impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.utils.DateUtil; import com.gaotao.modules.base.dao.BaseMapper; import com.gaotao.modules.base.entity.AccessSiteData; import com.gaotao.modules.base.entity.SiteData; +import com.gaotao.modules.factory.dao.TblBaseDataDao; +import com.gaotao.modules.factory.entity.TblBaseDataEntity; import com.gaotao.modules.pda.utils.ResponseData; import com.gaotao.modules.purchasingManagement.dao.MaterialSplitMapper; import com.gaotao.modules.purchasingManagement.entity.*; @@ -34,6 +37,9 @@ public class MaterialSplitServiceImpl implements MaterialSplitService { @Autowired private SysMsgService sysMsgService; + + @Autowired + private TblBaseDataDao baseDataDao; //============查询-卷信息========= @Override public List searchRollInformation(SearchRollInformationData indata){ @@ -522,6 +528,14 @@ public class MaterialSplitServiceImpl implements MaterialSplitService { List> printList = new ArrayList<>(); //根据条件查询打印的数据 Map printMap = materialSplitMapper.getSplitPrintMaterialRoll(inData); + //调用查询 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site", "ALL"); + queryWrapper.eq("type", "material_origin"); + TblBaseDataEntity materialData = baseDataDao.selectOne(queryWrapper); + //设置制造地 + String materialOrigin = materialData.getBaseData(); + printMap.put("materialOrigin", materialOrigin); printList.add(printMap); return printList; }