Browse Source

删除旧版无用的退货单头表与子表联结 sales_return_head和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据

dev
liuxiaoxu 1 month ago
parent
commit
282873f1db
  1. 325
      ruoyi-admin/src/main/java/com/ruoyi/stock/domain/SalesReturnHeadWithList.java
  2. 18
      ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/SalesReturnHeadWithListMapper.java
  3. 63
      ruoyi-admin/src/main/resources/mapper/stock/salesReturnHeadWithListMapper.xml

325
ruoyi-admin/src/main/java/com/ruoyi/stock/domain/SalesReturnHeadWithList.java

@ -1,325 +0,0 @@
package com.ruoyi.stock.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author pyy
* @date Created in 2021/12/14 14:41
* @description退货单头表与子表联结
* @modified By
* @version: $
*/
public class SalesReturnHeadWithList extends BaseEntity {
/** 退货单号 */
@Excel(name = "退货单号")
private String salesReturnId;
/** 订单号 */
@Excel(name = "订单号")
private String saleOrderId;
/** 客户编号 */
@Excel(name = "客户编号")
private String customerNo;
/** 客户名称 */
@Excel(name = "客户名称")
private String customerName;
/** 联系人 */
@Excel(name = "联系人")
private String linkman;
/** 仓库号 */
@Excel(name = "仓库号")
private String stockNo;
/** 仓库名称 */
@Excel(name = "仓库名称")
private String stockName;
/** 仓库管理员 */
@Excel(name = "仓库管理员")
private String warehouseKeeper;
/** 退货类型 */
@Excel(name = "退货类型")
private String salesReturnType;
@Excel(name = "备注")
private String remark;
/** 退货日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "退货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date salesReturnDate;
/** 结案 1已结案 0未结案 */
@Excel(name = "是否结案")
private String isEnd;
/** 项次 */
@Excel(name = "项次")
private Integer itemNumber;
/** 物料代码 */
@Excel(name = "物料代码")
private String itemNo;
/** 物料名称 */
@Excel(name = "物料名称")
private String itemName;
/** 规格型号 */
@Excel(name = "规格型号")
private String itemSpecification;
/** 机种 */
@Excel(name = "机种")
private String machineType;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 退货数量 */
@Excel(name = "退货数量")
private Integer returnQty;
/** 发货数量 */
@Excel(name = "发货数量")
private Integer sendQty;
/** 币别 */
@Excel(name = "币别")
private String coinType;
/** 单价 */
@Excel(name = "单价")
private BigDecimal price;
/** 总价 */
@Excel(name = "总价")
private BigDecimal totalPrice;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getSalesReturnId() {
return salesReturnId;
}
public void setSalesReturnId(String salesReturnId) {
this.salesReturnId = salesReturnId;
}
public String getSaleOrderId() {
return saleOrderId;
}
public void setSaleOrderId(String saleOrderId) {
this.saleOrderId = saleOrderId;
}
public String getCustomerNo() {
return customerNo;
}
public void setCustomerNo(String customerNo) {
this.customerNo = customerNo;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getLinkman() {
return linkman;
}
public void setLinkman(String linkman) {
this.linkman = linkman;
}
public String getStockNo() {
return stockNo;
}
public void setStockNo(String stcokNo) {
this.stockNo = stcokNo;
}
public String getStockName() {
return stockName;
}
public void setStockName(String stcokName) {
this.stockName = stcokName;
}
public String getWarehouseKeeper() {
return warehouseKeeper;
}
public void setWarehouseKeeper(String warehouseKeeper) {
this.warehouseKeeper = warehouseKeeper;
}
public String getSalesReturnType() {
return salesReturnType;
}
public void setSalesReturnType(String salesReturnType) {
this.salesReturnType = salesReturnType;
}
public Date getSalesReturnDate() {
return salesReturnDate;
}
public void setSalesReturnDate(Date salesReturnDate) {
this.salesReturnDate = salesReturnDate;
}
public String getIsEnd() {
return isEnd;
}
public void setIsEnd(String isEnd) {
this.isEnd = isEnd;
}
public Integer getItemNumber() {
return itemNumber;
}
public void setItemNumber(Integer itemNumber) {
this.itemNumber = itemNumber;
}
public String getItemNo() {
return itemNo;
}
public void setItemNo(String itemNo) {
this.itemNo = itemNo;
}
public String getItemName() {
return itemName;
}
public void setItemName(String itemName) {
this.itemName = itemName;
}
public String getItemSpecification() {
return itemSpecification;
}
public void setItemSpecification(String itemSpecification) {
this.itemSpecification = itemSpecification;
}
public String getMachineType() {
return machineType;
}
public void setMachineType(String machineType) {
this.machineType = machineType;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public Integer getReturnQty() {
return returnQty;
}
public void setReturnQty(Integer returnQty) {
this.returnQty = returnQty;
}
public Integer getSendQty() {
return sendQty;
}
public void setSendQty(Integer sendQty) {
this.sendQty = sendQty;
}
public String getCoinType() {
return coinType;
}
public void setCoinType(String coinType) {
this.coinType = coinType;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getTotalPrice() {
return totalPrice;
}
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
@Override
public String toString() {
return "SalesReturnHeadWithList{" +
"salesReturnId='" + salesReturnId + '\'' +
", saleOrderId='" + saleOrderId + '\'' +
", customerNo='" + customerNo + '\'' +
", customerName='" + customerName + '\'' +
", linkman='" + linkman + '\'' +
", stockNo='" + stockNo + '\'' +
", stockName='" + stockName + '\'' +
", warehouseKeeper='" + warehouseKeeper + '\'' +
", salesReturnType='" + salesReturnType + '\'' +
", remark='" + remark + '\'' +
", salesReturnDate=" + salesReturnDate +
", isEnd='" + isEnd + '\'' +
", itemNumber=" + itemNumber +
", itemNo='" + itemNo + '\'' +
", itemName='" + itemName + '\'' +
", itemSpecification='" + itemSpecification + '\'' +
", machineType='" + machineType + '\'' +
", unit='" + unit + '\'' +
", returnQty=" + returnQty +
", sendQty=" + sendQty +
", coinType='" + coinType + '\'' +
", price=" + price +
", totalPrice=" + totalPrice +
'}';
}
}

18
ruoyi-admin/src/main/java/com/ruoyi/stock/mapper/SalesReturnHeadWithListMapper.java

@ -1,18 +0,0 @@
package com.ruoyi.stock.mapper;
import com.ruoyi.stock.domain.SalesReturnHeadWithList;
import java.util.List;
/**
* @author pyy
* @date Created in 2021/12/14 15:10
* @description
* @modified By
* @version: $
*/
public interface SalesReturnHeadWithListMapper {
public List<SalesReturnHeadWithList> selectSalesReturnHeadWithList(SalesReturnHeadWithList salesReturnHeadWithList);
}

63
ruoyi-admin/src/main/resources/mapper/stock/salesReturnHeadWithListMapper.xml

@ -1,63 +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.stock.mapper.SalesReturnHeadWithListMapper">
<select id="selectSalesReturnHeadWithList" resultType="com.ruoyi.stock.domain.SalesReturnHeadWithList" parameterType="com.ruoyi.stock.domain.SalesReturnHeadWithList">
SELECT
sales_return_head.salesReturnId as salesReturnId,
sales_return_head.saleOrderId as saleOrderId,
sales_return_head.customerNo as customerNo,
sales_return_head.customerName as customerName,
sales_return_head.linkman as linkman,
sales_return_head.stcokNo as stockNo,
sales_return_head.stcokName as stockName,
sales_return_head.warehouseKeeper as warehouseKeeper,
sales_return_head.salesReturnType as salesReturnType,
sales_return_head.salesReturnDate as salesReturnDate,
sales_return_head.remark as remark,
sales_return_head.isEnd as isEnd,
sales_return_list.itemNumber as itemNumber,
sales_return_list.itemNo as itemNo,
sales_return_list.itemName as itemName,
sales_return_list.itemSpecification as itemSpecification,
sales_return_list.unit as unit,
sales_return_list.returnQty as returnQty,
sales_return_list.sendQty as sendQty,
sales_return_list.coinType as coinType,
sales_return_list.price as price,
sales_return_list.totalPrice as totalPrice,
sales_return_list.machineType as machineType
FROM
sales_return_list
LEFT JOIN sales_return_head ON sales_return_head.salesReturnId = sales_return_list.salesReturnId
<where>
<if test="salesReturnId != null and salesReturnId != ''"> and salesReturnId like concat('%', #{salesReturnId}, '%')</if>
<if test="saleOrderId != null and saleOrderId != ''"> and saleOrderId like concat('%', #{saleOrderId}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and customerNo like concat('%', #{customerNo}, '%')</if>
<if test="customerName != null and customerName != ''"> and customerName like concat('%', #{customerName}, '%')</if>
<if test="linkman != null and linkman != ''"> and linkman like concat('%', #{linkman}, '%')</if>
<if test="stockNo != null and stockNo != ''"> and stcokNo like concat('%', #{stockNo}, '%')</if>
<if test="stockName != null and stockName != ''"> and stcokName like concat('%', #{stockName}, '%')</if>
<if test="warehouseKeeper != null and warehouseKeeper != ''"> and warehouseKeeper = #{warehouseKeeper}</if>
<if test="salesReturnType != null and salesReturnType != ''"> and salesReturnType = #{salesReturnType}</if>
<if test="isEnd != null and isEnd != ''"> and isEnd = #{isEnd}</if>
<if test="params.beginSalesReturnDate != null and params.beginSalesReturnDate !=''"> and salesReturnDate >= #{params.beginSalesReturnDate}</if>
<if test="params.endSalesReturnDate != null and params.endSalesReturnDate != ''">and #{params.endSalesReturnDate} >= salesReturnDate</if>
<if test="itemNumber != null and itemNumber != ''"> and itemNumber = #{itemNumber}</if>
<if test="itemNo != null and itemNo != ''"> and itemNo like concat('%', #{itemNo}, '%')</if>
<if test="itemName != null and itemName != ''"> and itemName like concat('%', #{itemName}, '%')</if>
<if test="itemSpecification != null and itemSpecification != ''"> and itemSpecification like concat('%', #{itemSpecification}, '%')</if>
<if test="machineType != null and machineType != ''"> and machineType like concat('%', #{machineType}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="returnQty != null and returnQty != ''"> and returnQty = #{returnQty}</if>
<if test="sendQty != null and sendQty != ''"> and sendQty = #{sendQty}</if>
<if test="coinType != null and coinType != ''"> and coinType = #{coinType}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="totalPrice != null and totalPrice != ''"> and totalPrice = #{totalPrice}</if>
</where>
</select>
</mapper>
Loading…
Cancel
Save