5 changed files with 0 additions and 361 deletions
@ -1,232 +0,0 @@ |
|||||
package com.ruoyi.buyorderHead.domain; |
|
||||
|
|
||||
import com.alibaba.fastjson.annotation.JSONField; |
|
||||
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/7 9:19 |
|
||||
* @description：采购对账 |
|
||||
* @modified By： |
|
||||
* @version: $ |
|
||||
*/ |
|
||||
public class ProcurementCheck extends BaseEntity { |
|
||||
|
|
||||
@Excel(name = "入库记录单号") |
|
||||
private String warehousingRecordNo; |
|
||||
|
|
||||
@Excel(name = "订购单号") |
|
||||
private String purchaseOrderNo; |
|
||||
|
|
||||
@Excel(name = "供应商代码") |
|
||||
private String providerNo; |
|
||||
|
|
||||
@Excel(name = "供应商名称") |
|
||||
private String providerName; |
|
||||
|
|
||||
@JSONField(format="yyyy-MM-dd") |
|
||||
@JsonFormat(pattern = "yyyy-MM-dd") |
|
||||
@Excel(name = "入库日期") |
|
||||
private Date warehousingRecordDate; |
|
||||
|
|
||||
@Excel(name = "物料代码") |
|
||||
private String itemNo; |
|
||||
|
|
||||
@Excel(name = "物料名称") |
|
||||
private String itemName; |
|
||||
|
|
||||
@Excel(name = "规格型号") |
|
||||
private String specificationModel; |
|
||||
|
|
||||
@Excel(name = "单位") |
|
||||
private String unit; |
|
||||
|
|
||||
@Excel(name = "入库数量") |
|
||||
private String warehousingAmt; |
|
||||
|
|
||||
@Excel(name = "币别") |
|
||||
private String crlName; |
|
||||
|
|
||||
@Excel(name = "单价") |
|
||||
private BigDecimal price; |
|
||||
|
|
||||
@Excel(name = "总价") |
|
||||
private BigDecimal totalPrice; |
|
||||
|
|
||||
@Excel(name = "付款条件") |
|
||||
private String paymentCondition; |
|
||||
|
|
||||
@Excel(name = "是否确认对账") |
|
||||
private String isChecked; |
|
||||
|
|
||||
@JSONField(format="yyyy-MM-dd") |
|
||||
@JsonFormat(pattern = "yyyy-MM-dd") |
|
||||
@Excel(name = "交货日期") |
|
||||
private Date sendDate; |
|
||||
|
|
||||
@Excel(name = "客户名称") |
|
||||
private String customerName; |
|
||||
|
|
||||
public String getCustomerName() { |
|
||||
return customerName; |
|
||||
} |
|
||||
|
|
||||
public void setCustomerName(String customerName) { |
|
||||
this.customerName = customerName; |
|
||||
} |
|
||||
|
|
||||
public String getIsChecked() { |
|
||||
return isChecked; |
|
||||
} |
|
||||
|
|
||||
public void setIsChecked(String isChecked) { |
|
||||
this.isChecked = isChecked; |
|
||||
} |
|
||||
|
|
||||
public Date getSendDate() { |
|
||||
return sendDate; |
|
||||
} |
|
||||
|
|
||||
public void setSendDate(Date sendDate) { |
|
||||
this.sendDate = sendDate; |
|
||||
} |
|
||||
|
|
||||
public String getWarehousingRecordNo() { |
|
||||
return warehousingRecordNo; |
|
||||
} |
|
||||
|
|
||||
public void setWarehousingRecordNo(String warehousingRecordNo) { |
|
||||
this.warehousingRecordNo = warehousingRecordNo; |
|
||||
} |
|
||||
|
|
||||
public String getPurchaseOrderNo() { |
|
||||
return purchaseOrderNo; |
|
||||
} |
|
||||
|
|
||||
public void setPurchaseOrderNo(String purchaseOrderNo) { |
|
||||
this.purchaseOrderNo = purchaseOrderNo; |
|
||||
} |
|
||||
|
|
||||
public String getProviderNo() { |
|
||||
return providerNo; |
|
||||
} |
|
||||
|
|
||||
public void setProviderNo(String providerNo) { |
|
||||
this.providerNo = providerNo; |
|
||||
} |
|
||||
|
|
||||
public String getProviderName() { |
|
||||
return providerName; |
|
||||
} |
|
||||
|
|
||||
public void setProviderName(String providerName) { |
|
||||
this.providerName = providerName; |
|
||||
} |
|
||||
|
|
||||
public Date getWarehousingRecordDate() { |
|
||||
return warehousingRecordDate; |
|
||||
} |
|
||||
|
|
||||
public void setWarehousingRecordDate(Date warehousingRecordDate) { |
|
||||
this.warehousingRecordDate = warehousingRecordDate; |
|
||||
} |
|
||||
|
|
||||
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 getSpecificationModel() { |
|
||||
return specificationModel; |
|
||||
} |
|
||||
|
|
||||
public void setSpecificationModel(String specificationModel) { |
|
||||
this.specificationModel = specificationModel; |
|
||||
} |
|
||||
|
|
||||
public String getUnit() { |
|
||||
return unit; |
|
||||
} |
|
||||
|
|
||||
public void setUnit(String unit) { |
|
||||
this.unit = unit; |
|
||||
} |
|
||||
|
|
||||
public String getWarehousingAmt() { |
|
||||
return warehousingAmt; |
|
||||
} |
|
||||
|
|
||||
public void setWarehousingAmt(String warehousingAmt) { |
|
||||
this.warehousingAmt = warehousingAmt; |
|
||||
} |
|
||||
|
|
||||
public String getCrlName() { |
|
||||
return crlName; |
|
||||
} |
|
||||
|
|
||||
public void setCrlName(String crlName) { |
|
||||
this.crlName = crlName; |
|
||||
} |
|
||||
|
|
||||
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; |
|
||||
} |
|
||||
|
|
||||
public String getPaymentCondition() { |
|
||||
return paymentCondition; |
|
||||
} |
|
||||
|
|
||||
public void setPaymentCondition(String paymentCondition) { |
|
||||
this.paymentCondition = paymentCondition; |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public String toString() { |
|
||||
return "ProcurementCheck{" + |
|
||||
"warehousingRecordNo='" + warehousingRecordNo + '\'' + |
|
||||
", purchaseOrderNo='" + purchaseOrderNo + '\'' + |
|
||||
", providerNo='" + providerNo + '\'' + |
|
||||
", providerName='" + providerName + '\'' + |
|
||||
", warehousingRecordDate=" + warehousingRecordDate + |
|
||||
", itemNo='" + itemNo + '\'' + |
|
||||
", itemName='" + itemName + '\'' + |
|
||||
", specificationModel='" + specificationModel + '\'' + |
|
||||
", unit='" + unit + '\'' + |
|
||||
", warehousingAmt='" + warehousingAmt + '\'' + |
|
||||
", crlName='" + crlName + '\'' + |
|
||||
", price=" + price + |
|
||||
", totalPrice=" + totalPrice + |
|
||||
", paymentCondition='" + paymentCondition + '\'' + |
|
||||
", isChecked='" + isChecked + '\'' + |
|
||||
", sendDate=" + sendDate + |
|
||||
'}'; |
|
||||
} |
|
||||
} |
|
||||
@ -1,17 +0,0 @@ |
|||||
package com.ruoyi.buyorderHead.mapper; |
|
||||
|
|
||||
import com.ruoyi.buyorderHead.domain.ProcurementCheck; |
|
||||
|
|
||||
import java.util.List; |
|
||||
|
|
||||
/** |
|
||||
* @author ：pyy |
|
||||
* @date ：Created in 2021/12/7 9:35 |
|
||||
* @description： |
|
||||
* @modified By： |
|
||||
* @version: $ |
|
||||
*/ |
|
||||
public interface ProcurementCheckMapper { |
|
||||
|
|
||||
public List<ProcurementCheck> selectProcurementCheckList(ProcurementCheck procurementCheck); |
|
||||
} |
|
||||
@ -1,17 +0,0 @@ |
|||||
package com.ruoyi.buyorderHead.service; |
|
||||
|
|
||||
import com.ruoyi.buyorderHead.domain.ProcurementCheck; |
|
||||
|
|
||||
import java.util.List; |
|
||||
|
|
||||
/** |
|
||||
* @author ：pyy |
|
||||
* @date ：Created in 2021/12/7 11:09 |
|
||||
* @description： |
|
||||
* @modified By： |
|
||||
* @version: $ |
|
||||
*/ |
|
||||
public interface ProcurementCheckService { |
|
||||
|
|
||||
public List<ProcurementCheck> findProcurementCheckList(ProcurementCheck procurementCheck); |
|
||||
} |
|
||||
@ -1,41 +0,0 @@ |
|||||
package com.ruoyi.buyorderHead.service.impl; |
|
||||
|
|
||||
import com.alibaba.druid.util.StringUtils; |
|
||||
import com.ruoyi.buyorderHead.domain.ProcurementCheck; |
|
||||
import com.ruoyi.buyorderHead.mapper.ProcurementCheckMapper; |
|
||||
import com.ruoyi.buyorderHead.service.ProcurementCheckService; |
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||
import org.springframework.stereotype.Service; |
|
||||
|
|
||||
import java.math.BigDecimal; |
|
||||
import java.util.List; |
|
||||
|
|
||||
/** |
|
||||
* @author ：pyy |
|
||||
* @date ：Created in 2021/12/7 11:24 |
|
||||
* @description： |
|
||||
* @modified By： |
|
||||
* @version: $ |
|
||||
*/ |
|
||||
@Service |
|
||||
public class ProcurementCheckServiceImpl implements ProcurementCheckService { |
|
||||
|
|
||||
@Autowired |
|
||||
private ProcurementCheckMapper procurementCheckMapper; |
|
||||
|
|
||||
@Override |
|
||||
public List<ProcurementCheck> findProcurementCheckList(ProcurementCheck procurementCheck) { |
|
||||
List<ProcurementCheck> procurementChecks = procurementCheckMapper.selectProcurementCheckList(procurementCheck); |
|
||||
for (ProcurementCheck each : procurementChecks) { |
|
||||
String warehousingAmt = each.getWarehousingAmt(); |
|
||||
BigDecimal price = each.getPrice(); |
|
||||
if (!StringUtils.isEmpty(warehousingAmt) && price != null) { |
|
||||
BigDecimal amt = new BigDecimal(warehousingAmt); |
|
||||
each.setTotalPrice(amt.multiply(price)); |
|
||||
} else { |
|
||||
each.setTotalPrice(BigDecimal.ZERO); |
|
||||
} |
|
||||
} |
|
||||
return procurementChecks; |
|
||||
} |
|
||||
} |
|
||||
@ -1,54 +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.buyorderHead.mapper.ProcurementCheckMapper"> |
|
||||
|
|
||||
|
|
||||
<select id="selectProcurementCheckList" resultType="com.ruoyi.buyorderHead.domain.ProcurementCheck" |
|
||||
parameterType="com.ruoyi.buyorderHead.domain.ProcurementCheck"> |
|
||||
SELECT |
|
||||
warehousing_record.warehousingRecord_no as warehousingRecordNo, |
|
||||
warehousing_record.purchaseOrder_no as purchaseOrderNo, |
|
||||
warehousing_record.customer_id as providerNo, |
|
||||
warehousing_record.customer_name as providerName, |
|
||||
warehousing_record.warehousingRecord_date as warehousingRecordDate, |
|
||||
warehousing_record.item_NO as itemNo, |
|
||||
warehousing_record.item_name as itemName, |
|
||||
warehousing_record.specificationModel as specificationModel, |
|
||||
warehousing_record.unit as unit, |
|
||||
warehousing_record.customer_name as customerName, |
|
||||
warehousing_record.spell_1 as isChecked, |
|
||||
warehousing_record.warehousing_amt as warehousingAmt, |
|
||||
buyorder_head.GetMoneyMemo as paymentCondition, |
|
||||
buyorder_list.Crl_Name as crlName, |
|
||||
buyorder_list.SendDate as sendDate, |
|
||||
buyorder_list.Price as price |
|
||||
FROM |
|
||||
warehousing_record |
|
||||
LEFT JOIN buyorder_head ON warehousing_record.purchaseOrder_no = buyorder_head.PO_ID |
|
||||
LEFT JOIN buyorder_list ON warehousing_record.purchaseOrder_no = buyorder_list.PO_ID |
|
||||
<where> |
|
||||
<if test="warehousingRecordNo!=null and warehousingRecordNo!=''">and warehousing_record.warehousingRecord_no like concat('%', #{warehousingRecordNo}, '%')</if> |
|
||||
<if test="purchaseOrderNo!=null and purchaseOrderNo!=''">and warehousing_record.purchaseOrder_no like concat('%', #{purchaseOrderNo}, '%')</if> |
|
||||
<if test="providerNo!=null and providerNo!=''">and warehousing_record.customer_id like concat('%', #{providerNo}, '%')</if> |
|
||||
<if test="providerName!=null and providerName!=''">and warehousing_record.customer_name like concat('%', #{providerName}, '%')</if> |
|
||||
<if test="params.beginWarehousingRecordDate != null and params.beginWarehousingRecordDate !=''"> and warehousing_record.warehousingRecord_date >= #{params.beginWarehousingRecordDate}</if> |
|
||||
<if test="params.endWarehousingRecordDate != null and params.endWarehousingRecordDate != ''">and #{params.endWarehousingRecordDate} >= warehousing_record.warehousingRecord_date</if> |
|
||||
<if test="itemNo!=null and itemNo!=''">and warehousing_record.item_NO like concat('%', #{itemNo}, '%')</if> |
|
||||
<if test="itemName!=null and itemName!=''">and warehousing_record.item_name like concat('%', #{itemName}, '%')</if> |
|
||||
<if test="specificationModel!=null and specificationModel!=''">and warehousing_record.specificationModel like concat('%', #{specificationModel}, '%')</if> |
|
||||
<if test="unit!=null and unit!=''">and warehousing_record.unit like concat('%', #{unit}, '%')</if> |
|
||||
<if test="warehousingAmt!=null and warehousingAmt!=''">and warehousing_record.warehousing_amt like concat('%', #{warehousingAmt}, '%')</if> |
|
||||
<if test="paymentCondition!=null and paymentCondition!=''">and buyorder_head.GetMoneyMemo like concat('%', #{paymentCondition}, '%')</if> |
|
||||
<if test="crlName!=null and crlName!=''">and buyorder_list.Crl_Name like concat('%', #{crlName}, '%')</if> |
|
||||
<if test="price!=null and price!=''">and buyorder_list.Price like concat('%', #{price}, '%')</if> |
|
||||
<if test="customerName!=null and customerName!=''">and warehousing_record.customer_name like concat('%', #{customerName}, '%')</if> |
|
||||
<if test="isChecked!=null and isChecked!=''">and warehousing_record.spell_1 = #{isChecked}</if> |
|
||||
<if test="params.beginSendDate != null and params.beginSendDate !=''"> and buyorder_list.SendDate >= #{params.beginSendDate}</if> |
|
||||
<if test="params.endSendDate != null and params.endSendDate != ''">and #{params.endSendDate} >= buyorder_list.SendDate</if> |
|
||||
and warehousing_record.purchaseOrder_no is not null |
|
||||
</where> |
|
||||
</select> |
|
||||
|
|
||||
</mapper> |
|
||||
Loading…
Reference in new issue