From 7a6d4b264dd74457e64b13d8561c33390ae5a4d5 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Thu, 24 Nov 2022 19:08:47 +0800 Subject: [PATCH] 2 --- .../PurchaseRequisitionPro.java | 5 +- .../PurchaseRequisitionProDetailsVo.java | 5 +- .../PurchaseRequisitionProDto.java | 5 +- .../PurchaseRequisitionProQuery.java | 5 +- .../PurchaseRequisitionProVo.java | 5 +- .../InventoryInformationRest.java | 59 ---- .../InventoryInformationService.java | 76 ----- .../biz/productnum/ProductNumMapper.java | 2 + .../portal/biz/productnum/ProductNumRest.java | 61 +++- .../biz/productnum/ProductNumService.java | 295 +++++++++++++++++- .../PurchaseRequisitionMapper.java | 9 + .../PurchaseRequisitionService.java | 71 ++++- .../PurchaseRequisitionProMapper.java | 11 + .../PurchaseRequisitionProService.java | 10 + .../src/main/resources/application.yml | 2 +- 15 files changed, 456 insertions(+), 165 deletions(-) diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionPro.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionPro.java index 0d38742d..1005e091 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionPro.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionPro.java @@ -90,5 +90,8 @@ public class PurchaseRequisitionPro extends BaseEntity { private String brandCode; // 品牌编码 @ApiModelProperty("发货日期") private String issuanceDate; // 发货日期 - + @ApiModelProperty("第二代码") + private String secondCode;// 第二代码 + @ApiModelProperty("零售金额") + private String retailAmount;// 零售金额 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDetailsVo.java index 4ee200f2..90e96553 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDetailsVo.java @@ -109,5 +109,8 @@ public class PurchaseRequisitionProDetailsVo implements Vo { private String brandCode; // 品牌编码 @ApiModelProperty("发货日期") private String issuanceDate; // 发货日期 - + @ApiModelProperty("第二代码") + private String secondCode;// 第二代码 + @ApiModelProperty("零售金额") + private String retailAmount;// 零售金额 } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDto.java index 1c281a6f..cef56e15 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProDto.java @@ -109,5 +109,8 @@ public class PurchaseRequisitionProDto implements Dto { private String brandCode; // 品牌编码 @ApiModelProperty("发货日期") private String issuanceDate; // 发货日期 - + @ApiModelProperty("第二代码") + private String secondCode;// 第二代码 + @ApiModelProperty("零售金额") + private String retailAmount;// 零售金额 } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProQuery.java index 0febf588..2478f698 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProQuery.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProQuery.java @@ -107,5 +107,8 @@ public class PurchaseRequisitionProQuery implements Query { private String brandCode; // 品牌编码 @ApiModelProperty("发货日期") private String issuanceDate; // 发货日期 - + @ApiModelProperty("第二代码") + private String secondCode;// 第二代码 + @ApiModelProperty("零售金额") + private String retailAmount;// 零售金额 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProVo.java index 378cbc4b..87d1ddce 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisitionpro/PurchaseRequisitionProVo.java @@ -91,5 +91,8 @@ public class PurchaseRequisitionProVo implements Vo { private String brandCode; // 品牌编码 @ApiModelProperty("发货日期") private String issuanceDate; // 发货日期 - + @ApiModelProperty("第二代码") + private String secondCode;// 第二代码 + @ApiModelProperty("零售金额") + private String retailAmount;// 零售金额 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationRest.java index 215ddc89..4d0029dd 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationRest.java @@ -123,63 +123,4 @@ public class InventoryInformationRest implements InventoryInformationFeign { inventoryInformationService.readBrandPeriodSorXlsForDictCommon(in,""); return rb; } - @ApiOperation(" ") - @RequestMapping(value = "/exportExcel", method = RequestMethod.GET) - public ResultBean exportExcel(HttpServletRequest request, HttpServletResponse response){ - ResultBean rb = ResultBean.fireFail(); //excel标题 - - - //excel文件名 - - String fileName = "采购订单商品明细表"+System.currentTimeMillis()+".xls"; - - - - HSSFWorkbook wb = inventoryInformationService.exportExcel( null); - - //响应到客户端 - - try { - this.setResponseHeader(response, fileName); - OutputStream os = response.getOutputStream(); - wb.write(os); - os.flush(); - os.close(); - - } catch (Exception e) { - e.printStackTrace(); - } - return rb; - } - public void setResponseHeader(HttpServletResponse response, String fileName) { - - try { - - try { - - fileName = new String(fileName.getBytes(),"ISO8859-1"); - - } catch (UnsupportedEncodingException e) { - - // TODO Auto-generated catch block - - e.printStackTrace(); - - } - - response.setContentType("application/octet-stream;charset=ISO8859-1"); - - response.setHeader("Content-Disposition", "attachment;filename="+ fileName); - - response.addHeader("Pargam", "no-cache"); - - response.addHeader("Cache-Control", "no-cache"); - - } catch (Exception ex) { - - ex.printStackTrace(); - - } - - } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java index 2f5ee3f7..c461f5e7 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java @@ -303,80 +303,4 @@ public class InventoryInformationService extends MybatisBaseService productNums=productNumService.getAll(); - // 第一步，创建一个HSSFWorkbook，对应一个Excel文件 - if(wb == null){ - wb = new HSSFWorkbook(); - } - // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet - HSSFSheet sheet = wb.createSheet(sheetName); - // 合并单元格：参数：起始行, 终止行, 起始列, 终止列 - CellRangeAddress cra = new CellRangeAddress(0, 0, 0, 18); - sheet.addMergedRegion(cra); - // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制 - - HSSFRow row = sheet.createRow(0); - // 第四步，创建单元格，并设置值表头 设置表头居中 - HSSFCellStyle style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式 - HSSFCell titleRow = row.createCell(0); - titleRow.setCellValue(title); - titleRow.setCellStyle(style); - - /*HSSFCell titleRow1 = row.createCell(1); - titleRow1.setCellValue("审核单号:123456789 状态:已通过审核 合计金额：12345678"); - titleRow1.setCellStyle(style);*/ - - //声明列对象 - - HSSFCell cell = null; - - //创建标题 - HSSFRow row1 = sheet.createRow(1); - for(int i=0;i { List getAll(); @Select("select * from product_num where pc like CONCAT('%',#{pc},'%') group by pc ") List selectMaxPc(@Param("pc") String pc); + @Select("select * from product_num where pc =#{pc} ") + List selectByPc(@Param("pc")String pc); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java index 8fbe9b50..c095eba4 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java @@ -31,15 +31,14 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.portal.api.productnum.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; /** * Project: com.supervise(宇信通监管)
@@ -119,8 +118,62 @@ public class ProductNumRest implements ProductNumFeign { } catch (IOException e) { e.printStackTrace(); } - //inventoryInformationService.readBrandPeriodSorXls1(in,""); productNumService.readBrandPeriodSorXls1(in,""); return rb; } + @ApiOperation(" ") + @RequestMapping(value = "/exportExcel", method = RequestMethod.GET) + public ResultBean exportExcel(HttpServletRequest request, HttpServletResponse response){ + ResultBean rb = ResultBean.fireFail(); //excel标题 + //excel文件名 + String fileName = "采购订单商品明细表"+System.currentTimeMillis()+".xls"; + HSSFWorkbook wb = productNumService.exportExcel( null); + //响应到客户端 + try { + this.setResponseHeader(response, fileName); + OutputStream os = response.getOutputStream(); + wb.write(os); + os.flush(); + os.close(); + } catch (Exception e) { + e.printStackTrace(); + } + return rb; + } + public void setResponseHeader(HttpServletResponse response, String fileName) { + try { + try { + fileName = new String(fileName.getBytes(),"ISO8859-1"); + } catch (UnsupportedEncodingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + response.setContentType("application/octet-stream;charset=ISO8859-1"); + response.setHeader("Content-Disposition", "attachment;filename="+ fileName); + response.addHeader("Pargam", "no-cache"); + response.addHeader("Cache-Control", "no-cache"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + @ApiOperation(" ") + @RequestMapping(value = "/products", method = RequestMethod.GET) + public ResultBean products(HttpServletRequest request, HttpServletResponse response){ + String pc=request.getParameter("code"); + ResultBean rb = ResultBean.fireFail(); //excel标题 + //excel文件名 + String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls"; + HSSFWorkbook wb = productNumService.products( pc); + //响应到客户端 + try { + this.setResponseHeader(response, fileName); + OutputStream os = response.getOutputStream(); + wb.write(os); + os.flush(); + os.close(); + } catch (Exception e) { + e.printStackTrace(); + } + return rb; + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java index 48771db5..7db0d70c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java @@ -46,23 +46,23 @@ import com.yxt.supervise.portal.api.restrictedcategory.RestrictedCategory; import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; import com.yxt.supervise.portal.biz.productinformation.ProductInformationService; +import com.yxt.supervise.portal.biz.purchaserequisition.PurchaseRequisitionService; +import com.yxt.supervise.portal.biz.purchaserequisitionpro.PurchaseRequisitionProService; import com.yxt.supervise.portal.biz.restrictedcategory.RestrictedCategoryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; +import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Project: com.supervise(宇信通监管)
@@ -310,4 +310,285 @@ public class ProductNumService extends MybatisBaseService getAll() { return baseMapper.getAll(); } + public HSSFWorkbook exportExcel( HSSFWorkbook wb) { + String title = "重点品类商品订货明细"; + String[] col = {"审核单号","状态","合计金额"}; + String[] col1 = {"序号","采购订单编号","厂商编码","厂商名称","商品代码","商品条码","商品名称","单位","进价","配价","售价","箱规", + "订货数量","订货金额（元）","合计","税票","降价折扣%","判定结果","备注"}; + //sheet名 + String sheetName = "重点品类商品订货明细"; + //创建HSSFWorkbook + //String [][]content={{"张三","男","12","清华大学","大一"},{"李四","女","14","北京大学","大二"}}; + List productNums=getAll(); + // 第一步，创建一个HSSFWorkbook，对应一个Excel文件 + if(wb == null){ + wb = new HSSFWorkbook(); + } + // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet + HSSFSheet sheet = wb.createSheet(sheetName); + // 合并单元格：参数：起始行, 终止行, 起始列, 终止列 + CellRangeAddress cra = new CellRangeAddress(0, 0, 0, 19); + sheet.addMergedRegion(cra); + // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制 + + HSSFRow row = sheet.createRow(0); + // 第四步，创建单元格，并设置值表头 设置表头居中 + HSSFCellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式 + HSSFCell titleRow = row.createCell(0); + titleRow.setCellValue(title); + titleRow.setCellStyle(style); + + /*HSSFCell titleRow1 = row.createCell(1); + titleRow1.setCellValue("审核单号:123456789 状态:已通过审核 合计金额：12345678"); + titleRow1.setCellStyle(style);*/ + + //声明列对象 + + createRow3(sheet, 1, col1, style); + + //创建内容 + for(int i=0;i productNums=getAll(); + // 第一步，创建一个HSSFWorkbook，对应一个Excel文件 + if(wb == null){ + wb = new HSSFWorkbook(); + } + // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet + HSSFSheet sheet = wb.createSheet(sheetName); + // 合并单元格：参数：起始行, 终止行, 起始列, 终止列 + CellRangeAddress cra = new CellRangeAddress(0, 0, 0, 19); + CellRangeAddress cra2 = new CellRangeAddress(1, 1, 0, 19); + sheet.addMergedRegion(cra); + sheet.addMergedRegion(cra2); + // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制 + + HSSFRow row = sheet.createRow(0); + // 第四步，创建单元格，并设置值表头 设置表头居中 + HSSFCellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式 + HSSFCell titleRow = row.createCell(0); + titleRow.setCellValue(title); + titleRow.setCellStyle(style); + BigDecimal price=new BigDecimal("0"); + for(int i=0;i list=purchaseRequisitionProService.selectByMainSid(purchaseRequisitionSid); + addProductNum(purchaseRequisition,list); + + List productNums=baseMapper.selectByPc(pc); + // 第一步，创建一个HSSFWorkbook，对应一个Excel文件 + HSSFWorkbook wb = new HSSFWorkbook(); + // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet + HSSFSheet sheet = wb.createSheet(sheetName); + // 合并单元格：参数：起始行, 终止行, 起始列, 终止列 + CellRangeAddress cra = new CellRangeAddress(0, 0, 0, 19); + sheet.addMergedRegion(cra); + // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制 + + HSSFRow row = sheet.createRow(0); + // 第四步，创建单元格，并设置值表头 设置表头居中 + HSSFCellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式 + HSSFCell titleRow = row.createCell(0); + titleRow.setCellValue(title); + titleRow.setCellStyle(style); + + /*HSSFCell titleRow1 = row.createCell(1); + titleRow1.setCellValue("审核单号:123456789 状态:已通过审核 合计金额：12345678"); + titleRow1.setCellStyle(style);*/ + + //声明列对象 + + createRow3(sheet, 1, col1, style); + + //创建内容 + for(int i=0;i list) { + Map map=new HashMap(); + map.put("pc",pu.getCode()); + baseMapper.deleteByMap(map); + for(int i = 0; i < list.size(); i++){ + PurchaseRequisitionPro p=list.get(i); + ProductNum pr=new ProductNum(); + pr.setPc(pu.getCode()); + pr.setSupplierCode(pu.getSupplierCode());//供应商代码 + pr.setSupplierName(pu.getSupplierName());//供应商名称 + ProductInformationVo productInformation=productInformationService.selectByCode(p.getProCode()); + ///ProductInformationVo b=productInformationService.limitJudgement(code); + ProductInformationVo b=productInformationService.selectByCode(p.getProCode()); + String brandSid = b.getBrandSid(); + String categoryKey = b.getCategoryKey(); + + List restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); + if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ + pr.setState(1); + }else{ + pr.setState(0); + String remarks=""; + remarks=remarks+productInformation.getCategory()+"["+productInformation.getCategoryKey()+"]品类,"; + remarks=remarks+productInformation.getBrand()+"["+productInformation.getBrandSid()+"]品牌不符合;"; + pr.setRemarks(remarks); + } + pr.setCode(p.getProCode()); + if(productInformation!=null){ + pr.setBrand(productInformation.getBrand()); + pr.setCategory(productInformation.getCategory()); + } + pr.setBarCode(p.getSecondCode());//商品条码 + pr.setName(p.getProName());//商品名称 + pr.setUnit(p.getUnit());//单位 + String packageTotalPrice = p.getPackageTotalPrice(); + String number = p.getNumber(); + BigDecimal v = new BigDecimal(packageTotalPrice).divide(new BigDecimal(number),4,BigDecimal.ROUND_HALF_UP); + pr.setPurchasePrice(v.toString());//进价 送货金额/数量=进价 + pr.setValence(productInformation.getRationingPrice());//配价 + String retailAmount = p.getRetailAmount();//零售金额 + String packageSpec = p.getPackageInsideNumber();//包装规格 + String packageNumber = p.getPackageNumber();//包装数量 + BigDecimal v1 = new BigDecimal(retailAmount).divide(new BigDecimal(packageSpec)).divide(new BigDecimal(packageNumber)); + //double v1 = Double.parseDouble(retailAmount) / Double.parseDouble(packageSpec) / Double.parseDouble(packageNumber); + pr.setPrice(v1.toString());//售价 零售金额/规格/包装数量=单价 + pr.setBoxGauge(packageSpec);//箱规 + pr.setNum(p.getNumber());//订货数量 + pr.setOrderAmount(p.getPackageTotalPrice());//订货金额 + pr.setTaxReceipt("");//税票 + pr.setDiscount("");//折扣 + + baseMapper.insert(pr); + } + } } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java index ae8d33f8..ec4c748b 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java @@ -3,7 +3,16 @@ package com.yxt.supervise.portal.biz.purchaserequisition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; @Mapper public interface PurchaseRequisitionMapper extends BaseMapper { + /** + * 根据单据编号查询采购订单 + * @param pc + * @return + */ + @Select("select * from purchase_requisition where code=#{code}") + PurchaseRequisition selectByCode(@Param("code") String pc); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java index b3e4c325..7b49d883 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java @@ -44,9 +44,12 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Slf4j @Service @@ -140,6 +143,13 @@ public class PurchaseRequisitionService extends MybatisBaseService map=new HashMap<>(); + map.put("code",code); + baseMapper.deleteByMap(map); //ProductInformationVo productInformationVo = baseMapper.selectByCode(code); pr.setCode(code); @@ -322,4 +362,9 @@ public class PurchaseRequisitionService extends MybatisBaseService { + /** + * 根据主表的sid查询采购的商品信息 + * @param purchaseRequisitionSid + * @return + */ + @Select("select * from purchase_requisition_pro where mainSid=#{mainSid}") + List selectByMainSid(@Param("mainSid") String purchaseRequisitionSid); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java index 6e7158e4..cb4e8d5c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java @@ -4,6 +4,16 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class PurchaseRequisitionProService extends MybatisBaseService { + /** + * 根据主表的sid查询采购的商品信息 + * @param purchaseRequisitionSid + * @return + */ + public List selectByMainSid(String purchaseRequisitionSid) { + return baseMapper.selectByMainSid(purchaseRequisitionSid); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml index 868d86f0..704c366d 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: application: name: supervise-portal profiles: - active: test + active: devv messages: # 国际化资源文件路径 basename: i18n/messages