Browse Source

删除旧版无用的销售产品对象 sys_sales_finish和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据

dev
liuxiaoxu 1 month ago
parent
commit
5350239d33
  1. 178
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesFinishController.java
  2. 92
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
  3. 358
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesFinish.java
  4. 61
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesFinishMapper.java
  5. 61
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesFinishService.java
  6. 94
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesFinishServiceImpl.java
  7. 149
      ruoyi-admin/src/main/resources/mapper/system/SysSalesFinishMapper.xml
  8. 139
      ruoyi-admin/src/main/resources/templates/system/salesFinish/add.html
  9. 140
      ruoyi-admin/src/main/resources/templates/system/salesFinish/edit.html
  10. 194
      ruoyi-admin/src/main/resources/templates/system/salesFinish/salesFinish.html

178
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesFinishController.java

@ -1,178 +0,0 @@
package com.ruoyi.system.controller;
import com.alibaba.fastjson.JSONObject;
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.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysSalesFinish;
import com.ruoyi.system.service.ISysSalesFinishService;
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.*;
import java.util.List;
import static com.ruoyi.common.core.domain.AjaxResult.Type.SUCCESS;
/**
* 销售产品Controller
*
* @author ruoyi
* @date 2022-11-24
*/
@Controller
@RequestMapping("/system/salesFinish")
public class SysSalesFinishController extends BaseController
{
private String prefix = "system/salesFinish";
@Autowired
private ISysSalesFinishService sysSalesFinishService;
@RequiresPermissions("system:salesFinish:view")
@GetMapping()
public String salesFinish()
{
return prefix + "/salesFinish";
}
/**
* 查询销售产品列表
*/
@RequiresPermissions("system:salesFinish:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(SysSalesFinish sysSalesFinish)
{
startPage();
List<SysSalesFinish> list = sysSalesFinishService.selectSysSalesFinishList(sysSalesFinish);
return getDataTable(list);
}
/**
* 导出销售产品列表
*/
@RequiresPermissions("system:salesFinish:export")
@Log(title = "销售产品", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(SysSalesFinish sysSalesFinish)
{
List<SysSalesFinish> list = sysSalesFinishService.selectSysSalesFinishList(sysSalesFinish);
ExcelUtil<SysSalesFinish> util = new ExcelUtil<SysSalesFinish>(SysSalesFinish.class);
return util.exportExcel(list, "销售产品数据");
}
/**
* 新增销售产品
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存销售产品
*/
@RequiresPermissions("system:salesFinish:add")
@Log(title = "销售产品", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(@RequestParam(value = "data") String data)
{
List<SysSalesFinish> sysSalesFinishList= JSONObject.parseArray(data, SysSalesFinish.class);
int i=0;
for(;i<sysSalesFinishList.size();i++) {
sysSalesFinishService.insertSysSalesFinish(sysSalesFinishList.get(i));
}
return new AjaxResult(SUCCESS, "test done");
}
/**
* 新增保存销售产品
*/
@RequiresPermissions("system:salesFinish:editAdd")
@Log(title = "销售产品", businessType = BusinessType.INSERT)
@PostMapping("/editAdd")
@ResponseBody
public AjaxResult editAddSave(@RequestParam(value = "data") String data)
{
List<SysSalesFinish> sysSalesFinishList= JSONObject.parseArray(data, SysSalesFinish.class);
int i=0;
for(;i<sysSalesFinishList.size();i++) {
String FinishLength = String.valueOf(sysSalesFinishService.selectSysSalesFinishById(sysSalesFinishList.get(i).getSalesFinishId()));
System.out.printf(FinishLength);
if (FinishLength.length() > 4) {
sysSalesFinishService.updateSysSalesFinish(sysSalesFinishList.get(i));
} else {
sysSalesFinishService.insertSysSalesFinish(sysSalesFinishList.get(i));
}
}
return new AjaxResult(SUCCESS, "test done");
}
//更新
@PostMapping("/updateFinish")
@ResponseBody
public AjaxResult updateSave(@RequestParam(value = "data") String data)
{
List<SysSalesFinish> sysSalesFinishList= JSONObject.parseArray(data, SysSalesFinish.class);
int i=0;
for(;i<sysSalesFinishList.size();i++) {
sysSalesFinishService.updateSysSalesFinish(sysSalesFinishList.get(i));
}
return new AjaxResult(SUCCESS, "test done");
}
/**
* 修改销售产品
*/
@GetMapping("/edit/{salesFinishId}")
public String edit(@PathVariable("salesFinishId") Long salesFinishId, ModelMap mmap)
{
SysSalesFinish sysSalesFinish = sysSalesFinishService.selectSysSalesFinishById(salesFinishId);
mmap.put("sysSalesFinish", sysSalesFinish);
return prefix + "/edit";
}
/**
* 修改保存销售产品
*/
@RequiresPermissions("system:salesFinish:edit")
@Log(title = "销售产品", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(SysSalesFinish sysSalesFinish)
{
return toAjax(sysSalesFinishService.updateSysSalesFinish(sysSalesFinish));
}
/**
* 删除销售产品
*/
@RequiresPermissions("system:salesFinish:remove")
@Log(title = "销售产品", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(sysSalesFinishService.deleteSysSalesFinishByIds(ids));
}
}

92
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java

@ -78,8 +78,6 @@ public class SysSalesOrderController extends BaseController
@Autowired
private ISysSalesOrderService sysSalesOrderService;
@Autowired
private ISysSalesFinishService sysSalesFinishService;
@Autowired
private ISysRoleService roleService;
@ -306,28 +304,7 @@ public class SysSalesOrderController extends BaseController
return toAjax(sysSalesOrderService.deleteSysSalesOrderByIds(ids));
}
@RequiresPermissions("system:salesOrder:remove")
@Log(title = "销售订单", businessType = BusinessType.DELETE)
@RequestMapping( "/removeSelected")
@ResponseBody
@Transactional(rollbackFor = Exception.class)
public String removeSelected(@RequestParam(value = "ids") String ids) {
System.out.println(ids);
String[] idsStr = ids.split(",");
for (int i = 0; i< idsStr.length; i++) {
SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(Long.valueOf(idsStr[i]));
SysSalesFinish sysSalesFinish = new SysSalesFinish();
sysSalesFinish.setSalesOrderNumber(sysSalesOrder.getSalesOrderNumber());
List<SysSalesFinish> list = sysSalesFinishService.selectSysSalesFinishList(sysSalesFinish);
if (list.size()>0) {
for (int j=0;j<list.size();j++) {
sysSalesFinishService.deleteSysSalesFinishById(list.get(j).getSalesFinishId());
}
}
}
sysSalesOrderService.deleteSysSalesOrderByIds(ids);
return "操作成功!";
}
/**
* 修改销售订单审核状态
@ -348,73 +325,6 @@ public class SysSalesOrderController extends BaseController
@RequiresPermissions("system:salesOrder:export")
@Log(title = "销售订单", businessType = BusinessType.EXPORT)
@RequestMapping("/exportSelected/{salesOrderId}")
@ResponseBody
public void exportSelected(@PathVariable("salesOrderId") Long salesOrderId, HttpServletResponse response) throws IOException {
//
System.out.println(salesOrderId);
SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(salesOrderId);
SysSalesOrderDto sysSalesOrderDto = new SysSalesOrderDto();
BeanUtils.copyProperties(sysSalesOrder,sysSalesOrderDto);
SysSalesFinish sysSalesFinish = new SysSalesFinish();
sysSalesFinish.setSalesOrderCode(sysSalesOrder.getSalesOrderCode());
sysSalesFinish.setSalesOrderNumber(sysSalesOrder.getSalesOrderNumber());
sysSalesFinish.setEnterpriseCode(sysSalesOrder.getEnterpriseCode());
sysSalesFinish.setEnterpriseName(sysSalesOrder.getEnterpriseName());
List<SysSalesFinish> sysSalesFinishList = sysSalesFinishService.selectSysSalesFinishList(sysSalesFinish);
List<SysSalesFinishDto> sysSalesFinishDtoList = new ArrayList<>();
try {
Iterator values= sysSalesFinishList.iterator();
while(values.hasNext()) {
Object source = values.next();
SysSalesFinishDto target = SysSalesFinishDto.class.newInstance();
BeanUtils.copyProperties(source, target);
sysSalesFinishDtoList.add(target);
}
}catch (Exception e) {
log.error(">>>>>>异常<<<<<<", e);
}
System.out.println(sysSalesFinishDtoList);
int num = 0;
for (int i = 0; i < sysSalesFinishDtoList.size(); i++) {
num = num + 1;
sysSalesFinishDtoList.get(i).setNumber(num);
}
System.out.println(sysSalesFinishDtoList);
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\\exportSalesOrder.xlsx";
try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), SysSalesFinishDto.class).withTemplate(templateFileName).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
excelWriter.fill(sysSalesFinishDtoList, fillConfig, writeSheet);
Map<String, Object> map = MapUtils.newHashMap();
// map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
map.put("salesOrderCode", sysSalesOrderDto.getSalesOrderCode());
map.put("salesOrderNumber", sysSalesOrderDto.getSalesOrderNumber());
map.put("billingTime", sysSalesOrderDto.getBillingTime());
map.put("enterpriseCode", sysSalesOrderDto.getEnterpriseCode());
map.put("enterpriseName", sysSalesOrderDto.getEnterpriseName());
map.put("orderReceivingTime", sysSalesOrderDto.getOrderReceivingTime());
map.put("customerContact", sysSalesOrderDto.getCustomerContact());
map.put("contactNumber", sysSalesOrderDto.getContactNumber());
map.put("businessMembers", sysSalesOrderDto.getBusinessMembers());
map.put("deliveryMethod", sysSalesOrderDto.getDeliveryMethod());
map.put("deliveryConditions", sysSalesOrderDto.getDeliveryConditions());
map.put("paymentTerms", sysSalesOrderDto.getPaymentTerms());
excelWriter.fill(map, writeSheet);
}
}
@PostMapping("/upload")
@ResponseBody

358
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesFinish.java

@ -1,358 +0,0 @@
package com.ruoyi.system.domain;
import com.alibaba.excel.annotation.ExcelProperty;
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_sales_finish
*
* @author ruoyi
* @date 2022-11-24
*/
public class SysSalesFinish extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 订单id */
private Long salesFinishId;
/** 订单编号 */
@Excel(name = "订单编号")
private String salesOrderCode;
/** 订单号码 */
@Excel(name = "订单号码")
private String salesOrderNumber;
/** 客户代码 */
@Excel(name = "客户代码")
private String enterpriseCode;
/** 客户名称 */
@Excel(name = "客户名称")
private String enterpriseName;
/** 成品代码 */
@Excel(name = "成品代码")
private String finishProductCode;
/** 成品名称 */
@Excel(name = "成品名称")
private String finishProductName;
/** 规格型号 */
@Excel(name = "规格型号")
private String specificationModel;
/** 客户料号 */
@ExcelProperty("客户料号")
private String customerNumber;
/** 机种 */
@Excel(name = "机种")
private String typeMachine;
/** 单位 */
@Excel(name = "单位")
private String inventoryUnit;
/** 重量 */
@Excel(name = "重量")
private String stockUnitWeight;
/** 单价 */
@Excel(name = "单价")
private String processPrice;
/** 币别 */
@Excel(name = "币别")
private String commonCurrency;
/** 数量 */
@Excel(name = "数量")
private String productQuantity;
/** 金额 */
@Excel(name = "金额")
private String amountMoney;
/** 交期 */
@Excel(name = "交期")
private String deliveryTime;
/** Line# */
@Excel(name = "Line#")
private String line;
/** 版本号 */
@Excel(name = "版本号")
private String versionNumber;
/** 说明 */
@Excel(name = "说明")
private String salesExplain;
/** 客户使用否 */
@Excel(name = "客户使用否")
private String customerUseOrNot;
/** 对账否 */
@Excel(name = "对账否")
private String accountReconciliationOrNot;
/** 备用一 */
@Excel(name = "备用一")
private String standbyOne;
/** 备用二 */
@Excel(name = "备用二")
private String standbyTwo;
public void setSalesFinishId(Long salesFinishId)
{
this.salesFinishId = salesFinishId;
}
public Long getSalesFinishId()
{
return salesFinishId;
}
public void setSalesOrderCode(String salesOrderCode)
{
this.salesOrderCode = salesOrderCode;
}
public String getSalesOrderCode()
{
return salesOrderCode;
}
public void setSalesOrderNumber(String salesOrderNumber)
{
this.salesOrderNumber = salesOrderNumber;
}
public String getSalesOrderNumber()
{
return salesOrderNumber;
}
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 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 String getCustomerNumber() {
return customerNumber;
}
public void setCustomerNumber(String customerNumber) {
this.customerNumber = customerNumber;
}
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 setStockUnitWeight(String stockUnitWeight)
{
this.stockUnitWeight = stockUnitWeight;
}
public String getStockUnitWeight()
{
return stockUnitWeight;
}
public String getCommonCurrency() {
return commonCurrency;
}
public void setCommonCurrency(String commonCurrency) {
this.commonCurrency = commonCurrency;
}
public void setProcessPrice(String processPrice)
{
this.processPrice = processPrice;
}
public String getProcessPrice()
{
return processPrice;
}
public void setProductQuantity(String productQuantity)
{
this.productQuantity = productQuantity;
}
public String getProductQuantity()
{
return productQuantity;
}
public void setAmountMoney(String amountMoney)
{
this.amountMoney = amountMoney;
}
public String getAmountMoney()
{
return amountMoney;
}
public void setDeliveryTime(String deliveryTime)
{
this.deliveryTime = deliveryTime;
}
public String getDeliveryTime()
{
return deliveryTime;
}
public void setLine(String line)
{
this.line = line;
}
public String getLine()
{
return line;
}
public void setVersionNumber(String versionNumber)
{
this.versionNumber = versionNumber;
}
public String getVersionNumber()
{
return versionNumber;
}
public void setSalesExplain(String salesExplain)
{
this.salesExplain = salesExplain;
}
public String getSalesExplain()
{
return salesExplain;
}
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 getCustomerUseOrNot() {
return customerUseOrNot;
}
public void setCustomerUseOrNot(String customerUseOrNot) {
this.customerUseOrNot = customerUseOrNot;
}
public String getAccountReconciliationOrNot() {
return accountReconciliationOrNot;
}
public void setAccountReconciliationOrNot(String accountReconciliationOrNot) {
this.accountReconciliationOrNot = accountReconciliationOrNot;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("salesFinishId", getSalesFinishId())
.append("salesOrderCode", getSalesOrderCode())
.append("salesOrderNumber", getSalesOrderNumber())
.append("enterpriseCode", getEnterpriseCode())
.append("enterpriseName", getEnterpriseName())
.append("finishProductCode", getFinishProductCode())
.append("finishProductName", getFinishProductName())
.append("specificationModel", getSpecificationModel())
.append("customerNumber", getCustomerNumber())
.append("typeMachine", getTypeMachine())
.append("inventoryUnit", getInventoryUnit())
.append("stockUnitWeight", getStockUnitWeight())
.append("commonCurrency", getCommonCurrency())
.append("processPrice", getProcessPrice())
.append("productQuantity", getProductQuantity())
.append("amountMoney", getAmountMoney())
.append("deliveryTime", getDeliveryTime())
.append("line", getLine())
.append("versionNumber", getVersionNumber())
.append("salesExplain", getSalesExplain())
.append("customerUseOrNot", getCustomerUseOrNot())
.append("accountReconciliationOrNot", getAccountReconciliationOrNot())
.append("standbyOne", getStandbyOne())
.append("standbyTwo", getStandbyTwo())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesFinishMapper.java

@ -1,61 +0,0 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.SysSalesFinish;
/**
* 销售产品Mapper接口
*
* @author ruoyi
* @date 2022-11-24
*/
public interface SysSalesFinishMapper
{
/**
* 查询销售产品
*
* @param salesFinishId 销售产品ID
* @return 销售产品
*/
public SysSalesFinish selectSysSalesFinishById(Long salesFinishId);
/**
* 查询销售产品列表
*
* @param sysSalesFinish 销售产品
* @return 销售产品集合
*/
public List<SysSalesFinish> selectSysSalesFinishList(SysSalesFinish sysSalesFinish);
/**
* 新增销售产品
*
* @param sysSalesFinish 销售产品
* @return 结果
*/
public int insertSysSalesFinish(SysSalesFinish sysSalesFinish);
/**
* 修改销售产品
*
* @param sysSalesFinish 销售产品
* @return 结果
*/
public int updateSysSalesFinish(SysSalesFinish sysSalesFinish);
/**
* 删除销售产品
*
* @param salesFinishId 销售产品ID
* @return 结果
*/
public int deleteSysSalesFinishById(Long salesFinishId);
/**
* 批量删除销售产品
*
* @param salesFinishIds 需要删除的数据ID
* @return 结果
*/
public int deleteSysSalesFinishByIds(String[] salesFinishIds);
}

61
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesFinishService.java

@ -1,61 +0,0 @@
package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.SysSalesFinish;
/**
* 销售产品Service接口
*
* @author ruoyi
* @date 2022-11-24
*/
public interface ISysSalesFinishService
{
/**
* 查询销售产品
*
* @param salesFinishId 销售产品ID
* @return 销售产品
*/
public SysSalesFinish selectSysSalesFinishById(Long salesFinishId);
/**
* 查询销售产品列表
*
* @param sysSalesFinish 销售产品
* @return 销售产品集合
*/
public List<SysSalesFinish> selectSysSalesFinishList(SysSalesFinish sysSalesFinish);
/**
* 新增销售产品
*
* @param sysSalesFinish 销售产品
* @return 结果
*/
public int insertSysSalesFinish(SysSalesFinish sysSalesFinish);
/**
* 修改销售产品
*
* @param sysSalesFinish 销售产品
* @return 结果
*/
public int updateSysSalesFinish(SysSalesFinish sysSalesFinish);
/**
* 批量删除销售产品
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteSysSalesFinishByIds(String ids);
/**
* 删除销售产品信息
*
* @param salesFinishId 销售产品ID
* @return 结果
*/
public int deleteSysSalesFinishById(Long salesFinishId);
}

94
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesFinishServiceImpl.java

@ -1,94 +0,0 @@
package com.ruoyi.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.SysSalesFinishMapper;
import com.ruoyi.system.domain.SysSalesFinish;
import com.ruoyi.system.service.ISysSalesFinishService;
import com.ruoyi.common.core.text.Convert;
/**
* 销售产品Service业务层处理
*
* @author ruoyi
* @date 2022-11-24
*/
@Service
public class SysSalesFinishServiceImpl implements ISysSalesFinishService
{
@Autowired
private SysSalesFinishMapper sysSalesFinishMapper;
/**
* 查询销售产品
*
* @param salesFinishId 销售产品ID
* @return 销售产品
*/
@Override
public SysSalesFinish selectSysSalesFinishById(Long salesFinishId)
{
return sysSalesFinishMapper.selectSysSalesFinishById(salesFinishId);
}
/**
* 查询销售产品列表
*
* @param sysSalesFinish 销售产品
* @return 销售产品
*/
@Override
public List<SysSalesFinish> selectSysSalesFinishList(SysSalesFinish sysSalesFinish)
{
return sysSalesFinishMapper.selectSysSalesFinishList(sysSalesFinish);
}
/**
* 新增销售产品
*
* @param sysSalesFinish 销售产品
* @return 结果
*/
@Override
public int insertSysSalesFinish(SysSalesFinish sysSalesFinish)
{
return sysSalesFinishMapper.insertSysSalesFinish(sysSalesFinish);
}
/**
* 修改销售产品
*
* @param sysSalesFinish 销售产品
* @return 结果
*/
@Override
public int updateSysSalesFinish(SysSalesFinish sysSalesFinish)
{
return sysSalesFinishMapper.updateSysSalesFinish(sysSalesFinish);
}
/**
* 删除销售产品对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteSysSalesFinishByIds(String ids)
{
return sysSalesFinishMapper.deleteSysSalesFinishByIds(Convert.toStrArray(ids));
}
/**
* 删除销售产品信息
*
* @param salesFinishId 销售产品ID
* @return 结果
*/
@Override
public int deleteSysSalesFinishById(Long salesFinishId)
{
return sysSalesFinishMapper.deleteSysSalesFinishById(salesFinishId);
}
}

149
ruoyi-admin/src/main/resources/mapper/system/SysSalesFinishMapper.xml

@ -1,149 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysSalesFinishMapper">
<resultMap type="SysSalesFinish" id="SysSalesFinishResult">
<result property="salesFinishId" column="sales_finish_id" />
<result property="salesOrderCode" column="sales_order_code" />
<result property="salesOrderNumber" column="sales_order_number" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="finishProductCode" column="finish_product_code" />
<result property="finishProductName" column="finish_product_name" />
<result property="specificationModel" column="specification_model" />
<result property="typeMachine" column="type_machine" />
<result property="customerNumber" column="customer_number" />
<result property="inventoryUnit" column="inventory_unit" />
<result property="stockUnitWeight" column="stock_unit_weight" />
<result property="commonCurrency" column="common_currency" />
<result property="processPrice" column="process_price" />
<result property="productQuantity" column="product_quantity" />
<result property="amountMoney" column="amount_money" />
<result property="deliveryTime" column="delivery_time" />
<result property="line" column="line" />
<result property="versionNumber" column="version_number" />
<result property="salesExplain" column="sales_explain" />
<result property="customerUseOrNot" column="customer_use_or_not" />
<result property="accountReconciliationOrNot" column="account_reconciliation_or_not" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
</resultMap>
<sql id="selectSysSalesFinishVo">
select sales_finish_id, sales_order_code, sales_order_number, enterprise_code, enterprise_name, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, stock_unit_weight, common_currency, process_price, product_quantity, amount_money, delivery_time, line, version_number, sales_explain, standby_one, standby_two from sys_sales_finish
</sql>
<select id="selectSysSalesFinishList" parameterType="SysSalesFinish" resultMap="SysSalesFinishResult">
<include refid="selectSysSalesFinishVo"/>
<where>
<if test="salesOrderCode != null and salesOrderCode != ''"> and sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
<if test="salesOrderNumber != null and salesOrderNumber != ''"> and sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="finishProductCode != null and finishProductCode != ''"> and finish_product_code like concat('%', #{finishProductCode}, '%')</if>
<if test="finishProductName != null and finishProductName != ''"> and finish_product_name like concat('%', #{finishProductName}, '%')</if>
<if test="salesExplain != null and salesExplain != ''"> and sales_explain = #{salesExplain}</if>
</where>
</select>
<select id="selectSysSalesFinishById" parameterType="Long" resultMap="SysSalesFinishResult">
<include refid="selectSysSalesFinishVo"/>
where sales_finish_id = #{salesFinishId}
</select>
<insert id="insertSysSalesFinish" parameterType="SysSalesFinish" useGeneratedKeys="true" keyProperty="salesFinishId">
insert into sys_sales_finish
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="salesOrderCode != null">sales_order_code,</if>
<if test="salesOrderNumber != null">sales_order_number,</if>
<if test="enterpriseCode != null">enterprise_code,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="finishProductCode != null">finish_product_code,</if>
<if test="finishProductName != null">finish_product_name,</if>
<if test="specificationModel != null">specification_model,</if>
<if test="customerNumber != null">customer_number,</if>
<if test="typeMachine != null">type_machine,</if>
<if test="inventoryUnit != null">inventory_unit,</if>
<if test="stockUnitWeight != null">stock_unit_weight,</if>
<if test="commonCurrency != null">common_currency,</if>
<if test="processPrice != null">process_price,</if>
<if test="productQuantity != null">product_quantity,</if>
<if test="amountMoney != null">amount_money,</if>
<if test="deliveryTime != null">delivery_time,</if>
<if test="line != null">line,</if>
<if test="versionNumber != null">version_number,</if>
<if test="salesExplain != null">sales_explain,</if>
<if test="customerUseOrNot != null">customer_use_or_not,</if>
<if test="accountReconciliationOrNot != null">account_reconciliation_or_not,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="salesOrderCode != null">#{salesOrderCode},</if>
<if test="salesOrderNumber != null">#{salesOrderNumber},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="finishProductCode != null">#{finishProductCode},</if>
<if test="finishProductName != null">#{finishProductName},</if>
<if test="specificationModel != null">#{specificationModel},</if>
<if test="customerNumber != null">#{customerNumber},</if>
<if test="typeMachine != null">#{typeMachine},</if>
<if test="inventoryUnit != null">#{inventoryUnit},</if>
<if test="stockUnitWeight != null">#{stockUnitWeight},</if>
<if test="commonCurrency != null">#{commonCurrency},</if>
<if test="processPrice != null">#{processPrice},</if>
<if test="productQuantity != null">#{productQuantity},</if>
<if test="amountMoney != null">#{amountMoney},</if>
<if test="deliveryTime != null">#{deliveryTime},</if>
<if test="line != null">#{line},</if>
<if test="versionNumber != null">#{versionNumber},</if>
<if test="salesExplain != null">#{salesExplain},</if>
<if test="customerUseOrNot != null">#{customerUseOrNot},</if>
<if test="accountReconciliationOrNot != null">#{accountReconciliationOrNot},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
</trim>
</insert>
<update id="updateSysSalesFinish" parameterType="SysSalesFinish">
update sys_sales_finish
<trim prefix="SET" suffixOverrides=",">
<if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
<if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="finishProductCode != null">finish_product_code = #{finishProductCode},</if>
<if test="finishProductName != null">finish_product_name = #{finishProductName},</if>
<if test="specificationModel != null">specification_model = #{specificationModel},</if>
<if test="customerNumber != null">customer_number = #{customerNumber},</if>
<if test="typeMachine != null">type_machine = #{typeMachine},</if>
<if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
<if test="stockUnitWeight != null">stock_unit_weight = #{stockUnitWeight},</if>
<if test="commonCurrency != null">common_currency = #{commonCurrency},</if>
<if test="processPrice != null">process_price = #{processPrice},</if>
<if test="productQuantity != null">product_quantity = #{productQuantity},</if>
<if test="amountMoney != null">amount_money = #{amountMoney},</if>
<if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
<if test="line != null">line = #{line},</if>
<if test="versionNumber != null">version_number = #{versionNumber},</if>
<if test="salesExplain != null">sales_explain = #{salesExplain},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
</trim>
where sales_finish_id = #{salesFinishId}
</update>
<delete id="deleteSysSalesFinishById" parameterType="Long">
delete from sys_sales_finish where sales_finish_id = #{salesFinishId}
</delete>
<delete id="deleteSysSalesFinishByIds" parameterType="String">
delete from sys_sales_finish where sales_finish_id in
<foreach item="salesFinishId" collection="array" open="(" separator="," close=")">
#{salesFinishId}
</foreach>
</delete>
</mapper>

139
ruoyi-admin/src/main/resources/templates/system/salesFinish/add.html

@ -1,139 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增销售产品')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-salesFinish-add">
<div class="form-group">
<label class="col-sm-3 control-label">订单编号:</label>
<div class="col-sm-8">
<input name="salesOrderCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">订单号码:</label>
<div class="col-sm-8">
<input name="salesOrderNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<input name="enterpriseCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="enterpriseName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品代码:</label>
<div class="col-sm-8">
<input name="finishProductCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品名称:</label>
<div class="col-sm-8">
<input name="finishProductName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">规格型号:</label>
<div class="col-sm-8">
<input name="specificationModel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
<input name="typeMachine" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="inventoryUnit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">重量:</label>
<div class="col-sm-8">
<input name="stockUnitWeight" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单价:</label>
<div class="col-sm-8">
<input name="processPrice" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">数量:</label>
<div class="col-sm-8">
<input name="productQuantity" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">金额:</label>
<div class="col-sm-8">
<input name="amountMoney" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">交期:</label>
<div class="col-sm-8">
<input name="deliveryTime" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Line#:</label>
<div class="col-sm-8">
<input name="line" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">版本号:</label>
<div class="col-sm-8">
<input name="versionNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">说明:</label>
<div class="col-sm-8">
<input name="salesExplain" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备用一:</label>
<div class="col-sm-8">
<input name="standbyOne" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备用二:</label>
<div class="col-sm-8">
<input name="standbyTwo" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/salesFinish"
$("#form-salesFinish-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-salesFinish-add').serialize());
}
}
</script>
</body>
</html>

140
ruoyi-admin/src/main/resources/templates/system/salesFinish/edit.html

@ -1,140 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('修改销售产品')"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-salesFinish-edit" th:object="${sysSalesFinish}">
<input name="salesFinishId" th:field="*{salesFinishId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">订单编号:</label>
<div class="col-sm-8">
<input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">订单号码:</label>
<div class="col-sm-8">
<input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品代码:</label>
<div class="col-sm-8">
<input name="finishProductCode" th:field="*{finishProductCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成品名称:</label>
<div class="col-sm-8">
<input name="finishProductName" th:field="*{finishProductName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">规格型号:</label>
<div class="col-sm-8">
<input name="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
<input name="typeMachine" th:field="*{typeMachine}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="inventoryUnit" th:field="*{inventoryUnit}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">重量:</label>
<div class="col-sm-8">
<input name="stockUnitWeight" th:field="*{stockUnitWeight}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单价:</label>
<div class="col-sm-8">
<input name="processPrice" th:field="*{processPrice}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">数量:</label>
<div class="col-sm-8">
<input name="productQuantity" th:field="*{productQuantity}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">金额:</label>
<div class="col-sm-8">
<input name="amountMoney" th:field="*{amountMoney}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">交期:</label>
<div class="col-sm-8">
<input name="deliveryTime" th:field="*{deliveryTime}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Line#:</label>
<div class="col-sm-8">
<input name="line" th:field="*{line}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">版本号:</label>
<div class="col-sm-8">
<input name="versionNumber" th:field="*{versionNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">说明:</label>
<div class="col-sm-8">
<input name="salesExplain" th:field="*{salesExplain}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备用一:</label>
<div class="col-sm-8">
<input name="standbyOne" th:field="*{standbyOne}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备用二:</label>
<div class="col-sm-8">
<input name="standbyTwo" th:field="*{standbyTwo}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var prefix = ctx + "system/salesFinish";
$("#form-salesFinish-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-salesFinish-edit').serialize());
}
}
</script>
</body>
</html>

194
ruoyi-admin/src/main/resources/templates/system/salesFinish/salesFinish.html

@ -1,194 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('销售产品列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>订单编号:</label>
<input type="text" name="salesOrderCode"/>
</li>
<li>
<label>订单号码:</label>
<input type="text" name="salesOrderNumber"/>
</li>
<li>
<label>客户代码:</label>
<input type="text" name="enterpriseCode"/>
</li>
<li>
<label>客户名称:</label>
<input type="text" name="enterpriseName"/>
</li>
<li>
<label>成品代码:</label>
<input type="text" name="finishProductCode"/>
</li>
<li>
<label>成品名称:</label>
<input type="text" name="finishProductName"/>
</li>
<li>
<label>说明:</label>
<input type="text" name="salesExplain"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:salesFinish:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:salesFinish:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:salesFinish:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:salesFinish:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:salesFinish:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:salesFinish:remove')}]];
var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
var prefix = ctx + "system/salesFinish";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "销售产品",
columns: [{
checkbox: true
},
{
field: 'salesFinishId',
title: '订单id',
visible: false
},
{
field: 'salesOrderCode',
title: '订单编号'
},
{
field: 'salesOrderNumber',
title: '订单号码'
},
{
field: 'enterpriseCode',
title: '客户代码'
},
{
field: 'enterpriseName',
title: '客户名称'
},
{
field: 'finishProductCode',
title: '成品代码'
},
{
field: 'finishProductName',
title: '成品名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'customerNumber',
title: '客户料号'
},
{
field: 'typeMachine',
title: '机种'
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'stockUnitWeight',
title: '重量'
},
{
field: 'commonCurrency',
title: '币别',
formatter: function (value, row, index) {
return $.table.selectDictLabel(commonCurrencyDatas, value);
}
},
{
field: 'processPrice',
title: '单价'
},
{
field: 'productQuantity',
title: '数量'
},
{
field: 'amountMoney',
title: '金额'
},
{
field: 'deliveryTime',
title: '交期'
},
{
field: 'line',
title: 'Line#'
},
{
field: 'versionNumber',
title: '版本号'
},
{
field: 'salesExplain',
title: '说明'
},
{
field: 'standbyOne',
title: '备用一'
},
{
field: 'standbyTwo',
title: '备用二'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.salesFinishId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.salesFinishId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>
Loading…
Cancel
Save