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; }