diff --git a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/domain/ProcurementCheck.java b/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/domain/ProcurementCheck.java deleted file mode 100644 index c40e9000..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/domain/ProcurementCheck.java +++ /dev/null @@ -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 + - '}'; - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/mapper/ProcurementCheckMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/mapper/ProcurementCheckMapper.java deleted file mode 100644 index eae8dcd9..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/mapper/ProcurementCheckMapper.java +++ /dev/null @@ -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 selectProcurementCheckList(ProcurementCheck procurementCheck); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/service/ProcurementCheckService.java b/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/service/ProcurementCheckService.java deleted file mode 100644 index c1549c2f..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/service/ProcurementCheckService.java +++ /dev/null @@ -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 findProcurementCheckList(ProcurementCheck procurementCheck); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/service/impl/ProcurementCheckServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/service/impl/ProcurementCheckServiceImpl.java deleted file mode 100644 index a9bc1ac1..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/buyorderHead/service/impl/ProcurementCheckServiceImpl.java +++ /dev/null @@ -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 findProcurementCheckList(ProcurementCheck procurementCheck) { - List 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; - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/buyorderHead/ProcurementCheckMapper.xml b/ruoyi-admin/src/main/resources/mapper/buyorderHead/ProcurementCheckMapper.xml deleted file mode 100644 index 2ca6e682..00000000 --- a/ruoyi-admin/src/main/resources/mapper/buyorderHead/ProcurementCheckMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - \ No newline at end of file