diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java index 85bb9d5dd8..45002fafdd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java @@ -54,9 +54,9 @@ public class AppIndexEnum { JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"), FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"), DYBL("ab7df5a0-9708-48b1-b58a-60d7e024d0a2", "抵押办理"), - WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕-售后"), - SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架-售后"), - PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收-售后"), + WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕"), + SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架"), + PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收"), ; /** diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java index 2713c73edd..e66023aa45 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java @@ -50,6 +50,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.ParseException; @@ -291,16 +293,28 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { @Override public void downloadExcel() { - List list = new ArrayList<>(); - //定义导出的excel名字 - String excelName = "专项返利管理导入模板"; - String fileNameURL = ""; try { - fileNameURL = URLEncoder.encode(excelName, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("static/专项返利模版.xls"); + //获取要下载的模板名称 + String fileName = "专项返利模版.xls"; + response.setHeader("content-type", "application/octet-stream"); + response.setContentType("application/octet-stream"); + // 下载文件能正常显示中文 + fileName = URLEncoder.encode(fileName, "UTF-8"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setHeader("fileName", fileName); + response.setHeader("Access-Control-Expose-Headers", "filename"); + OutputStream out = response.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = resourceAsStream.read(b)) != -1) { + out.write(b, 0, len); + } + out.close(); + resourceAsStream.close(); + } catch (Exception ex) { + ex.printStackTrace(); } - ExportExcelUtils.export(fileNameURL, list, DownloadExcelVo.class, response); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index e068dfaab2..4b990a3dd5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -1014,6 +1014,9 @@ public class ScmSpecialRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (OneExcelInfo info : infos) { if (StringUtils.isNotBlank(info.getUploadDate()) && StringUtils.isNotBlank(info.getUploadMoney())) { + if (StringUtils.isBlank(info.getRemarks())){ + info.setRemarks(""); + } ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName(), info.getRemarks()); String uploadDate = ""; if (isNumber(info.getUploadDate())) { @@ -1327,6 +1333,9 @@ public class ScmSpecialRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (TwoExcelInfo info : infos) { if (StringUtils.isNotBlank(info.getSecondaryUploadDate()) && StringUtils.isNotBlank(info.getSecondaryUploadMoney())) { + if (StringUtils.isBlank(info.getRemarks())){ + info.setRemarks(""); + } ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName(), info.getRemarks()); String secondaryUploadDate = ""; if (isNumber(info.getSecondaryUploadDate())) { @@ -1806,6 +1826,9 @@ public class ScmSpecialRebateService extends MybatisBaseService listPage(PagerQuery pq) { WmsShelfBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -855,7 +856,7 @@ public class WmsShelfBillService extends MybatisBaseService data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData(); for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) { - cost = receiptBillDetail.getCost(); + cost = receiptBillDetail.getCost(); if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"))); @@ -958,15 +959,26 @@ public class WmsShelfBillService extends MybatisBaseService