From d7ed65a87a32b1515b38e7474b6356657fd69ecf Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 22 Oct 2024 09:40:59 +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=E9=94=80=E5=94=AE=E5=AF=B9=E8=B4=A6=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=20sales=5Faccount=5Freconciliation=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 --- .../SalesAccountReconciliationController.java | 252 ------ .../domain/SalesAccountReconciliation.java | 295 ------ .../SalesAccountReconciliationMapper.java | 62 -- .../ISalesAccountReconciliationService.java | 62 -- ...SalesAccountReconciliationServiceImpl.java | 95 -- .../SalesAccountReconciliationMapper.xml | 284 ------ .../sales/salesAccountReconciliation/add.html | 341 ------- .../salesAccountReconciliation/edit.html | 342 ------- .../salesAccountReconciliation.html | 852 ------------------ 9 files changed, 2585 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesAccountReconciliationController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesAccountReconciliation.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesAccountReconciliationMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesAccountReconciliationService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesAccountReconciliationServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/sales/SalesAccountReconciliationMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesAccountReconciliationController.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesAccountReconciliationController.java deleted file mode 100644 index be133df8..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesAccountReconciliationController.java +++ /dev/null @@ -1,252 +0,0 @@ -package com.ruoyi.sales.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.excel.write.metadata.style.WriteCellStyle; -import com.alibaba.excel.write.metadata.style.WriteFont; -import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.sales.domain.SalesAccountReconciliation; -import com.ruoyi.sales.domain.exportDto.SalesAccountReconciliationDto; -import com.ruoyi.sales.service.ISalesAccountReconciliationService; -import com.ruoyi.system.domain.SysCustomer; -import com.ruoyi.system.domain.SysCustomerVo; -import com.ruoyi.system.service.ISysCustomerService; -import com.ruoyi.system.service.ISysDictTypeService; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URLEncoder; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -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 2023-02-03 - */ -@Controller -@RequestMapping("/sales/salesAccountReconciliation") -public class SalesAccountReconciliationController extends BaseController -{ - private String prefix = "sales/salesAccountReconciliation"; - - @Autowired - private ISalesAccountReconciliationService salesAccountReconciliationService; - - @Autowired - private ISysCustomerService customerService; - - @Autowired - private ISysDictTypeService sysDictTypeService; - - @RequiresPermissions("sales:salesAccountReconciliation:view") - @GetMapping() - public String salesAccountReconciliation() - { - return prefix + "/salesAccountReconciliation"; - } - - /** - * 查询销售对账列表 - */ - @RequiresPermissions("sales:salesAccountReconciliation:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SalesAccountReconciliation salesAccountReconciliation) - { - startPage(); - List list = salesAccountReconciliationService.selectSalesAccountReconciliationList(salesAccountReconciliation); - return getDataTable(list); - } - - /** - * 导出销售对账列表 - */ - @RequiresPermissions("sales:salesAccountReconciliation:export") - @Log(title = "销售对账", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SalesAccountReconciliation salesAccountReconciliation) - { - List list = salesAccountReconciliationService.selectSalesAccountReconciliationList(salesAccountReconciliation); - ExcelUtil util = new ExcelUtil(SalesAccountReconciliation.class); - return util.exportExcel(list, "销售对账数据"); - } - - /** - * 新增销售对账 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存销售对账 - */ - @RequiresPermissions("sales:salesAccountReconciliation:add") - @Log(title = "销售对账", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(SalesAccountReconciliation salesAccountReconciliation) - { - return toAjax(salesAccountReconciliationService.insertSalesAccountReconciliation(salesAccountReconciliation)); - } - - /** - * 修改销售对账 - */ - @GetMapping("/edit/{salesFinishId}") - public String edit(@PathVariable("salesFinishId") Long salesFinishId, ModelMap mmap) - { - SalesAccountReconciliation salesAccountReconciliation = salesAccountReconciliationService.selectSalesAccountReconciliationById(salesFinishId); - mmap.put("salesAccountReconciliation", salesAccountReconciliation); - return prefix + "/edit"; - } - - /** - * 修改保存销售对账 - */ - @RequiresPermissions("sales:salesAccountReconciliation:edit") - @Log(title = "销售对账", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(SalesAccountReconciliation salesAccountReconciliation) - { - return toAjax(salesAccountReconciliationService.updateSalesAccountReconciliation(salesAccountReconciliation)); - } - - /** - * 删除销售对账 - */ - @RequiresPermissions("sales:salesAccountReconciliation:remove") - @Log(title = "销售对账", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(salesAccountReconciliationService.deleteSalesAccountReconciliationByIds(ids)); - } - - //获取客户信息 - @PostMapping("/getCustomerList") - @ResponseBody - public List getCustomerList(SysCustomer customer) { - List list = customerService.selectSysCustomerToList(); - return list; - } - - /** - * 导出 - * @param ids - * @param response - * @throws IOException - */ - @RequiresPermissions("purchase:purchaseOrder:export") - @Log(title = "采购订单", businessType = BusinessType.EXPORT) - @RequestMapping("/exportSelected/{ids}") - @ResponseBody - public void exportSelected(@PathVariable("ids") String ids, HttpServletResponse response) throws IOException { - String[] idsStr = ids.split(","); - // 创建列合并工具类对象 -// ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils(); - List salesAccountReconciliationDtoList = new ArrayList<>(); - List salesAccountReconciliationList = new ArrayList<>(); - for (int i = 0; i < idsStr.length; i++) { - SalesAccountReconciliation salesAccountReconciliation = salesAccountReconciliationService.selectSalesAccountReconciliationById(Long.valueOf(idsStr[i])); - salesAccountReconciliationList.add(salesAccountReconciliation); - } - Double total = 0.00; - try { - int number = 0; - Iterator values= salesAccountReconciliationList.iterator(); - while(values.hasNext()) { - Object source = values.next(); - SalesAccountReconciliationDto target = SalesAccountReconciliationDto.class.newInstance(); - BeanUtils.copyProperties(source, target); - List deptData = sysDictTypeService.selectDictDataByType("sys_common_currency"); - for (int i = 0;i>>>>>异常<<<<<<", e); - } - - 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\\exportSalesReconciliation.xlsx"; - try (ExcelWriter excelWriter = EasyExcel - .write(response.getOutputStream(), SalesAccountReconciliationDto.class) - .withTemplate(templateFileName) -// .registerWriteHandler(mergePrevColUtils) - //样式注册 - .registerWriteHandler(horizontalCellStyleStrategyBuilder()) - .build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); - FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); - excelWriter.fill(salesAccountReconciliationDtoList, fillConfig, writeSheet); - Map map = MapUtils.newHashMap(); - map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now())); - map.put("total", total); - excelWriter.fill(map, writeSheet); - } - } - - public HorizontalCellStyleStrategy horizontalCellStyleStrategyBuilder() { - WriteCellStyle headWriteCellStyle = new WriteCellStyle(); - //设置头字体 - WriteFont headWriteFont = new WriteFont(); - headWriteFont.setFontHeightInPoints((short) 13); - headWriteFont.setBold(true); - headWriteCellStyle.setWriteFont(headWriteFont); - //设置头居中 - headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); - - //内容策略 - WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); - //设置 水平居中 - contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); -// 垂直居中 - contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); -//// 单元格边框 -// contentWriteCellStyle.setBorderTop(BorderStyle.THIN); -// contentWriteCellStyle.setBorderBottom(BorderStyle.THIN); -// contentWriteCellStyle.setBorderLeft(BorderStyle.THIN); -// contentWriteCellStyle.setBorderRight(BorderStyle.THIN); - - return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesAccountReconciliation.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesAccountReconciliation.java deleted file mode 100644 index f056e8e8..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesAccountReconciliation.java +++ /dev/null @@ -1,295 +0,0 @@ -package com.ruoyi.sales.domain; - -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; - -/** - * 销售对账对象 sales_account_reconciliation - * - * @author ruoyi - * @date 2023-02-03 - */ -public class SalesAccountReconciliation extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 销售物料id */ - @Excel(name = "销售物料id") - private String salesFinishId; - - /** 发货通知单号 */ - @Excel(name = "发货通知单号") - private String noticeOrderNumber; - - /** 发货日期 */ - @Excel(name = "发货日期") - private String deliveryDate; - - /** 订单号码 */ - @Excel(name = "订单号码") - private String salesOrderNumber; - - /** 客户代码 */ - @Excel(name = "客户代码") - private String enterpriseCode; - - /** 客户名称 */ - @Excel(name = "客户名称") - private String enterpriseName; - - /** 联系人 */ - @Excel(name = "联系人") - private String customerContact; - - /** 成品代码 */ - @Excel(name = "成品代码") - private String finishProductCode; - - /** 成品名称 */ - @Excel(name = "成品名称") - private String finishProductName; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 客户料号 */ - @Excel(name = "客户料号") - private String customerNumber; - - /** 币别 */ - @Excel(name = "币别") - private String commonCurrency; - - /** 单价 */ - @Excel(name = "单价") - private String processPrice; - - /** 数量 */ - @Excel(name = "数量") - private String productQuantity; - - /** 金额 */ - @Excel(name = "金额") - private String amountMoney; - - /** 客户使用否 */ - @Excel(name = "客户使用否") - private String customerUseOrNot; - - /** 客户使用数量 */ - @Excel(name = "客户使用数量") - private String customerUseQuantity; - - /** 客户使用备注说明 */ - @Excel(name = "客户使用备注说明") - private String customerUseRemarks; - - /** 对账否 */ - @Excel(name = "对账否") - private String accountReconciliationOrNot; - - /** 对账人 */ - @Excel(name = "对账人") - private String accountReconciliationPerson; - - /** 对账时间 */ - @Excel(name = "对账时间") - private String accountReconciliationTime; - - public String getSalesFinishId() { - return salesFinishId; - } - - public void setSalesFinishId(String salesFinishId) { - this.salesFinishId = salesFinishId; - } - - public String getNoticeOrderNumber() { - return noticeOrderNumber; - } - - public void setNoticeOrderNumber(String noticeOrderNumber) { - this.noticeOrderNumber = noticeOrderNumber; - } - - public String getDeliveryDate() { - return deliveryDate; - } - - public void setDeliveryDate(String deliveryDate) { - this.deliveryDate = deliveryDate; - } - - public String getSalesOrderNumber() { - return salesOrderNumber; - } - - public void setSalesOrderNumber(String salesOrderNumber) { - this.salesOrderNumber = salesOrderNumber; - } - - public String getEnterpriseCode() { - return enterpriseCode; - } - - public void setEnterpriseCode(String enterpriseCode) { - this.enterpriseCode = enterpriseCode; - } - - public String getEnterpriseName() { - return enterpriseName; - } - - public void setEnterpriseName(String enterpriseName) { - this.enterpriseName = enterpriseName; - } - - public String getCustomerContact() { - return customerContact; - } - - public void setCustomerContact(String customerContact) { - this.customerContact = customerContact; - } - - public String getFinishProductCode() { - return finishProductCode; - } - - public void setFinishProductCode(String finishProductCode) { - this.finishProductCode = finishProductCode; - } - - public String getFinishProductName() { - return finishProductName; - } - - public void setFinishProductName(String finishProductName) { - this.finishProductName = finishProductName; - } - - public String getSpecificationModel() { - return specificationModel; - } - - public void setSpecificationModel(String specificationModel) { - this.specificationModel = specificationModel; - } - - public String getCustomerNumber() { - return customerNumber; - } - - public void setCustomerNumber(String customerNumber) { - this.customerNumber = customerNumber; - } - - public String getCommonCurrency() { - return commonCurrency; - } - - public void setCommonCurrency(String commonCurrency) { - this.commonCurrency = commonCurrency; - } - - public String getProcessPrice() { - return processPrice; - } - - public void setProcessPrice(String processPrice) { - this.processPrice = processPrice; - } - - public String getProductQuantity() { - return productQuantity; - } - - public void setProductQuantity(String productQuantity) { - this.productQuantity = productQuantity; - } - - public String getAmountMoney() { - return amountMoney; - } - - public void setAmountMoney(String amountMoney) { - this.amountMoney = amountMoney; - } - - public String getCustomerUseOrNot() { - return customerUseOrNot; - } - - public void setCustomerUseOrNot(String customerUseOrNot) { - this.customerUseOrNot = customerUseOrNot; - } - - public String getCustomerUseQuantity() { - return customerUseQuantity; - } - - public void setCustomerUseQuantity(String customerUseQuantity) { - this.customerUseQuantity = customerUseQuantity; - } - - public String getCustomerUseRemarks() { - return customerUseRemarks; - } - - public void setCustomerUseRemarks(String customerUseRemarks) { - this.customerUseRemarks = customerUseRemarks; - } - - public String getAccountReconciliationOrNot() { - return accountReconciliationOrNot; - } - - public void setAccountReconciliationOrNot(String accountReconciliationOrNot) { - this.accountReconciliationOrNot = accountReconciliationOrNot; - } - - public String getAccountReconciliationPerson() { - return accountReconciliationPerson; - } - - public void setAccountReconciliationPerson(String accountReconciliationPerson) { - this.accountReconciliationPerson = accountReconciliationPerson; - } - - public String getAccountReconciliationTime() { - return accountReconciliationTime; - } - - public void setAccountReconciliationTime(String accountReconciliationTime) { - this.accountReconciliationTime = accountReconciliationTime; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("salesFinishId", salesFinishId) - .append("noticeOrderNumber", noticeOrderNumber) - .append("deliveryDate", deliveryDate) - .append("salesOrderNumber", salesOrderNumber) - .append("enterpriseCode", enterpriseCode) - .append("enterpriseName", enterpriseName) - .append("customerContact", customerContact) - .append("finishProductCode", finishProductCode) - .append("finishProductName", finishProductName) - .append("specificationModel", specificationModel) - .append("customerNumber", customerNumber) - .append("commonCurrency", commonCurrency) - .append("processPrice", processPrice) - .append("productQuantity", productQuantity) - .append("amountMoney", amountMoney) - .append("customerUseOrNot", customerUseOrNot) - .append("customerUseQuantity", customerUseQuantity) - .append("customerUseRemarks", customerUseRemarks) - .append("accountReconciliationOrNot", accountReconciliationOrNot) - .append("accountReconciliationPerson", accountReconciliationPerson) - .append("accountReconciliationTime", accountReconciliationTime) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesAccountReconciliationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesAccountReconciliationMapper.java deleted file mode 100644 index fb962718..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesAccountReconciliationMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.sales.mapper; - -import com.ruoyi.sales.domain.SalesAccountReconciliation; - -import java.util.List; - -/** - * 销售对账Mapper接口 - * - * @author ruoyi - * @date 2023-02-03 - */ -public interface SalesAccountReconciliationMapper -{ - /** - * 查询销售对账 - * - * @param salesFinishId 销售对账ID - * @return 销售对账 - */ - public SalesAccountReconciliation selectSalesAccountReconciliationById(Long salesFinishId); - - /** - * 查询销售对账列表 - * - * @param salesAccountReconciliation 销售对账 - * @return 销售对账集合 - */ - public List selectSalesAccountReconciliationList(SalesAccountReconciliation salesAccountReconciliation); - - /** - * 新增销售对账 - * - * @param salesAccountReconciliation 销售对账 - * @return 结果 - */ - public int insertSalesAccountReconciliation(SalesAccountReconciliation salesAccountReconciliation); - - /** - * 修改销售对账 - * - * @param salesAccountReconciliation 销售对账 - * @return 结果 - */ - public int updateSalesAccountReconciliation(SalesAccountReconciliation salesAccountReconciliation); - - /** - * 删除销售对账 - * - * @param salesOrderCode 销售对账ID - * @return 结果 - */ - public int deleteSalesAccountReconciliationById(String salesOrderCode); - - /** - * 批量删除销售对账 - * - * @param salesOrderCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteSalesAccountReconciliationByIds(String[] salesOrderCodes); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesAccountReconciliationService.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesAccountReconciliationService.java deleted file mode 100644 index 0a4e689a..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesAccountReconciliationService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.sales.service; - -import com.ruoyi.sales.domain.SalesAccountReconciliation; - -import java.util.List; - -/** - * 销售对账Service接口 - * - * @author ruoyi - * @date 2023-02-03 - */ -public interface ISalesAccountReconciliationService -{ - /** - * 查询销售对账 - * - * @param salesFinishId 销售对账ID - * @return 销售对账 - */ - public SalesAccountReconciliation selectSalesAccountReconciliationById(Long salesFinishId); - - /** - * 查询销售对账列表 - * - * @param salesAccountReconciliation 销售对账 - * @return 销售对账集合 - */ - public List selectSalesAccountReconciliationList(SalesAccountReconciliation salesAccountReconciliation); - - /** - * 新增销售对账 - * - * @param salesAccountReconciliation 销售对账 - * @return 结果 - */ - public int insertSalesAccountReconciliation(SalesAccountReconciliation salesAccountReconciliation); - - /** - * 修改销售对账 - * - * @param salesAccountReconciliation 销售对账 - * @return 结果 - */ - public int updateSalesAccountReconciliation(SalesAccountReconciliation salesAccountReconciliation); - - /** - * 批量删除销售对账 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSalesAccountReconciliationByIds(String ids); - - /** - * 删除销售对账信息 - * - * @param salesOrderCode 销售对账ID - * @return 结果 - */ - public int deleteSalesAccountReconciliationById(String salesOrderCode); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesAccountReconciliationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesAccountReconciliationServiceImpl.java deleted file mode 100644 index cabba3e8..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesAccountReconciliationServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ruoyi.sales.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.sales.domain.SalesAccountReconciliation; -import com.ruoyi.sales.mapper.SalesAccountReconciliationMapper; -import com.ruoyi.sales.service.ISalesAccountReconciliationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 销售对账Service业务层处理 - * - * @author ruoyi - * @date 2023-02-03 - */ -@Service -public class SalesAccountReconciliationServiceImpl implements ISalesAccountReconciliationService -{ - @Autowired - private SalesAccountReconciliationMapper salesAccountReconciliationMapper; - - /** - * 查询销售对账 - * - * @param salesFinishId 销售对账ID - * @return 销售对账 - */ - @Override - public SalesAccountReconciliation selectSalesAccountReconciliationById(Long salesFinishId) - { - return salesAccountReconciliationMapper.selectSalesAccountReconciliationById(salesFinishId); - } - - /** - * 查询销售对账列表 - * - * @param salesAccountReconciliation 销售对账 - * @return 销售对账 - */ - @Override - public List selectSalesAccountReconciliationList(SalesAccountReconciliation salesAccountReconciliation) - { - return salesAccountReconciliationMapper.selectSalesAccountReconciliationList(salesAccountReconciliation); - } - - /** - * 新增销售对账 - * - * @param salesAccountReconciliation 销售对账 - * @return 结果 - */ - @Override - public int insertSalesAccountReconciliation(SalesAccountReconciliation salesAccountReconciliation) - { - return salesAccountReconciliationMapper.insertSalesAccountReconciliation(salesAccountReconciliation); - } - - /** - * 修改销售对账 - * - * @param salesAccountReconciliation 销售对账 - * @return 结果 - */ - @Override - public int updateSalesAccountReconciliation(SalesAccountReconciliation salesAccountReconciliation) - { - return salesAccountReconciliationMapper.updateSalesAccountReconciliation(salesAccountReconciliation); - } - - /** - * 删除销售对账对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSalesAccountReconciliationByIds(String ids) - { - return salesAccountReconciliationMapper.deleteSalesAccountReconciliationByIds(Convert.toStrArray(ids)); - } - - /** - * 删除销售对账信息 - * - * @param salesOrderCode 销售对账ID - * @return 结果 - */ - @Override - public int deleteSalesAccountReconciliationById(String salesOrderCode) - { - return salesAccountReconciliationMapper.deleteSalesAccountReconciliationById(salesOrderCode); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesAccountReconciliationMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesAccountReconciliationMapper.xml deleted file mode 100644 index f8825bd3..00000000 --- a/ruoyi-admin/src/main/resources/mapper/sales/SalesAccountReconciliationMapper.xml +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --- select sales_finish_id, sso.sales_order_code AS sales_order_code,sso.sales_order_number AS sales_order_number, appointment_number, sso.enterprise_code AS enterprise_code, sso.enterprise_name AS enterprise_name, --- payment_terms, delivery_conditions, delivery_method, order_receiving_mode, customer_contact, customer_factory, --- contact_number, business_members, customer_fax, delivery_address, order_receiving_time, billing_time, customer_remarks, --- current_inventory, credit_limit, unpaid_amount, available_credit, confirm_tax, tax_rate, total_amount, modification_time, --- confirm_time, confirm_no, confirm_name, audit_no, audit_time, audit_remarks, national_tax_bill,finish_product_code, finish_product_name, --- specification_model, type_machine, inventory_unit, stock_unit_weight, process_price, product_quantity, amount_money, --- delivery_time, line, version_number, sales_explain, customer_use_or_not, customer_use_quantity, customer_use_remarks, --- account_reconciliation_or_not, account_reconciliation_person, account_reconciliation_time --- FROM sys_sales_order sso,sys_sales_finish ssf --- WHERE sso.sales_order_code = ssf.sales_order_code AND sso.sales_order_number = ssf.sales_order_number -SELECT - `sales`.sales_finish_id, - notice_order_number, - delivery_date, - `sales`.sales_order_number, - enterprise_code, - enterprise_name, - customer_contact, - `sales`.finish_product_code, - `sales`.finish_product_name, - specification_model, - customer_number, - common_currency, - process_price, - product_quantity, - amount_money, - account_reconciliation_or_not, - account_reconciliation_person, - account_reconciliation_time, - customer_use_or_not, - customer_use_quantity, - customer_use_remarks -FROM - ( - SELECT - ssf.sales_finish_id, - sso.sales_order_number AS sales_order_number, - sso.enterprise_code AS enterprise_code, - sso.enterprise_name AS enterprise_name, - sso.customer_contact, - ssf.finish_product_code AS finish_product_code, - ssf.finish_product_name AS finish_product_name, - ssf.account_reconciliation_or_not, - ssf.account_reconciliation_person, - ssf.account_reconciliation_time, - customer_use_or_not, - customer_use_quantity, - customer_use_remarks - FROM - sys_sales_order sso, - sys_sales_finish ssf - WHERE - sso.sales_order_code = ssf.sales_order_code - AND sso.sales_order_number = ssf.sales_order_number - ) AS `sales`, - ( - SELECT - dgd.notice_order_number AS notice_order_number, - dgd.sales_order_number AS sales_order_number, - dgn.delivery_date, - dgd.finish_product_code AS finish_product_code, - dgd.finish_product_name AS finish_product_name, - dgd.specification_model, - dgd.customer_number, - dgd.common_currency, - dgd.process_price, - dgd.product_quantity, - dgd.amount_money - FROM - delivery_goods_notice dgn, - delivery_goods_detail dgd - WHERE - dgn.notice_order_number = dgd.notice_order_number - ) AS `delivery` -WHERE - `sales`.sales_order_number = `delivery`.sales_order_number and - `sales`.finish_product_code = `delivery`.finish_product_code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update sys_sales_finish - - sales_order_number = #{salesOrderNumber}, - appointment_number = #{appointmentNumber}, - enterprise_code = #{enterpriseCode}, - enterprise_name = #{enterpriseName}, - finish_product_code = #{finishProductCode}, - finish_product_name = #{finishProductName}, - specification_model = #{specificationModel}, - type_machine = #{typeMachine}, - inventory_unit = #{inventoryUnit}, - stock_unit_weight = #{stockUnitWeight}, - process_price = #{processPrice}, - product_quantity = #{productQuantity}, - amount_money = #{amountMoney}, - delivery_time = #{deliveryTime}, - line = #{line}, - version_number = #{versionNumber}, - sales_explain = #{salesExplain}, - customer_use_or_not = #{customerUseOrNot}, - customer_use_quantity = #{customerUseQuantity}, - customer_use_remarks = #{customerUseRemarks}, - account_reconciliation_or_not = #{accountReconciliationOrNot}, - account_reconciliation_person = #{accountReconciliationPerson}, - account_reconciliation_time = #{accountReconciliationTime}, - - where sales_finish_id = #{salesFinishId} - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/add.html b/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/add.html deleted file mode 100644 index 06d3c27c..00000000 --- a/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/add.html +++ /dev/null @@ -1,341 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/edit.html b/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/edit.html deleted file mode 100644 index cb78ed47..00000000 --- a/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/edit.html +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- - 代码生成请选择字典属性 -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html b/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html deleted file mode 100644 index b3fab025..00000000 --- a/ruoyi-admin/src/main/resources/templates/sales/salesAccountReconciliation/salesAccountReconciliation.html +++ /dev/null @@ -1,852 +0,0 @@ - - - - - - - - - -
-
-
-
-
-
    -
  • - - - - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- -
- - - - - - - - - - - - - 销售信息 - - 销售对账确认 - - - 客户使用确认 - - - 导出 - - - - -
- - -
-
- -
- -
-
- - - - - - - - - - - - - - - \ No newline at end of file