purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给单据明细增加采购单价字段

Browse Source
This commit is contained in:
季圣华
2022-10-02 16:57:05 +08:00
parent 1ed99c8ee1
commit 7a0d007705
6 changed files with 132 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java
View File

@@ -22,6 +22,8 @@ public class DepotItem {
private BigDecimal unitPrice;
private BigDecimal purchaseUnitPrice;
private BigDecimal taxUnitPrice;
private BigDecimal allPrice;
@@ -124,6 +126,14 @@ public class DepotItem {
this.unitPrice = unitPrice;
}
public BigDecimal getPurchaseUnitPrice() {
return purchaseUnitPrice;
}
public void setPurchaseUnitPrice(BigDecimal purchaseUnitPrice) {
this.purchaseUnitPrice = purchaseUnitPrice;
}
public BigDecimal getTaxUnitPrice() {
return taxUnitPrice;
}

60
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java
View File

@@ -666,6 +666,66 @@ public class DepotItemExample {
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceIsNull() {
addCriterion("purchase_unit_price is null");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceIsNotNull() {
addCriterion("purchase_unit_price is not null");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceEqualTo(BigDecimal value) {
addCriterion("purchase_unit_price =", value, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceNotEqualTo(BigDecimal value) {
addCriterion("purchase_unit_price <>", value, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceGreaterThan(BigDecimal value) {
addCriterion("purchase_unit_price >", value, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("purchase_unit_price >=", value, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceLessThan(BigDecimal value) {
addCriterion("purchase_unit_price <", value, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("purchase_unit_price <=", value, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceIn(List<BigDecimal> values) {
addCriterion("purchase_unit_price in", values, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceNotIn(List<BigDecimal> values) {
addCriterion("purchase_unit_price not in", values, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("purchase_unit_price between", value1, value2, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andPurchaseUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("purchase_unit_price not between", value1, value2, "purchaseUnitPrice");
return (Criteria) this;
}
public Criteria andTaxUnitPriceIsNull() {
addCriterion("tax_unit_price is null");
return (Criteria) this;

5
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -525,6 +525,11 @@ public class DepotItemService {
}
}
}
//如果是销售出库单则给采购单价字段赋值
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) &&
BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType())) {
depotItem.setPurchaseUnitPrice(materialExtend.getPurchaseDecimal());
}
if (StringUtil.isExist(rowObj.get("taxUnitPrice"))) {
depotItem.setTaxUnitPrice(rowObj.getBigDecimal("taxUnitPrice"));
}