diff --git a/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_0.xml b/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_0.xml new file mode 100644 index 000000000..46d27cf2e --- /dev/null +++ b/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml new file mode 100644 index 000000000..533141392 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml new file mode 100644 index 000000000..89e6c4e7a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml new file mode 100644 index 000000000..2d1d8624f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml new file mode 100644 index 000000000..6cab06b09 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml new file mode 100644 index 000000000..e0fdd8892 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml new file mode 100644 index 000000000..d43695aff --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml new file mode 100644 index 000000000..e546a7032 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml new file mode 100644 index 000000000..f86b60492 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml new file mode 100644 index 000000000..6ba999492 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml new file mode 100644 index 000000000..1b830c7df --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml new file mode 100644 index 000000000..c18bd43d1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml new file mode 100644 index 000000000..f9d2e9f36 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml new file mode 100644 index 000000000..b7622ee2f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml new file mode 100644 index 000000000..69fec826b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml new file mode 100644 index 000000000..71dd6dfde --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml new file mode 100644 index 000000000..ec79cab5f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml new file mode 100644 index 000000000..6be66b8c1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml new file mode 100644 index 000000000..6f865af63 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml new file mode 100644 index 000000000..55c255c97 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml new file mode 100644 index 000000000..9aadd291d --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml b/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml new file mode 100644 index 000000000..6baf5e019 --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml index 177ff31a8..ffe94dde5 100644 --- a/emis-biz-web/emis-biz-web.iml +++ b/emis-biz-web/emis-biz-web.iml @@ -271,5 +271,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index ee228b785..ecd8de9e7 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -22,6 +22,7 @@ import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.deepoove.poi.XWPFTemplate; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.config.PayConfig; import com.xdadan.erp.common.core.domain.entity.SysUser; @@ -48,8 +49,10 @@ import com.xdadan.erp.system.service.ISysUserService; import com.xdadan.erp.system.service.impl.SysUserServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; import org.springframework.dao.DuplicateKeyException; import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; @@ -227,6 +230,37 @@ public class EmisWaybillController extends EmisBaseController } + /** + * 导出进仓单模板 + * @param response + * @param inNo + * @return + */ + @Log(title = "导出进仓单", businessType = BusinessType.EXPORT) + @PostMapping("/exportWarehouseInTpl") + public void downWsInTpl(HttpServletResponse response,String inNo) { + + try{ + Map tempMap = new HashMap<>(); + tempMap.put("name", "模版"); + tempMap.put("age", 134); + OutputStream outputStream=response.getOutputStream(); + InputStream fis = new ClassPathResource("tpl/ws_in_tpl.docx").getInputStream(); + /*1.根据模板生成文档*/ + XWPFTemplate template = XWPFTemplate.compile(fis).render(tempMap); + response.setContentType("application/octet-stream"); + response.setHeader("Content-Disposition", "attachment;fileName="+ inNo +".docx"); + response.flushBuffer(); + template.write(response.getOutputStream()); + + IOUtils.closeQuietly(fis); + IOUtils.closeQuietly(outputStream); + + }catch (Exception ex){ + ex.printStackTrace(); + } + } + @Log(title = "运单实时下单", businessType = BusinessType.INSERT) @PostMapping(value = "/realSubmitOrder") public AjaxResult realSubmitOrder(@Valid @RequestBody WaybillOrder waybillOrder,Integer isModify) diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml index 6cf93f9e5..b7343c0ef 100644 --- a/emis-biz/emis-biz.iml +++ b/emis-biz/emis-biz.iml @@ -230,5 +230,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml index 34178f63e..7ca3d8020 100644 --- a/emis-biz/pom.xml +++ b/emis-biz/pom.xml @@ -121,6 +121,12 @@ + + com.deepoove + poi-tl + 1.12.0 + + diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java index 8356913f9..28c9835ad 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.mapper; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.common.core.cache.MybatisRedisCache; import com.xdadan.erp.emis.domain.EmisSite; @@ -42,6 +44,13 @@ public interface EmisSiteMapper extends BaseMapper */ public List selectEmisSiteList(EmisSite emisSite); + /** + * 网点作为仓库 + * @param emisSite + * @return + */ + public List selectEmisSiteListAsWarehouse(EmisSite emisSite); + /** * 新增 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java index e310227ec..a9b5abbea 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java @@ -10,6 +10,8 @@ package com.xdadan.erp.emis.service; import java.util.List; +import java.util.Map; + import com.xdadan.erp.emis.domain.EmisSite; /** @@ -35,6 +37,14 @@ public interface IEmisSiteService */ public List selectEmisSiteList(EmisSite emisSite); + + /** + * 网点作为仓库 + * @param emisSite + * @return + */ + public List selectEmisSiteListAsWarehouse(EmisSite emisSite); + /** * 新增网点 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java index 5f9780149..9d92f34e6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java @@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service.impl; import java.util.Date; import java.util.List; +import java.util.Map; import com.xdadan.erp.emis.domain.EmisDestination; import com.xdadan.erp.emis.domain.EmisRegion; @@ -70,6 +71,12 @@ public class EmisSiteServiceImpl extends EmisBaseService implements IEmisSiteSer return emisSiteMapper.selectEmisSiteList(emisSite); } + @Override + public List selectEmisSiteListAsWarehouse(EmisSite emisSite) + { + return emisSiteMapper.selectEmisSiteListAsWarehouse(emisSite); + } + /** * 新增网点 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java new file mode 100644 index 000000000..51bc102d3 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java @@ -0,0 +1,33 @@ +package com.xdadan.erp.emis.service.warehouse; + +import com.deepoove.poi.XWPFTemplate; +import org.apache.http.HttpResponse; + +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +public class WordTplUtils { + + public void genWord(OutputStream out, String tplFile, Map fillMap) throws IOException { + // 数据转换 + // 文件名称 +// String fileName = URLEncoder.encode("文件名称", StandardCharsets.UTF_8.name()); + // 指示响应内容的格式 + +// response.setContentType("application/octet-stream"); +// response.setCharacterEncoding("utf-8"); +// response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".docx"); +//​ + XWPFTemplate template = XWPFTemplate.compile(tplFile); + +// XWPFTemplate template = getTemplate(filePath)) { + // 数据填充 + template.render(fillMap); + template.write(out); + out.flush(); + + } +} diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml index 7de3aafac..7d66e235c 100644 --- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml @@ -298,14 +298,23 @@ - - + select + site_code as code, + site_name as name, + principal as contact, + manager_phone as tel, + address as address from emis_site a - where a.id = #{id} + where a.del_flag='0' and bl_warehouse_in='1' + and site_name like concat('%', #{searchValue}, '%') + + + +