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

增加关联明细id字段，解决明细中重复商品进行批次发货遇到的问题

Browse Source
This commit is contained in:
季圣华
2022-05-28 22:36:33 +08:00
parent 1cc71232e5
commit d453c659cc
9 changed files with 136 additions and 31 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

@@ -46,6 +46,8 @@ public class DepotItem {
private Date expirationDate;
private Long linkId;
private Long tenantId;
private String deleteFlag;
@@ -218,6 +220,14 @@ public class DepotItem {
this.expirationDate = expirationDate;
}
public Long getLinkId() {
return linkId;
}
public void setLinkId(Long linkId) {
this.linkId = linkId;
}
public Long getTenantId() {
return tenantId;
}

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

@@ -1426,6 +1426,66 @@ public class DepotItemExample {
return (Criteria) this;
}
public Criteria andLinkIdIsNull() {
addCriterion("link_id is null");
return (Criteria) this;
}
public Criteria andLinkIdIsNotNull() {
addCriterion("link_id is not null");
return (Criteria) this;
}
public Criteria andLinkIdEqualTo(Long value) {
addCriterion("link_id =", value, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdNotEqualTo(Long value) {
addCriterion("link_id <>", value, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdGreaterThan(Long value) {
addCriterion("link_id >", value, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdGreaterThanOrEqualTo(Long value) {
addCriterion("link_id >=", value, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdLessThan(Long value) {
addCriterion("link_id <", value, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdLessThanOrEqualTo(Long value) {
addCriterion("link_id <=", value, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdIn(List<Long> values) {
addCriterion("link_id in", values, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdNotIn(List<Long> values) {
addCriterion("link_id not in", values, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdBetween(Long value1, Long value2) {
addCriterion("link_id between", value1, value2, "linkId");
return (Criteria) this;
}
public Criteria andLinkIdNotBetween(Long value1, Long value2) {
addCriterion("link_id not between", value1, value2, "linkId");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;

2
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
View File

@@ -143,11 +143,13 @@ public interface DepotItemMapperEx {
BigDecimal getFinishNumber(
@Param("meId") Long meId,
@Param("linkId") Long linkId,
@Param("linkNumber") String linkNumber,
@Param("goToType") String goToType);
BigDecimal getRealFinishNumber(
@Param("meId") Long meId,
@Param("linkId") Long linkId,
@Param("linkNumber") String linkNumber,
@Param("currentHeaderId") Long currentHeaderId,
@Param("goToType") String goToType);