From f8f6ae8b13be3acd9d59a0fe9cdcec575bb39404 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 22 Oct 2024 10:56:41 +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=BE=9B=E5=BA=94=E5=95=86=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=20sys=5Fsupplier=5Fquotation=E5=92=8C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=20=E5=92=8C?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysSupplierQuotationController.java | 137 ---- .../system/domain/SysSupplierQuotation.java | 495 ------------- .../mapper/SysSupplierQuotationMapper.java | 61 -- .../service/ISysSupplierQuotationService.java | 64 -- .../impl/SysSupplierQuotationServiceImpl.java | 102 --- .../system/SysSupplierQuotationMapper.xml | 190 ----- .../templates/purchase/purchaseOrder/add.html | 1 - .../system/supplierquotation/add.html | 554 --------------- .../system/supplierquotation/edit.html | 420 ----------- .../supplierquotation/supplierquotation.html | 668 ------------------ 10 files changed, 2692 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierQuotationController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplierQuotation.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierQuotationMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierQuotationService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysSupplierQuotationMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/system/supplierquotation/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/supplierquotation/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierQuotationController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierQuotationController.java deleted file mode 100644 index 2d05cecc..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierQuotationController.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.ruoyi.system.controller; - -import java.util.List; - -import com.ruoyi.ck.utils.Result; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SysSupplierQuotation; -import com.ruoyi.system.service.ISysSupplierQuotationService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 供应商报价Controller - * - * @author ruoyi - * @date 2022-11-08 - */ -@Controller -@RequestMapping("/system/supplierquotation") -public class SysSupplierQuotationController extends BaseController -{ - private String prefix = "system/supplierquotation"; - - @Autowired - private ISysSupplierQuotationService sysSupplierQuotationService; - - @RequiresPermissions("system:supplierquotation:view") - @GetMapping() - public String supplierquotation() - { - return prefix + "/supplierquotation"; - } - - /** - * 查询供应商报价列表 - */ - @RequiresPermissions("system:supplierquotation:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SysSupplierQuotation sysSupplierQuotation) - { - startPage(); - List list = sysSupplierQuotationService.selectSysSupplierQuotationList(sysSupplierQuotation); - return getDataTable(list); - } - - /** - * 导出供应商报价列表 - */ - @RequiresPermissions("system:supplierquotation:export") - @Log(title = "供应商报价", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SysSupplierQuotation sysSupplierQuotation) - { - List list = sysSupplierQuotationService.selectSysSupplierQuotationList(sysSupplierQuotation); - ExcelUtil util = new ExcelUtil(SysSupplierQuotation.class); - return util.exportExcel(list, "供应商报价数据"); - } - - /** - * 新增供应商报价 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存供应商报价 - */ - @RequiresPermissions("system:supplierquotation:add") - @Log(title = "供应商报价", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(SysSupplierQuotation sysSupplierQuotation) - { - return toAjax(sysSupplierQuotationService.insertSysSupplierQuotation(sysSupplierQuotation)); - } - - /** - * 修改供应商报价 - */ - @GetMapping("/edit/{supplierQuotationId}") - public String edit(@PathVariable("supplierQuotationId") Long supplierQuotationId, ModelMap mmap) - { - SysSupplierQuotation sysSupplierQuotation = sysSupplierQuotationService.selectSysSupplierQuotationById(supplierQuotationId); - mmap.put("sysSupplierQuotation", sysSupplierQuotation); - return prefix + "/edit"; - } - - /** - * 修改保存供应商报价 - */ - @RequiresPermissions("system:supplierquotation:edit") - @Log(title = "供应商报价", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(SysSupplierQuotation sysSupplierQuotation) - { - return toAjax(sysSupplierQuotationService.updateSysSupplierQuotation(sysSupplierQuotation)); - } - - /** - * 删除供应商报价 - */ - @RequiresPermissions("system:supplierquotation:remove") - @Log(title = "供应商报价", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(sysSupplierQuotationService.deleteSysSupplierQuotationByIds(ids)); - } - - /** - * 获取报价编号 - */ - @PostMapping("/getId") - @ResponseBody - public Result getId() throws Exception { - return Result.getSuccessResult(sysSupplierQuotationService.getId()); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplierQuotation.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplierQuotation.java deleted file mode 100644 index eca72224..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplierQuotation.java +++ /dev/null @@ -1,495 +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_supplier_quotation - * - * @author ruoyi - * @date 2022-11-08 - */ -public class SysSupplierQuotation extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 供应商报价id */ - private Long supplierQuotationId; - - /** 报价编码 */ - @Excel(name = "报价编码") - private String quotationCode; - - /** 原辅料代码 */ - @Excel(name = "原辅料代码") - private String rawSubsidiaryCode; - - /** 原辅料名称 */ - @Excel(name = "原辅料名称") - private String rawSubsidiaryName; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 机种 */ - @Excel(name = "机种") - private String typeMachine; - - /** 物料类别 */ - @Excel(name = "物料类别") - private String materialType; - /** 库存单位 */ - @Excel(name = "库存单位") - private String inventoryUnit; - - /** 币别 */ - @Excel(name = "币别") - private String commonCurrency; - - /** 库存单价 */ - @Excel(name = "库存单价") - private String inventoryPrice; - - /** 采购单位 */ - @Excel(name = "采购单位") - private String purchasingUnit; - - /** 采购单价 */ - @Excel(name = "采购单价") - private String purchasePrice; - - /** 关系公式 */ - @Excel(name = "关系公式") - private String relationalFormula; - - /** 供应商编号 */ - @Excel(name = "供应商编号") - private String supplierCode; - - /** 供应商名称 */ - @Excel(name = "供应商名称") - private String supplierName; - - /** 定价日期 */ - @Excel(name = "定价日期") - private String pricingDate; - - /** 含税否 */ - @Excel(name = "含税否") - private String confirmTax; - - /** 税率 */ - @Excel(name = "税率") - private String taxRate; - - /** 说明 */ - @Excel(name = "说明") - private String quotationExplain; - - /** 是否为当前报价 */ - @Excel(name = "是否为当前报价") - private String currentQuote; - - /** 登记人 */ - @Excel(name = "登记人") - private String registrant; - - /** 确认否 */ - @Excel(name = "确认否") - private String confirmNo; - - /** 审核否 */ - @Excel(name = "审核否") - private String auditNo; - - /** 核准否 */ - @Excel(name = "核准否") - private String approveNo; - - /** 确认人 */ - @Excel(name = "确认人") - private String confirmName; - - /** 确认时间 */ - @Excel(name = "确认时间") - private String confirmTime; - - /** 审核人 */ - @Excel(name = "审核人") - private String auditName; - - /** 审核时间 */ - @Excel(name = "审核时间") - private String auditTime; - - /** 核准人 */ - @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 setSupplierQuotationId(Long supplierQuotationId) - { - this.supplierQuotationId = supplierQuotationId; - } - - public Long getSupplierQuotationId() - { - return supplierQuotationId; - } - public void setQuotationCode(String quotationCode) - { - this.quotationCode = quotationCode; - } - - public String getQuotationCode() - { - return quotationCode; - } - public void setRawSubsidiaryCode(String rawSubsidiaryCode) - { - this.rawSubsidiaryCode = rawSubsidiaryCode; - } - - public String getRawSubsidiaryCode() - { - return rawSubsidiaryCode; - } - public void setRawSubsidiaryName(String rawSubsidiaryName) - { - this.rawSubsidiaryName = rawSubsidiaryName; - } - - public String getRawSubsidiaryName() - { - return rawSubsidiaryName; - } - 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 String getMaterialType() { - return materialType; - } - - public void setMaterialType(String materialType) { - this.materialType = materialType; - } - - 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 setInventoryPrice(String inventoryPrice) - { - this.inventoryPrice = inventoryPrice; - } - - public String getInventoryPrice() - { - return inventoryPrice; - } - public void setPurchasingUnit(String purchasingUnit) - { - this.purchasingUnit = purchasingUnit; - } - - public String getPurchasingUnit() - { - return purchasingUnit; - } - public void setPurchasePrice(String purchasePrice) - { - this.purchasePrice = purchasePrice; - } - - public String getPurchasePrice() - { - return purchasePrice; - } - public void setRelationalFormula(String relationalFormula) - { - this.relationalFormula = relationalFormula; - } - - public String getRelationalFormula() - { - return relationalFormula; - } - public void setSupplierCode(String supplierCode) - { - this.supplierCode = supplierCode; - } - - public String getSupplierCode() - { - return supplierCode; - } - public void setSupplierName(String supplierName) - { - this.supplierName = supplierName; - } - - public String getSupplierName() - { - return supplierName; - } - public void setPricingDate(String pricingDate) - { - this.pricingDate = pricingDate; - } - - public String getPricingDate() - { - return pricingDate; - } - public void setConfirmTax(String confirmTax) - { - this.confirmTax = confirmTax; - } - - public String getConfirmTax() - { - return confirmTax; - } - public void setTaxRate(String taxRate) - { - this.taxRate = taxRate; - } - - public String getTaxRate() - { - return taxRate; - } - 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 setRegistrant(String registrant) - { - this.registrant = registrant; - } - - public String getRegistrant() - { - return registrant; - } - public void setConfirmNo(String confirmNo) - { - this.confirmNo = confirmNo; - } - - public String getConfirmNo() - { - return confirmNo; - } - public void setAuditNo(String auditNo) - { - this.auditNo = auditNo; - } - - public String getAuditNo() - { - return auditNo; - } - public void setApproveNo(String approveNo) - { - this.approveNo = approveNo; - } - - public String getApproveNo() - { - return approveNo; - } - 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 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 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; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("supplierQuotationId", getSupplierQuotationId()) - .append("quotationCode", getQuotationCode()) - .append("rawSubsidiaryCode", getRawSubsidiaryCode()) - .append("rawSubsidiaryName", getRawSubsidiaryName()) - .append("specificationModel", getSpecificationModel()) - .append("typeMachine", getTypeMachine()) - .append("materialType", getMaterialType()) - .append("inventoryUnit", getInventoryUnit()) - .append("commonCurrency", getCommonCurrency()) - .append("inventoryPrice", getInventoryPrice()) - .append("purchasingUnit", getPurchasingUnit()) - .append("purchasePrice", getPurchasePrice()) - .append("relationalFormula", getRelationalFormula()) - .append("supplierCode", getSupplierCode()) - .append("supplierName", getSupplierName()) - .append("pricingDate", getPricingDate()) - .append("confirmTax", getConfirmTax()) - .append("taxRate", getTaxRate()) - .append("quotationExplain", getQuotationExplain()) - .append("currentQuote", getCurrentQuote()) - .append("registrant", getRegistrant()) - .append("confirmNo", getConfirmNo()) - .append("auditNo", getAuditNo()) - .append("approveNo", getApproveNo()) - .append("confirmName", getConfirmName()) - .append("confirmTime", getConfirmTime()) - .append("auditName", getAuditName()) - .append("auditTime", getAuditTime()) - .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/SysSupplierQuotationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierQuotationMapper.java deleted file mode 100644 index c3648525..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierQuotationMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysSupplierQuotation; - -/** - * 供应商报价Mapper接口 - * - * @author ruoyi - * @date 2022-11-08 - */ -public interface SysSupplierQuotationMapper -{ - /** - * 查询供应商报价 - * - * @param supplierQuotationId 供应商报价ID - * @return 供应商报价 - */ - public SysSupplierQuotation selectSysSupplierQuotationById(Long supplierQuotationId); - - /** - * 查询供应商报价列表 - * - * @param sysSupplierQuotation 供应商报价 - * @return 供应商报价集合 - */ - public List selectSysSupplierQuotationList(SysSupplierQuotation sysSupplierQuotation); - - /** - * 新增供应商报价 - * - * @param sysSupplierQuotation 供应商报价 - * @return 结果 - */ - public int insertSysSupplierQuotation(SysSupplierQuotation sysSupplierQuotation); - - /** - * 修改供应商报价 - * - * @param sysSupplierQuotation 供应商报价 - * @return 结果 - */ - public int updateSysSupplierQuotation(SysSupplierQuotation sysSupplierQuotation); - - /** - * 删除供应商报价 - * - * @param supplierQuotationId 供应商报价ID - * @return 结果 - */ - public int deleteSysSupplierQuotationById(Long supplierQuotationId); - - /** - * 批量删除供应商报价 - * - * @param supplierQuotationIds 需要删除的数据ID - * @return 结果 - */ - public int deleteSysSupplierQuotationByIds(String[] supplierQuotationIds); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierQuotationService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierQuotationService.java deleted file mode 100644 index 5b003bfc..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierQuotationService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.system.domain.SysSupplierQuotation; - -import java.util.List; - -/** - * 供应商报价Service接口 - * - * @author ruoyi - * @date 2022-11-08 - */ -public interface ISysSupplierQuotationService -{ - /** - * 查询供应商报价 - * - * @param supplierQuotationId 供应商报价ID - * @return 供应商报价 - */ - public SysSupplierQuotation selectSysSupplierQuotationById(Long supplierQuotationId); - - /** - * 查询供应商报价列表 - * - * @param sysSupplierQuotation 供应商报价 - * @return 供应商报价集合 - */ - public List selectSysSupplierQuotationList(SysSupplierQuotation sysSupplierQuotation); - - /** - * 新增供应商报价 - * - * @param sysSupplierQuotation 供应商报价 - * @return 结果 - */ - public int insertSysSupplierQuotation(SysSupplierQuotation sysSupplierQuotation); - - /** - * 修改供应商报价 - * - * @param sysSupplierQuotation 供应商报价 - * @return 结果 - */ - public int updateSysSupplierQuotation(SysSupplierQuotation sysSupplierQuotation); - - /** - * 批量删除供应商报价 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSysSupplierQuotationByIds(String ids); - - /** - * 删除供应商报价信息 - * - * @param supplierQuotationId 供应商报价ID - * @return 结果 - */ - public int deleteSysSupplierQuotationById(Long supplierQuotationId); - - public String getId(); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java deleted file mode 100644 index ba70de35..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.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.SysSupplierQuotation; -import com.ruoyi.system.mapper.SysSupplierQuotationMapper; -import com.ruoyi.system.service.ISysSupplierQuotationService; -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-08 - */ -@Service -public class SysSupplierQuotationServiceImpl implements ISysSupplierQuotationService -{ - @Autowired - private SysSupplierQuotationMapper sysSupplierQuotationMapper; - - /** - * 查询供应商报价 - * - * @param supplierQuotationId 供应商报价ID - * @return 供应商报价 - */ - @Override - public SysSupplierQuotation selectSysSupplierQuotationById(Long supplierQuotationId) - { - return sysSupplierQuotationMapper.selectSysSupplierQuotationById(supplierQuotationId); - } - - /** - * 查询供应商报价列表 - * - * @param sysSupplierQuotation 供应商报价 - * @return 供应商报价 - */ - @Override - public List selectSysSupplierQuotationList(SysSupplierQuotation sysSupplierQuotation) - { - return sysSupplierQuotationMapper.selectSysSupplierQuotationList(sysSupplierQuotation); - } - - /** - * 新增供应商报价 - * - * @param sysSupplierQuotation 供应商报价 - * @return 结果 - */ - @Override - public int insertSysSupplierQuotation(SysSupplierQuotation sysSupplierQuotation) - { - return sysSupplierQuotationMapper.insertSysSupplierQuotation(sysSupplierQuotation); - } - - /** - * 修改供应商报价 - * - * @param sysSupplierQuotation 供应商报价 - * @return 结果 - */ - @Override - public int updateSysSupplierQuotation(SysSupplierQuotation sysSupplierQuotation) - { - return sysSupplierQuotationMapper.updateSysSupplierQuotation(sysSupplierQuotation); - } - - /** - * 删除供应商报价对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSysSupplierQuotationByIds(String ids) - { - return sysSupplierQuotationMapper.deleteSysSupplierQuotationByIds(Convert.toStrArray(ids)); - } - - /** - * 删除供应商报价信息 - * - * @param supplierQuotationId 供应商报价ID - * @return 结果 - */ - @Override - public int deleteSysSupplierQuotationById(Long supplierQuotationId) - { - return sysSupplierQuotationMapper.deleteSysSupplierQuotationById(supplierQuotationId); - } - - @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/SysSupplierQuotationMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierQuotationMapper.xml deleted file mode 100644 index 827e1026..00000000 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierQuotationMapper.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select supplier_quotation_id, quotation_code, raw_subsidiary_code, raw_subsidiary_name, specification_model, type_machine, material_type, inventory_unit, common_currency, inventory_price, purchasing_unit, purchase_price, relational_formula, supplier_code, supplier_name, pricing_date, confirm_tax, tax_rate, quotation_explain, current_quote, registrant, confirm_no, audit_no, approve_no, confirm_name, confirm_time, audit_name, audit_time, approve_name, approve_time, standby_one, standby_two, first_add_time, update_info_time from sys_supplier_quotation - - - - - - - - insert into sys_supplier_quotation - - quotation_code, - raw_subsidiary_code, - raw_subsidiary_name, - specification_model, - type_machine, - material_type, - inventory_unit, - common_currency, - inventory_price, - purchasing_unit, - purchase_price, - relational_formula, - supplier_code, - supplier_name, - pricing_date, - confirm_tax, - tax_rate, - quotation_explain, - current_quote, - registrant, - confirm_no, - audit_no, - approve_no, - confirm_name, - confirm_time, - audit_name, - audit_time, - approve_name, - approve_time, - standby_one, - standby_two, - first_add_time, - - - #{quotationCode}, - #{rawSubsidiaryCode}, - #{rawSubsidiaryName}, - #{specificationModel}, - #{typeMachine}, - #{materialType}, - #{inventoryUnit}, - #{commonCurrency}, - #{inventoryPrice}, - #{purchasingUnit}, - #{purchasePrice}, - #{relationalFormula}, - #{supplierCode}, - #{supplierName}, - #{pricingDate}, - #{confirmTax}, - #{taxRate}, - #{quotationExplain}, - #{currentQuote}, - #{registrant}, - #{confirmNo}, - #{auditNo}, - #{approveNo}, - #{confirmName}, - #{confirmTime}, - #{auditName}, - #{auditTime}, - #{approveName}, - #{approveTime}, - #{standbyOne}, - #{standbyTwo}, - now(), - - - - - update sys_supplier_quotation - - quotation_code = #{quotationCode}, - raw_subsidiary_code = #{rawSubsidiaryCode}, - raw_subsidiary_name = #{rawSubsidiaryName}, - specification_model = #{specificationModel}, - type_machine = #{typeMachine}, - material_type = #{materialType}, - inventory_unit = #{inventoryUnit}, - common_currency = #{commonCurrency}, - inventory_price = #{inventoryPrice}, - purchasing_unit = #{purchasingUnit}, - purchase_price = #{purchasePrice}, - relational_formula = #{relationalFormula}, - supplier_code = #{supplierCode}, - supplier_name = #{supplierName}, - pricing_date = #{pricingDate}, - confirm_tax = #{confirmTax}, - tax_rate = #{taxRate}, - quotation_explain = #{quotationExplain}, - current_quote = #{currentQuote}, - registrant = #{registrant}, - confirm_no = #{confirmNo}, - audit_no = #{auditNo}, - approve_no = #{approveNo}, - confirm_name = #{confirmName}, - confirm_time = #{confirmTime}, - audit_name = #{auditName}, - audit_time = #{auditTime}, - approve_name = #{approveName}, - approve_time = #{approveTime}, - standby_one = #{standbyOne}, - standby_two = #{standbyTwo}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), - - where supplier_quotation_id = #{supplierQuotationId} - - - - delete from sys_supplier_quotation where supplier_quotation_id = #{supplierQuotationId} - - - - delete from sys_supplier_quotation where supplier_quotation_id in - - #{supplierQuotationId} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/add.html index 29b65289..5731c0d1 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/add.html @@ -260,7 +260,6 @@ var accountReconciliationFlagDatas = [[${@dict.getType('sys_whether')}]]; var prefix = ctx + "purchase/purchaseOrder" - var prefixSupplierQuotation = ctx + 'system/supplierquotation' var prefixPurchaseMaterial = ctx + 'purchase/purchaseMaterial' $("#form-purchaseOrder-add").validate({ diff --git a/ruoyi-admin/src/main/resources/templates/system/supplierquotation/add.html b/ruoyi-admin/src/main/resources/templates/system/supplierquotation/add.html deleted file mode 100644 index 2de64911..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/supplierquotation/add.html +++ /dev/null @@ -1,554 +0,0 @@ - - - - - - - - - - - -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
- - - - - - - - - - - - - -
-
- - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/supplierquotation/edit.html b/ruoyi-admin/src/main/resources/templates/system/supplierquotation/edit.html deleted file mode 100644 index f9db9dba..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/supplierquotation/edit.html +++ /dev/null @@ -1,420 +0,0 @@ - - - - - - - - - - - -
-
- -
- -
- -
-
-
- -
- - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
- - - - - - - - - - - - - - - -
-
- - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html b/ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html deleted file mode 100644 index 64424a7d..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html +++ /dev/null @@ -1,668 +0,0 @@ - - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - - - - - - -
    • -
  • - - -
    • -
  • - - - - - - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - -
审核成功
- - - - -
供应商报价已核准
- - - -
供应商报价已确认
- - - - - - - - \ No newline at end of file