From fc4b3fe0149348016cb39275451880abb4154178 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 22 Oct 2024 10:21:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=BA=A7=E5=93=81=E6=8A=A5=E4=BB=B7=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=20sys=5Fproduct=5Fquotation=E5=92=8C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysProductQuotationController.java | 285 ------- .../system/domain/SysProductQuotation.java | 568 ------------- .../mapper/SysProductQuotationMapper.java | 61 -- .../service/ISysProductQuotationService.java | 64 -- .../impl/SysProductQuotationServiceImpl.java | 102 --- .../system/SysProductQuotationMapper.xml | 210 ----- .../quality/returnGoodsOrder/edit.html | 1 - .../system/productquotation/add.html | 451 ----------- .../system/productquotation/edit.html | 439 ---------- .../productquotation/productquotation.html | 761 ------------------ 10 files changed, 2942 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductQuotationController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductQuotation.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductQuotationMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductQuotationService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysProductQuotationMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/system/productquotation/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/productquotation/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductQuotationController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductQuotationController.java deleted file mode 100644 index 77086ff2..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductQuotationController.java +++ /dev/null @@ -1,285 +0,0 @@ -package com.ruoyi.system.controller; - -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.util.MapUtils; -import com.alibaba.excel.write.metadata.WriteSheet; -import com.alibaba.excel.write.metadata.fill.FillConfig; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.ck.utils.Result; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysCustomer; -import com.ruoyi.system.domain.SysProductQuotation; -import com.ruoyi.system.domain.exportDto.SysCustomerDto; -import com.ruoyi.system.domain.exportDto.SysProductQuotationDto; -import com.ruoyi.system.service.ISysCustomerService; -import com.ruoyi.system.service.ISysProductQuotationService; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log; - -/** - * 产品报价Controller - * - * @author ruoyi - * @date 2022-11-15 - */ -@Controller -@RequestMapping("/system/productquotation") -public class SysProductQuotationController extends BaseController -{ - private String prefix = "system/productquotation"; - - @Autowired - private ISysProductQuotationService sysProductQuotationService; - @Autowired - private ISysCustomerService sysCustomerService; - - @RequiresPermissions("system:productquotation:view") - @GetMapping() - public String productquotation() - { - return prefix + "/productquotation"; - } - - /** - * 查询产品报价列表 - */ - @RequiresPermissions("system:productquotation:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SysProductQuotation sysProductQuotation) - { - startPage(); - List list = sysProductQuotationService.selectSysProductQuotationList(sysProductQuotation); - return getDataTable(list); - } - - /** - * 导出产品报价列表 - */ - @RequiresPermissions("system:productquotation:export") - @Log(title = "产品报价", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SysProductQuotation sysProductQuotation) - { - List list = sysProductQuotationService.selectSysProductQuotationList(sysProductQuotation); - ExcelUtil util = new ExcelUtil(SysProductQuotation.class); - return util.exportExcel(list, "产品报价数据"); - } - - /** - * 新增产品报价 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存产品报价 - */ - @RequiresPermissions("system:productquotation:add") - @Log(title = "产品报价", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(SysProductQuotation sysProductQuotation) - { - return toAjax(sysProductQuotationService.insertSysProductQuotation(sysProductQuotation)); - } - - /** - * 修改产品报价 - */ - @GetMapping("/edit/{productQuotationId}") - public String edit(@PathVariable("productQuotationId") Long productQuotationId, ModelMap mmap) - { - SysProductQuotation sysProductQuotation = sysProductQuotationService.selectSysProductQuotationById(productQuotationId); - mmap.put("sysProductQuotation", sysProductQuotation); - return prefix + "/edit"; - } - - /** - * 修改保存产品报价 - */ - @RequiresPermissions("system:productquotation:edit") - @Log(title = "产品报价", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(SysProductQuotation sysProductQuotation) - { - return toAjax(sysProductQuotationService.updateSysProductQuotation(sysProductQuotation)); - } - - /** - * 删除产品报价 - */ - @RequiresPermissions("system:productquotation:remove") - @Log(title = "产品报价", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(sysProductQuotationService.deleteSysProductQuotationByIds(ids)); - } - - - @RequiresPermissions("system:productquotation:export") - @Log(title = "产品报价", businessType = BusinessType.EXPORT) - @RequestMapping("/exportProductQuotation") - @ResponseBody - public void exportProductQuotation(@RequestBody String scData, HttpServletResponse response) throws IOException { - - //数据处理 -// System.out.println(scData); - - JSONObject jsonObject = JSONObject.parseObject(scData); -// System.out.println(jsonObject); - - JSONObject scDataJSON = jsonObject.getJSONObject("scData"); -// System.out.println(scDataJSON); - -// JSONArray jsonArray1 = scDataJSON.getJSONArray("selectData"); -// List selectDataList = JSONObject.parseArray(String.valueOf(jsonArray1), SysProductQuotationDto.class); - JSONArray jsonArray2 = scDataJSON.getJSONArray("customerData"); - List customerDataList = JSONObject.parseArray(String.valueOf(jsonArray2), SysCustomer.class); - String pricingDate = scDataJSON.getString("pricingDate").replace("\"",""); -// System.out.println(selectDataList); -// System.out.println(customerDataList); - - //获取基础信息 - SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(customerDataList.get(0).getId()); - SysCustomerDto sysCustomerDto = new SysCustomerDto(); - BeanUtils.copyProperties(sysCustomer,sysCustomerDto); - - //产品信息 - SysProductQuotation sysProductQuotation = new SysProductQuotation(); - sysProductQuotation.setEnterpriseCode(customerDataList.get(0).getEnterpriseCode()); - sysProductQuotation.setEnterpriseName(customerDataList.get(0).getEnterpriseName()); - sysProductQuotation.setPricingDate(pricingDate); - List sysProductQuotationList = sysProductQuotationService.selectSysProductQuotationList(sysProductQuotation); - List sysProductQuotationDtoList = new ArrayList<>(); - try { - Iterator values= sysProductQuotationList.iterator(); - while(values.hasNext()) { - Object source = values.next(); - SysProductQuotationDto target = SysProductQuotationDto.class.newInstance(); - BeanUtils.copyProperties(source, target); - sysProductQuotationDtoList.add(target); - } - }catch (Exception e) { - log.error(">>>>>>异常<<<<<<", e); - } - int num = 0; - for (int i = 0; i < sysProductQuotationDtoList.size(); i++) { - num = num + 1; - sysProductQuotationDtoList.get(i).setNumber(num); - } -// System.out.println(sysProductQuotationDtoList); - - - //填充表格 - response.setCharacterEncoding("utf-8"); - String fileName = URLEncoder.encode("国税发票", "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - String templateFileName = "C:\\exportTemplates\\exportProductQuotation.xlsx"; - try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), SysProductQuotationDto.class).withTemplate(templateFileName).build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); - FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); - excelWriter.fill(sysProductQuotationDtoList, fillConfig, writeSheet); - Map map = MapUtils.newHashMap(); - map.put("enterpriseName", sysCustomerDto.getEnterpriseName()); - map.put("contactNumber", sysCustomerDto.getContactNumber()); - map.put("customerFax", sysCustomerDto.getCustomerFax()); - map.put("customerContact", sysCustomerDto.getCustomerContact()); - map.put("commonCurrency", sysCustomerDto.getCommonCurrency()); - map.put("taxRate", sysCustomerDto.getTaxRate()); - map.put("pricingDate", pricingDate); - excelWriter.fill(map, writeSheet); - } - } - - - @PostMapping("/upload") - @ResponseBody - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - String modalName = prefix.substring(prefix.lastIndexOf("/")+1); - String filePathNow = filePath + "/" + modalName; - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePathNow, file); - String url = filePathNow + fileName; - AjaxResult ajax = AjaxResult.success(); - ajax.put("fileName", fileName); - ajax.put("url", url); - return ajax; - } - catch (Exception e) - { - return AjaxResult.error(e.getMessage()); - } - } - - - @RequestMapping ("/downloadFile") - public void downloadFile(String filepath, HttpServletResponse response, - HttpServletRequest request) throws Exception - { - String fileNameNow = filepath.substring(filepath.lastIndexOf("/")+1); - - try - { -// System.out.println(fileName); - String filePath = filepath; - - response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); - FileUtils.setAttachmentResponseHeader(response, fileNameNow); - FileUtils.writeBytes(filePath, response.getOutputStream()); - - } - catch (Exception e) - { - System.out.println("fail"); - } - } - - /** - * 获取报价编号 - */ - @PostMapping("/getId") - @ResponseBody - public Result getId() throws Exception { - return Result.getSuccessResult(sysProductQuotationService.getId()); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductQuotation.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductQuotation.java deleted file mode 100644 index 7a470112..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductQuotation.java +++ /dev/null @@ -1,568 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 产品报价对象 sys_product_quotation - * - * @author ruoyi - * @date 2022-11-15 - */ -public class SysProductQuotation extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 产品报价id */ - private Long productQuotationId; - - /** 报价编码 */ - @Excel(name = "报价编码") - private String quotationCode; - - /** 成品代码 */ - @Excel(name = "成品代码") - private String finishProductCode; - - /** 成品名称 */ - @Excel(name = "成品名称") - private String finishProductName; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 机种 */ - @Excel(name = "机种") - private String typeMachine; - - /** 单位 */ - @Excel(name = "单位") - private String inventoryUnit; - - /** 币别 */ - @Excel(name = "币别") - private String commonCurrency; - - /** 单价 */ - @Excel(name = "单价") - private String processPrice; - - - /** 客户料号 */ - @Excel(name = "客户料号") - private String customerNumber; - - - /** 客户编号 */ - @Excel(name = "客户编号") - private String enterpriseCode; - - /** 客户名称 */ - @Excel(name = "客户名称") - private String enterpriseName; - - /** 登记人 */ - @Excel(name = "登记人") - private String registrant; - - /** 订价日期 */ - @Excel(name = "订价日期") - private String pricingDate; - - /** 税率 */ - @Excel(name = "税率") - private String taxRate; - - /** 不含税价 */ - @Excel(name = "不含税价") - private String priceExcludingTax; - - /** 含税价 */ - @Excel(name = "含税价") - private String priceIncludingTax; - - /** 上次价格 */ - @Excel(name = "上次价格") - private String lastPrice; - - /** 上次价格2 */ - @Excel(name = "上次价格2") - private String lastPriceEnd; - - /** 当前材料成本RMB */ - @Excel(name = "当前材料成本RMB") - private String costRmb; - - /** 当前汇率 */ - @Excel(name = "当前汇率") - private String currentExchangeRate; - - /** 材料占比 */ - @Excel(name = "材料占比") - private String proportionMaterials; - - /** 备注说明 */ - @Excel(name = "备注说明") - private String quotationExplain; - - /** 是否为当前报价 */ - @Excel(name = "是否为当前报价") - private String currentQuote; - - /** 是否含税 */ - @Excel(name = "是否含税") - private String confirmTax; - - /** 文件存储 */ - @Excel(name = "文件存储") - private String fileUpload; - - /** 确认否 */ - @Excel(name = "确认否") - private String confirmNo; - - /** 确认人 */ - @Excel(name = "确认人") - private String confirmName; - - /** 确认时间 */ - @Excel(name = "确认时间") - private String confirmTime; - - /** 审核否 */ - @Excel(name = "审核否") - private String auditNo; - - /** 审核人 */ - @Excel(name = "审核人") - private String auditName; - - /** 审核时间 */ - @Excel(name = "审核时间") - private String auditTime; - - /** 核准否 */ - @Excel(name = "核准否") - private String approveNo; - - /** 核准人 */ - @Excel(name = "核准人") - private String approveName; - - /** 核准时间 */ - @Excel(name = "核准时间") - private String approveTime; - - /** 备用一 */ - @Excel(name = "备用一") - private String standbyOne; - - /** 备用二 */ - @Excel(name = "备用二") - private String standbyTwo; - /** 录入时间 */ - @Excel(name = "录入时间") - private String firstAddTime; - - /** 修改时间 */ - @Excel(name = "修改时间") - private String updateInfoTime; - - - public void setProductQuotationId(Long productQuotationId) - { - this.productQuotationId = productQuotationId; - } - - public Long getProductQuotationId() - { - return productQuotationId; - } - public void setQuotationCode(String quotationCode) - { - this.quotationCode = quotationCode; - } - - public String getQuotationCode() - { - return quotationCode; - } - public void setFinishProductCode(String finishProductCode) - { - this.finishProductCode = finishProductCode; - } - - public String getFinishProductCode() - { - return finishProductCode; - } - public void setFinishProductName(String finishProductName) - { - this.finishProductName = finishProductName; - } - - public String getFinishProductName() - { - return finishProductName; - } - public void setSpecificationModel(String specificationModel) - { - this.specificationModel = specificationModel; - } - - public String getSpecificationModel() - { - return specificationModel; - } - public void setTypeMachine(String typeMachine) - { - this.typeMachine = typeMachine; - } - - public String getTypeMachine() - { - return typeMachine; - } - public void setInventoryUnit(String inventoryUnit) - { - this.inventoryUnit = inventoryUnit; - } - - public String getInventoryUnit() - { - return inventoryUnit; - } - public void setCommonCurrency(String commonCurrency) - { - this.commonCurrency = commonCurrency; - } - - public String getCommonCurrency() - { - return commonCurrency; - } - public void setProcessPrice(String processPrice) - { - this.processPrice = processPrice; - } - - public String getProcessPrice() - { - return processPrice; - } - public void setEnterpriseCode(String enterpriseCode) - { - this.enterpriseCode = enterpriseCode; - } - - public String getEnterpriseCode() - { - return enterpriseCode; - } - public void setEnterpriseName(String enterpriseName) - { - this.enterpriseName = enterpriseName; - } - - public String getEnterpriseName() - { - return enterpriseName; - } - public void setRegistrant(String registrant) - { - this.registrant = registrant; - } - - public String getRegistrant() - { - return registrant; - } - public void setPricingDate(String pricingDate) - { - this.pricingDate = pricingDate; - } - - public String getPricingDate() - { - return pricingDate; - } - public void setTaxRate(String taxRate) - { - this.taxRate = taxRate; - } - - public String getTaxRate() - { - return taxRate; - } - public void setPriceExcludingTax(String priceExcludingTax) - { - this.priceExcludingTax = priceExcludingTax; - } - - public String getPriceExcludingTax() - { - return priceExcludingTax; - } - public void setPriceIncludingTax(String priceIncludingTax) - { - this.priceIncludingTax = priceIncludingTax; - } - - public String getPriceIncludingTax() - { - return priceIncludingTax; - } - public void setLastPrice(String lastPrice) - { - this.lastPrice = lastPrice; - } - - public String getLastPrice() - { - return lastPrice; - } - public void setLastPriceEnd(String lastPriceEnd) - { - this.lastPriceEnd = lastPriceEnd; - } - - public String getLastPriceEnd() - { - return lastPriceEnd; - } - public void setCostRmb(String costRmb) - { - this.costRmb = costRmb; - } - - public String getCostRmb() - { - return costRmb; - } - public void setCurrentExchangeRate(String currentExchangeRate) - { - this.currentExchangeRate = currentExchangeRate; - } - - public String getCurrentExchangeRate() - { - return currentExchangeRate; - } - public void setProportionMaterials(String proportionMaterials) - { - this.proportionMaterials = proportionMaterials; - } - - public String getProportionMaterials() - { - return proportionMaterials; - } - public void setQuotationExplain(String quotationExplain) - { - this.quotationExplain = quotationExplain; - } - - public String getQuotationExplain() - { - return quotationExplain; - } - public void setCurrentQuote(String currentQuote) - { - this.currentQuote = currentQuote; - } - - public String getCurrentQuote() - { - return currentQuote; - } - public void setConfirmTax(String confirmTax) - { - this.confirmTax = confirmTax; - } - - public String getConfirmTax() - { - return confirmTax; - } - - public String getFileUpload() { - return fileUpload; - } - - public void setFileUpload(String fileUpload) { - this.fileUpload = fileUpload; - } - - public void setConfirmNo(String confirmNo) - { - this.confirmNo = confirmNo; - } - - public String getConfirmNo() - { - return confirmNo; - } - public void setConfirmName(String confirmName) - { - this.confirmName = confirmName; - } - - public String getConfirmName() - { - return confirmName; - } - public void setConfirmTime(String confirmTime) - { - this.confirmTime = confirmTime; - } - - public String getConfirmTime() - { - return confirmTime; - } - public void setAuditNo(String auditNo) - { - this.auditNo = auditNo; - } - - public String getAuditNo() - { - return auditNo; - } - public void setAuditName(String auditName) - { - this.auditName = auditName; - } - - public String getAuditName() - { - return auditName; - } - public void setAuditTime(String auditTime) - { - this.auditTime = auditTime; - } - - public String getAuditTime() - { - return auditTime; - } - public void setApproveNo(String approveNo) - { - this.approveNo = approveNo; - } - - public String getApproveNo() - { - return approveNo; - } - public void setApproveName(String approveName) - { - this.approveName = approveName; - } - - public String getApproveName() - { - return approveName; - } - public void setApproveTime(String approveTime) - { - this.approveTime = approveTime; - } - - public String getApproveTime() - { - return approveTime; - } - public void setStandbyOne(String standbyOne) - { - this.standbyOne = standbyOne; - } - - public String getStandbyOne() - { - return standbyOne; - } - public void setStandbyTwo(String standbyTwo) - { - this.standbyTwo = standbyTwo; - } - - public String getStandbyTwo() - { - return standbyTwo; - } - - public String getFirstAddTime() { - return firstAddTime; - } - - public void setFirstAddTime(String firstAddTime) { - this.firstAddTime = firstAddTime; - } - - public String getUpdateInfoTime() { - return updateInfoTime; - } - - public void setUpdateInfoTime(String updateInfoTime) { - this.updateInfoTime = updateInfoTime; - } - - public String getCustomerNumber() { - return customerNumber; - } - - public void setCustomerNumber(String customerNumber) { - this.customerNumber = customerNumber; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("productQuotationId", getProductQuotationId()) - .append("quotationCode", getQuotationCode()) - .append("finishProductCode", getFinishProductCode()) - .append("finishProductName", getFinishProductName()) - .append("specificationModel", getSpecificationModel()) - .append("typeMachine", getTypeMachine()) - .append("inventoryUnit", getInventoryUnit()) - .append("commonCurrency", getCommonCurrency()) - .append("processPrice", getProcessPrice()) - .append("customerNumber", getCustomerNumber()) - .append("enterpriseCode", getEnterpriseCode()) - .append("enterpriseName", getEnterpriseName()) - .append("registrant", getRegistrant()) - .append("pricingDate", getPricingDate()) - .append("taxRate", getTaxRate()) - .append("priceExcludingTax", getPriceExcludingTax()) - .append("priceIncludingTax", getPriceIncludingTax()) - .append("lastPrice", getLastPrice()) - .append("lastPriceEnd", getLastPriceEnd()) - .append("costRmb", getCostRmb()) - .append("currentExchangeRate", getCurrentExchangeRate()) - .append("proportionMaterials", getProportionMaterials()) - .append("quotationExplain", getQuotationExplain()) - .append("currentQuote", getCurrentQuote()) - .append("confirmTax", getConfirmTax()) - .append("fileUpload", getFileUpload()) - .append("confirmNo", getConfirmNo()) - .append("confirmName", getConfirmName()) - .append("confirmTime", getConfirmTime()) - .append("auditNo", getAuditNo()) - .append("auditName", getAuditName()) - .append("auditTime", getAuditTime()) - .append("approveNo", getApproveNo()) - .append("approveName", getApproveName()) - .append("approveTime", getApproveTime()) - .append("standbyOne", getStandbyOne()) - .append("standbyTwo", getStandbyTwo()) - .append("firstAddTime", getFirstAddTime()) - .append("updateInfoTime", getUpdateInfoTime()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductQuotationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductQuotationMapper.java deleted file mode 100644 index 0a5223b7..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductQuotationMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysProductQuotation; - -/** - * 产品报价Mapper接口 - * - * @author ruoyi - * @date 2022-11-15 - */ -public interface SysProductQuotationMapper -{ - /** - * 查询产品报价 - * - * @param productQuotationId 产品报价ID - * @return 产品报价 - */ - public SysProductQuotation selectSysProductQuotationById(Long productQuotationId); - - /** - * 查询产品报价列表 - * - * @param sysProductQuotation 产品报价 - * @return 产品报价集合 - */ - public List selectSysProductQuotationList(SysProductQuotation sysProductQuotation); - - /** - * 新增产品报价 - * - * @param sysProductQuotation 产品报价 - * @return 结果 - */ - public int insertSysProductQuotation(SysProductQuotation sysProductQuotation); - - /** - * 修改产品报价 - * - * @param sysProductQuotation 产品报价 - * @return 结果 - */ - public int updateSysProductQuotation(SysProductQuotation sysProductQuotation); - - /** - * 删除产品报价 - * - * @param productQuotationId 产品报价ID - * @return 结果 - */ - public int deleteSysProductQuotationById(Long productQuotationId); - - /** - * 批量删除产品报价 - * - * @param productQuotationIds 需要删除的数据ID - * @return 结果 - */ - public int deleteSysProductQuotationByIds(String[] productQuotationIds); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductQuotationService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductQuotationService.java deleted file mode 100644 index 6ebf806a..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductQuotationService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.system.domain.SysProductQuotation; - -import java.util.List; - -/** - * 产品报价Service接口 - * - * @author ruoyi - * @date 2022-11-15 - */ -public interface ISysProductQuotationService -{ - /** - * 查询产品报价 - * - * @param productQuotationId 产品报价ID - * @return 产品报价 - */ - public SysProductQuotation selectSysProductQuotationById(Long productQuotationId); - - /** - * 查询产品报价列表 - * - * @param sysProductQuotation 产品报价 - * @return 产品报价集合 - */ - public List selectSysProductQuotationList(SysProductQuotation sysProductQuotation); - - /** - * 新增产品报价 - * - * @param sysProductQuotation 产品报价 - * @return 结果 - */ - public int insertSysProductQuotation(SysProductQuotation sysProductQuotation); - - /** - * 修改产品报价 - * - * @param sysProductQuotation 产品报价 - * @return 结果 - */ - public int updateSysProductQuotation(SysProductQuotation sysProductQuotation); - - /** - * 批量删除产品报价 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSysProductQuotationByIds(String ids); - - /** - * 删除产品报价信息 - * - * @param productQuotationId 产品报价ID - * @return 结果 - */ - public int deleteSysProductQuotationById(Long productQuotationId); - - public String getId(); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java deleted file mode 100644 index fd3c651f..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.ruoyi.system.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysProductQuotation; -import com.ruoyi.system.mapper.SysProductQuotationMapper; -import com.ruoyi.system.service.ISysProductQuotationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.List; - -/** - * 产品报价Service业务层处理 - * - * @author ruoyi - * @date 2022-11-15 - */ -@Service -public class SysProductQuotationServiceImpl implements ISysProductQuotationService -{ - @Autowired - private SysProductQuotationMapper sysProductQuotationMapper; - - /** - * 查询产品报价 - * - * @param productQuotationId 产品报价ID - * @return 产品报价 - */ - @Override - public SysProductQuotation selectSysProductQuotationById(Long productQuotationId) - { - return sysProductQuotationMapper.selectSysProductQuotationById(productQuotationId); - } - - /** - * 查询产品报价列表 - * - * @param sysProductQuotation 产品报价 - * @return 产品报价 - */ - @Override - public List selectSysProductQuotationList(SysProductQuotation sysProductQuotation) - { - return sysProductQuotationMapper.selectSysProductQuotationList(sysProductQuotation); - } - - /** - * 新增产品报价 - * - * @param sysProductQuotation 产品报价 - * @return 结果 - */ - @Override - public int insertSysProductQuotation(SysProductQuotation sysProductQuotation) - { - return sysProductQuotationMapper.insertSysProductQuotation(sysProductQuotation); - } - - /** - * 修改产品报价 - * - * @param sysProductQuotation 产品报价 - * @return 结果 - */ - @Override - public int updateSysProductQuotation(SysProductQuotation sysProductQuotation) - { - return sysProductQuotationMapper.updateSysProductQuotation(sysProductQuotation); - } - - /** - * 删除产品报价对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSysProductQuotationByIds(String ids) - { - return sysProductQuotationMapper.deleteSysProductQuotationByIds(Convert.toStrArray(ids)); - } - - /** - * 删除产品报价信息 - * - * @param productQuotationId 产品报价ID - * @return 结果 - */ - @Override - public int deleteSysProductQuotationById(Long productQuotationId) - { - return sysProductQuotationMapper.deleteSysProductQuotationById(productQuotationId); - } - - @Override - public String getId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "BJ" + time.substring(2); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProductQuotationMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProductQuotationMapper.xml deleted file mode 100644 index 3287533c..00000000 --- a/ruoyi-admin/src/main/resources/mapper/system/SysProductQuotationMapper.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select product_quotation_id, quotation_code, finish_product_code, finish_product_name, specification_model, type_machine, inventory_unit, common_currency, process_price, customer_number, enterprise_code, enterprise_name, registrant, pricing_date, tax_rate, price_excluding_tax, price_including_tax, last_price, last_price_end, cost_rmb, current_exchange_rate, proportion_materials, quotation_explain, current_quote, confirm_tax, file_upload, confirm_no, confirm_name, confirm_time, audit_no, audit_name, audit_time, approve_no, approve_name, approve_time, standby_one, standby_two, first_add_time, update_info_time from sys_product_quotation - - - - - - - - insert into sys_product_quotation - - quotation_code, - finish_product_code, - finish_product_name, - specification_model, - type_machine, - inventory_unit, - common_currency, - process_price, - customer_number, - enterprise_code, - enterprise_name, - registrant, - pricing_date, - tax_rate, - price_excluding_tax, - price_including_tax, - last_price, - last_price_end, - cost_rmb, - current_exchange_rate, - proportion_materials, - quotation_explain, - current_quote, - confirm_tax, - file_upload, - confirm_no, - confirm_name, - confirm_time, - audit_no, - audit_name, - audit_time, - approve_no, - approve_name, - approve_time, - standby_one, - standby_two, - first_add_time, - - - #{quotationCode}, - #{finishProductCode}, - #{finishProductName}, - #{specificationModel}, - #{typeMachine}, - #{inventoryUnit}, - #{commonCurrency}, - #{processPrice}, - #{customerNumber}, - #{enterpriseCode}, - #{enterpriseName}, - #{registrant}, - #{pricingDate}, - #{taxRate}, - #{priceExcludingTax}, - #{priceIncludingTax}, - #{lastPrice}, - #{lastPriceEnd}, - #{costRmb}, - #{currentExchangeRate}, - #{proportionMaterials}, - #{quotationExplain}, - #{currentQuote}, - #{confirmTax}, - #{fileUpload}, - #{confirmNo}, - #{confirmName}, - #{confirmTime}, - #{auditNo}, - #{auditName}, - #{auditTime}, - #{approveNo}, - #{approveName}, - #{approveTime}, - #{standbyOne}, - #{standbyTwo}, - now(), - - - - - update sys_product_quotation - - quotation_code = #{quotationCode}, - finish_product_code = #{finishProductCode}, - finish_product_name = #{finishProductName}, - specification_model = #{specificationModel}, - type_machine = #{typeMachine}, - inventory_unit = #{inventoryUnit}, - common_currency = #{commonCurrency}, - process_price = #{processPrice}, - customer_number = #{customerNumber}, - enterprise_code = #{enterpriseCode}, - enterprise_name = #{enterpriseName}, - registrant = #{registrant}, - pricing_date = #{pricingDate}, - tax_rate = #{taxRate}, - price_excluding_tax = #{priceExcludingTax}, - price_including_tax = #{priceIncludingTax}, - last_price = #{lastPrice}, - last_price_end = #{lastPriceEnd}, - cost_rmb = #{costRmb}, - current_exchange_rate = #{currentExchangeRate}, - proportion_materials = #{proportionMaterials}, - quotation_explain = #{quotationExplain}, - current_quote = #{currentQuote}, - confirm_tax = #{confirmTax}, - file_upload = #{fileUpload}, - confirm_no = #{confirmNo}, - confirm_name = #{confirmName}, - confirm_time = #{confirmTime}, - audit_no = #{auditNo}, - audit_name = #{auditName}, - audit_time = #{auditTime}, - approve_no = #{approveNo}, - approve_name = #{approveName}, - approve_time = #{approveTime}, - standby_one = #{standbyOne}, - standby_two = #{standbyTwo}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), - - where product_quotation_id = #{productQuotationId} - - - - delete from sys_product_quotation where product_quotation_id = #{productQuotationId} - - - - delete from sys_product_quotation where product_quotation_id in - - #{productQuotationId} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsOrder/edit.html b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsOrder/edit.html index 93e20f94..0ad6740d 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsOrder/edit.html @@ -282,7 +282,6 @@ var getData = [[${returnGoodsOrder}]]; console.log(getData) var prefix = ctx + "quality/returnGoodsOrder"; - var prefixProductquotation = ctx + "system/productquotation"; var prefixReturnGoodsProduct = ctx + "quality/returnGoodsProduct"; var prefixFinishProduct = ctx + "system/finishproduct"; var prefixSalesOrder = ctx + "system/salesOrder"; diff --git a/ruoyi-admin/src/main/resources/templates/system/productquotation/add.html b/ruoyi-admin/src/main/resources/templates/system/productquotation/add.html deleted file mode 100644 index 871a93ca..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/productquotation/add.html +++ /dev/null @@ -1,451 +0,0 @@ - - - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - - -
-
-
- -
- - - - - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
- -
-
-
- - - - - - - - - - - - - -
-
- - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/productquotation/edit.html b/ruoyi-admin/src/main/resources/templates/system/productquotation/edit.html deleted file mode 100644 index 02fdb38e..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/productquotation/edit.html +++ /dev/null @@ -1,439 +0,0 @@ - - - - - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - - - - -
-
-
- -
- - - - - - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
- -
-
-
- - - - - - - - - - - - - -
-
- - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html b/ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html deleted file mode 100644 index 4e2c8cd4..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html +++ /dev/null @@ -1,761 +0,0 @@ - - - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - - - - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - - - -
    • -
  • - - - - - - - -
    • -
  • - - - - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - -
审核成功
- - - - -
产品报价已核准
- - - -
产品报价已确认
- - - - - - - - \ No newline at end of file