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

优化收款单

Browse Source
This commit is contained in:
季圣华
2021-06-30 00:53:56 +08:00
parent dc2ba7237c
commit 4e66aeb98b
23 changed files with 693 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ public class AccountHead {
private String remark;
private String fileName;
private Long tenantId;
private String deleteFlag;
@@ -118,6 +120,14 @@ public class AccountHead {
this.remark = remark == null ? null : remark.trim();
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName == null ? null : fileName.trim();
}
public Long getTenantId() {
return tenantId;
}

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java
View File

@@ -796,6 +796,76 @@ public class AccountHeadExample {
return (Criteria) this;
}
public Criteria andFileNameIsNull() {
addCriterion("file_name is null");
return (Criteria) this;
}
public Criteria andFileNameIsNotNull() {
addCriterion("file_name is not null");
return (Criteria) this;
}
public Criteria andFileNameEqualTo(String value) {
addCriterion("file_name =", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotEqualTo(String value) {
addCriterion("file_name <>", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameGreaterThan(String value) {
addCriterion("file_name >", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameGreaterThanOrEqualTo(String value) {
addCriterion("file_name >=", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameLessThan(String value) {
addCriterion("file_name <", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameLessThanOrEqualTo(String value) {
addCriterion("file_name <=", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameLike(String value) {
addCriterion("file_name like", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotLike(String value) {
addCriterion("file_name not like", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameIn(List<String> values) {
addCriterion("file_name in", values, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotIn(List<String> values) {
addCriterion("file_name not in", values, "fileName");
return (Criteria) this;
}
public Criteria andFileNameBetween(String value1, String value2) {
addCriterion("file_name between", value1, value2, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotBetween(String value1, String value2) {
addCriterion("file_name not between", value1, value2, "fileName");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;

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

@@ -25,6 +25,8 @@ public class AccountHeadVo4ListEx {
private String remark;
private String fileName;
private Long tenantId;
private String deleteFlag;
@@ -121,6 +123,14 @@ public class AccountHeadVo4ListEx {
this.remark = remark;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public Long getTenantId() {
return tenantId;
}

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java
View File

@@ -13,6 +13,10 @@ public class AccountItem {
private Long billId;
private BigDecimal needDebt;
private BigDecimal finishDebt;
private BigDecimal eachAmount;
private String remark;
@@ -61,6 +65,22 @@ public class AccountItem {
this.billId = billId;
}
public BigDecimal getNeedDebt() {
return needDebt;
}
public void setNeedDebt(BigDecimal needDebt) {
this.needDebt = needDebt;
}
public BigDecimal getFinishDebt() {
return finishDebt;
}
public void setFinishDebt(BigDecimal finishDebt) {
this.finishDebt = finishDebt;
}
public BigDecimal getEachAmount() {
return eachAmount;
}

120
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java
View File

@@ -405,6 +405,126 @@ public class AccountItemExample {
return (Criteria) this;
}
public Criteria andNeedDebtIsNull() {
addCriterion("need_debt is null");
return (Criteria) this;
}
public Criteria andNeedDebtIsNotNull() {
addCriterion("need_debt is not null");
return (Criteria) this;
}
public Criteria andNeedDebtEqualTo(BigDecimal value) {
addCriterion("need_debt =", value, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtNotEqualTo(BigDecimal value) {
addCriterion("need_debt <>", value, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtGreaterThan(BigDecimal value) {
addCriterion("need_debt >", value, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("need_debt >=", value, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtLessThan(BigDecimal value) {
addCriterion("need_debt <", value, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtLessThanOrEqualTo(BigDecimal value) {
addCriterion("need_debt <=", value, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtIn(List<BigDecimal> values) {
addCriterion("need_debt in", values, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtNotIn(List<BigDecimal> values) {
addCriterion("need_debt not in", values, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("need_debt between", value1, value2, "needDebt");
return (Criteria) this;
}
public Criteria andNeedDebtNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("need_debt not between", value1, value2, "needDebt");
return (Criteria) this;
}
public Criteria andFinishDebtIsNull() {
addCriterion("finish_debt is null");
return (Criteria) this;
}
public Criteria andFinishDebtIsNotNull() {
addCriterion("finish_debt is not null");
return (Criteria) this;
}
public Criteria andFinishDebtEqualTo(BigDecimal value) {
addCriterion("finish_debt =", value, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtNotEqualTo(BigDecimal value) {
addCriterion("finish_debt <>", value, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtGreaterThan(BigDecimal value) {
addCriterion("finish_debt >", value, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("finish_debt >=", value, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtLessThan(BigDecimal value) {
addCriterion("finish_debt <", value, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtLessThanOrEqualTo(BigDecimal value) {
addCriterion("finish_debt <=", value, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtIn(List<BigDecimal> values) {
addCriterion("finish_debt in", values, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtNotIn(List<BigDecimal> values) {
addCriterion("finish_debt not in", values, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("finish_debt between", value1, value2, "finishDebt");
return (Criteria) this;
}
public Criteria andFinishDebtNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("finish_debt not between", value1, value2, "finishDebt");
return (Criteria) this;
}
public Criteria andEachAmountIsNull() {
addCriterion("each_amount is null");
return (Criteria) this;

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

@@ -36,6 +36,8 @@ public class DepotHead {
private String remark;
private String fileName;
private String salesMan;
private String accountIdList;
@@ -192,6 +194,14 @@ public class DepotHead {
this.remark = remark == null ? null : remark.trim();
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName == null ? null : fileName.trim();
}
public String getSalesMan() {
return salesMan;
}

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View File

@@ -1136,6 +1136,76 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andFileNameIsNull() {
addCriterion("file_name is null");
return (Criteria) this;
}
public Criteria andFileNameIsNotNull() {
addCriterion("file_name is not null");
return (Criteria) this;
}
public Criteria andFileNameEqualTo(String value) {
addCriterion("file_name =", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotEqualTo(String value) {
addCriterion("file_name <>", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameGreaterThan(String value) {
addCriterion("file_name >", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameGreaterThanOrEqualTo(String value) {
addCriterion("file_name >=", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameLessThan(String value) {
addCriterion("file_name <", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameLessThanOrEqualTo(String value) {
addCriterion("file_name <=", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameLike(String value) {
addCriterion("file_name like", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotLike(String value) {
addCriterion("file_name not like", value, "fileName");
return (Criteria) this;
}
public Criteria andFileNameIn(List<String> values) {
addCriterion("file_name in", values, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotIn(List<String> values) {
addCriterion("file_name not in", values, "fileName");
return (Criteria) this;
}
public Criteria andFileNameBetween(String value1, String value2) {
addCriterion("file_name between", value1, value2, "fileName");
return (Criteria) this;
}
public Criteria andFileNameNotBetween(String value1, String value2) {
addCriterion("file_name not between", value1, value2, "fileName");
return (Criteria) this;
}
public Criteria andSalesManIsNull() {
addCriterion("sales_man is null");
return (Criteria) this;

3
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java
View File

@@ -5,6 +5,7 @@ import com.jsh.erp.datasource.entities.AccountItemExample;
import com.jsh.erp.datasource.vo.AccountItemVo4List;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -34,4 +35,6 @@ public interface AccountItemMapperEx {
List<AccountItem> getAccountItemListByInOutItemIds(@Param("inOutItemIds") String[] inOutItemIds);
int batchDeleteAccountItemByHeadIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String[] ids);
BigDecimal getEachAmountByBillId(@Param("billId") Long billId);
}

12
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -132,4 +132,16 @@ public interface DepotHeadMapperEx {
@Param("hasSupplier") Integer hasSupplier,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime);
List<DepotHeadVo4List> debtList(
@Param("organId") Long organId,
@Param("type") String type,
@Param("subType") String subType,
@Param("creatorArray") String[] creatorArray,
@Param("status") String status,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("materialParam") String materialParam,
@Param("depotArray") String[] depotArray);
}

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View File

@@ -23,6 +23,8 @@ public class DepotHeadVo4List extends DepotHead{
private String operTimeStr;
private BigDecimal finishDebt;
public String getProjectName() {
return projectName;
}
@@ -86,4 +88,12 @@ public class DepotHeadVo4List extends DepotHead{
public void setOperTimeStr(String operTimeStr) {
this.operTimeStr = operTimeStr;
}
public BigDecimal getFinishDebt() {
return finishDebt;
}
public void setFinishDebt(BigDecimal finishDebt) {
this.finishDebt = finishDebt;
}
}