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

去除单据多余的字段

Browse Source
This commit is contained in:
季圣华
2021-07-22 22:58:42 +08:00
parent 955fd58542
commit dd73a0d1e1
19 changed files with 191 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -191,7 +191,6 @@ public class DepotItemController {
item.put("taxUnitPrice", diEx.getTaxUnitPrice());
item.put("allPrice", diEx.getAllPrice());
item.put("remark", diEx.getRemark());
item.put("img", diEx.getImg());
item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
item.put("depotName", diEx.getDepotId() == null ? "" : diEx.getDepotName());
item.put("anotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId());

1
jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java
View File

@@ -49,7 +49,6 @@ public class OrganizationController {
if (null != dataList) {
for (Organization org : dataList) {
outer.put("id", org.getId());
outer.put("orgFullName", org.getOrgFullName());
outer.put("orgAbr", org.getOrgAbr());
outer.put("parentId", org.getParentId());
List<Organization> dataParentList = organizationService.findByParentId(org.getParentId());

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

@@ -20,8 +20,6 @@ public class DepotHead {
private Long organId;
private Long handsPersonId;
private Long creator;
private Long accountId;
@@ -52,12 +50,6 @@ public class DepotHead {
private BigDecimal otherMoney;
private String otherMoneyList;
private String otherMoneyItem;
private Integer accountDay;
private String status;
private String linkNumber;
@@ -130,14 +122,6 @@ public class DepotHead {
this.organId = organId;
}
public Long getHandsPersonId() {
return handsPersonId;
}
public void setHandsPersonId(Long handsPersonId) {
this.handsPersonId = handsPersonId;
}
public Long getCreator() {
return creator;
}
@@ -258,30 +242,6 @@ public class DepotHead {
this.otherMoney = otherMoney;
}
public String getOtherMoneyList() {
return otherMoneyList;
}
public void setOtherMoneyList(String otherMoneyList) {
this.otherMoneyList = otherMoneyList == null ? null : otherMoneyList.trim();
}
public String getOtherMoneyItem() {
return otherMoneyItem;
}
public void setOtherMoneyItem(String otherMoneyItem) {
this.otherMoneyItem = otherMoneyItem == null ? null : otherMoneyItem.trim();
}
public Integer getAccountDay() {
return accountDay;
}
public void setAccountDay(Integer accountDay) {
this.accountDay = accountDay;
}
public String getStatus() {
return status;
}

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

@@ -626,66 +626,6 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andHandsPersonIdIsNull() {
addCriterion("hands_person_id is null");
return (Criteria) this;
}
public Criteria andHandsPersonIdIsNotNull() {
addCriterion("hands_person_id is not null");
return (Criteria) this;
}
public Criteria andHandsPersonIdEqualTo(Long value) {
addCriterion("hands_person_id =", value, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdNotEqualTo(Long value) {
addCriterion("hands_person_id <>", value, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdGreaterThan(Long value) {
addCriterion("hands_person_id >", value, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdGreaterThanOrEqualTo(Long value) {
addCriterion("hands_person_id >=", value, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdLessThan(Long value) {
addCriterion("hands_person_id <", value, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdLessThanOrEqualTo(Long value) {
addCriterion("hands_person_id <=", value, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdIn(List<Long> values) {
addCriterion("hands_person_id in", values, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdNotIn(List<Long> values) {
addCriterion("hands_person_id not in", values, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdBetween(Long value1, Long value2) {
addCriterion("hands_person_id between", value1, value2, "handsPersonId");
return (Criteria) this;
}
public Criteria andHandsPersonIdNotBetween(Long value1, Long value2) {
addCriterion("hands_person_id not between", value1, value2, "handsPersonId");
return (Criteria) this;
}
public Criteria andCreatorIsNull() {
addCriterion("creator is null");
return (Criteria) this;
@@ -1656,206 +1596,6 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andOtherMoneyListIsNull() {
addCriterion("other_money_list is null");
return (Criteria) this;
}
public Criteria andOtherMoneyListIsNotNull() {
addCriterion("other_money_list is not null");
return (Criteria) this;
}
public Criteria andOtherMoneyListEqualTo(String value) {
addCriterion("other_money_list =", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListNotEqualTo(String value) {
addCriterion("other_money_list <>", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListGreaterThan(String value) {
addCriterion("other_money_list >", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListGreaterThanOrEqualTo(String value) {
addCriterion("other_money_list >=", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListLessThan(String value) {
addCriterion("other_money_list <", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListLessThanOrEqualTo(String value) {
addCriterion("other_money_list <=", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListLike(String value) {
addCriterion("other_money_list like", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListNotLike(String value) {
addCriterion("other_money_list not like", value, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListIn(List<String> values) {
addCriterion("other_money_list in", values, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListNotIn(List<String> values) {
addCriterion("other_money_list not in", values, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListBetween(String value1, String value2) {
addCriterion("other_money_list between", value1, value2, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyListNotBetween(String value1, String value2) {
addCriterion("other_money_list not between", value1, value2, "otherMoneyList");
return (Criteria) this;
}
public Criteria andOtherMoneyItemIsNull() {
addCriterion("other_money_item is null");
return (Criteria) this;
}
public Criteria andOtherMoneyItemIsNotNull() {
addCriterion("other_money_item is not null");
return (Criteria) this;
}
public Criteria andOtherMoneyItemEqualTo(String value) {
addCriterion("other_money_item =", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemNotEqualTo(String value) {
addCriterion("other_money_item <>", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemGreaterThan(String value) {
addCriterion("other_money_item >", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemGreaterThanOrEqualTo(String value) {
addCriterion("other_money_item >=", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemLessThan(String value) {
addCriterion("other_money_item <", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemLessThanOrEqualTo(String value) {
addCriterion("other_money_item <=", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemLike(String value) {
addCriterion("other_money_item like", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemNotLike(String value) {
addCriterion("other_money_item not like", value, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemIn(List<String> values) {
addCriterion("other_money_item in", values, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemNotIn(List<String> values) {
addCriterion("other_money_item not in", values, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemBetween(String value1, String value2) {
addCriterion("other_money_item between", value1, value2, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andOtherMoneyItemNotBetween(String value1, String value2) {
addCriterion("other_money_item not between", value1, value2, "otherMoneyItem");
return (Criteria) this;
}
public Criteria andAccountDayIsNull() {
addCriterion("account_day is null");
return (Criteria) this;
}
public Criteria andAccountDayIsNotNull() {
addCriterion("account_day is not null");
return (Criteria) this;
}
public Criteria andAccountDayEqualTo(Integer value) {
addCriterion("account_day =", value, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayNotEqualTo(Integer value) {
addCriterion("account_day <>", value, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayGreaterThan(Integer value) {
addCriterion("account_day >", value, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayGreaterThanOrEqualTo(Integer value) {
addCriterion("account_day >=", value, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayLessThan(Integer value) {
addCriterion("account_day <", value, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayLessThanOrEqualTo(Integer value) {
addCriterion("account_day <=", value, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayIn(List<Integer> values) {
addCriterion("account_day in", values, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayNotIn(List<Integer> values) {
addCriterion("account_day not in", values, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayBetween(Integer value1, Integer value2) {
addCriterion("account_day between", value1, value2, "accountDay");
return (Criteria) this;
}
public Criteria andAccountDayNotBetween(Integer value1, Integer value2) {
addCriterion("account_day not between", value1, value2, "accountDay");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("status is null");
return (Criteria) this;

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

@@ -25,10 +25,6 @@ public class DepotItem {
private String remark;
private String img;
private BigDecimal incidentals;
private Long depotId;
private Long anotherDepotId;
@@ -39,16 +35,6 @@ public class DepotItem {
private BigDecimal taxLastMoney;
private String otherField1;
private String otherField2;
private String otherField3;
private String otherField4;
private String otherField5;
private String materialType;
private Long tenantId;
@@ -143,22 +129,6 @@ public class DepotItem {
this.remark = remark == null ? null : remark.trim();
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img == null ? null : img.trim();
}
public BigDecimal getIncidentals() {
return incidentals;
}
public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals;
}
public Long getDepotId() {
return depotId;
}
@@ -199,46 +169,6 @@ public class DepotItem {
this.taxLastMoney = taxLastMoney;
}
public String getOtherField1() {
return otherField1;
}
public void setOtherField1(String otherField1) {
this.otherField1 = otherField1 == null ? null : otherField1.trim();
}
public String getOtherField2() {
return otherField2;
}
public void setOtherField2(String otherField2) {
this.otherField2 = otherField2 == null ? null : otherField2.trim();
}
public String getOtherField3() {
return otherField3;
}
public void setOtherField3(String otherField3) {
this.otherField3 = otherField3 == null ? null : otherField3.trim();
}
public String getOtherField4() {
return otherField4;
}
public void setOtherField4(String otherField4) {
this.otherField4 = otherField4 == null ? null : otherField4.trim();
}
public String getOtherField5() {
return otherField5;
}
public void setOtherField5(String otherField5) {
this.otherField5 = otherField5 == null ? null : otherField5.trim();
}
public String getMaterialType() {
return materialType;
}

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

@@ -785,136 +785,6 @@ public class DepotItemExample {
return (Criteria) this;
}
public Criteria andImgIsNull() {
addCriterion("img is null");
return (Criteria) this;
}
public Criteria andImgIsNotNull() {
addCriterion("img is not null");
return (Criteria) this;
}
public Criteria andImgEqualTo(String value) {
addCriterion("img =", value, "img");
return (Criteria) this;
}
public Criteria andImgNotEqualTo(String value) {
addCriterion("img <>", value, "img");
return (Criteria) this;
}
public Criteria andImgGreaterThan(String value) {
addCriterion("img >", value, "img");
return (Criteria) this;
}
public Criteria andImgGreaterThanOrEqualTo(String value) {
addCriterion("img >=", value, "img");
return (Criteria) this;
}
public Criteria andImgLessThan(String value) {
addCriterion("img <", value, "img");
return (Criteria) this;
}
public Criteria andImgLessThanOrEqualTo(String value) {
addCriterion("img <=", value, "img");
return (Criteria) this;
}
public Criteria andImgLike(String value) {
addCriterion("img like", value, "img");
return (Criteria) this;
}
public Criteria andImgNotLike(String value) {
addCriterion("img not like", value, "img");
return (Criteria) this;
}
public Criteria andImgIn(List<String> values) {
addCriterion("img in", values, "img");
return (Criteria) this;
}
public Criteria andImgNotIn(List<String> values) {
addCriterion("img not in", values, "img");
return (Criteria) this;
}
public Criteria andImgBetween(String value1, String value2) {
addCriterion("img between", value1, value2, "img");
return (Criteria) this;
}
public Criteria andImgNotBetween(String value1, String value2) {
addCriterion("img not between", value1, value2, "img");
return (Criteria) this;
}
public Criteria andIncidentalsIsNull() {
addCriterion("incidentals is null");
return (Criteria) this;
}
public Criteria andIncidentalsIsNotNull() {
addCriterion("incidentals is not null");
return (Criteria) this;
}
public Criteria andIncidentalsEqualTo(BigDecimal value) {
addCriterion("incidentals =", value, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsNotEqualTo(BigDecimal value) {
addCriterion("incidentals <>", value, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsGreaterThan(BigDecimal value) {
addCriterion("incidentals >", value, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("incidentals >=", value, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsLessThan(BigDecimal value) {
addCriterion("incidentals <", value, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsLessThanOrEqualTo(BigDecimal value) {
addCriterion("incidentals <=", value, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsIn(List<BigDecimal> values) {
addCriterion("incidentals in", values, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsNotIn(List<BigDecimal> values) {
addCriterion("incidentals not in", values, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("incidentals between", value1, value2, "incidentals");
return (Criteria) this;
}
public Criteria andIncidentalsNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("incidentals not between", value1, value2, "incidentals");
return (Criteria) this;
}
public Criteria andDepotIdIsNull() {
addCriterion("depot_id is null");
return (Criteria) this;
@@ -1215,356 +1085,6 @@ public class DepotItemExample {
return (Criteria) this;
}
public Criteria andOtherField1IsNull() {
addCriterion("other_field1 is null");
return (Criteria) this;
}
public Criteria andOtherField1IsNotNull() {
addCriterion("other_field1 is not null");
return (Criteria) this;
}
public Criteria andOtherField1EqualTo(String value) {
addCriterion("other_field1 =", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1NotEqualTo(String value) {
addCriterion("other_field1 <>", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1GreaterThan(String value) {
addCriterion("other_field1 >", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1GreaterThanOrEqualTo(String value) {
addCriterion("other_field1 >=", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1LessThan(String value) {
addCriterion("other_field1 <", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1LessThanOrEqualTo(String value) {
addCriterion("other_field1 <=", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1Like(String value) {
addCriterion("other_field1 like", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1NotLike(String value) {
addCriterion("other_field1 not like", value, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1In(List<String> values) {
addCriterion("other_field1 in", values, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1NotIn(List<String> values) {
addCriterion("other_field1 not in", values, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1Between(String value1, String value2) {
addCriterion("other_field1 between", value1, value2, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField1NotBetween(String value1, String value2) {
addCriterion("other_field1 not between", value1, value2, "otherField1");
return (Criteria) this;
}
public Criteria andOtherField2IsNull() {
addCriterion("other_field2 is null");
return (Criteria) this;
}
public Criteria andOtherField2IsNotNull() {
addCriterion("other_field2 is not null");
return (Criteria) this;
}
public Criteria andOtherField2EqualTo(String value) {
addCriterion("other_field2 =", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2NotEqualTo(String value) {
addCriterion("other_field2 <>", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2GreaterThan(String value) {
addCriterion("other_field2 >", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2GreaterThanOrEqualTo(String value) {
addCriterion("other_field2 >=", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2LessThan(String value) {
addCriterion("other_field2 <", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2LessThanOrEqualTo(String value) {
addCriterion("other_field2 <=", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2Like(String value) {
addCriterion("other_field2 like", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2NotLike(String value) {
addCriterion("other_field2 not like", value, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2In(List<String> values) {
addCriterion("other_field2 in", values, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2NotIn(List<String> values) {
addCriterion("other_field2 not in", values, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2Between(String value1, String value2) {
addCriterion("other_field2 between", value1, value2, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField2NotBetween(String value1, String value2) {
addCriterion("other_field2 not between", value1, value2, "otherField2");
return (Criteria) this;
}
public Criteria andOtherField3IsNull() {
addCriterion("other_field3 is null");
return (Criteria) this;
}
public Criteria andOtherField3IsNotNull() {
addCriterion("other_field3 is not null");
return (Criteria) this;
}
public Criteria andOtherField3EqualTo(String value) {
addCriterion("other_field3 =", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3NotEqualTo(String value) {
addCriterion("other_field3 <>", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3GreaterThan(String value) {
addCriterion("other_field3 >", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3GreaterThanOrEqualTo(String value) {
addCriterion("other_field3 >=", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3LessThan(String value) {
addCriterion("other_field3 <", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3LessThanOrEqualTo(String value) {
addCriterion("other_field3 <=", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3Like(String value) {
addCriterion("other_field3 like", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3NotLike(String value) {
addCriterion("other_field3 not like", value, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3In(List<String> values) {
addCriterion("other_field3 in", values, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3NotIn(List<String> values) {
addCriterion("other_field3 not in", values, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3Between(String value1, String value2) {
addCriterion("other_field3 between", value1, value2, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField3NotBetween(String value1, String value2) {
addCriterion("other_field3 not between", value1, value2, "otherField3");
return (Criteria) this;
}
public Criteria andOtherField4IsNull() {
addCriterion("other_field4 is null");
return (Criteria) this;
}
public Criteria andOtherField4IsNotNull() {
addCriterion("other_field4 is not null");
return (Criteria) this;
}
public Criteria andOtherField4EqualTo(String value) {
addCriterion("other_field4 =", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4NotEqualTo(String value) {
addCriterion("other_field4 <>", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4GreaterThan(String value) {
addCriterion("other_field4 >", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4GreaterThanOrEqualTo(String value) {
addCriterion("other_field4 >=", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4LessThan(String value) {
addCriterion("other_field4 <", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4LessThanOrEqualTo(String value) {
addCriterion("other_field4 <=", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4Like(String value) {
addCriterion("other_field4 like", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4NotLike(String value) {
addCriterion("other_field4 not like", value, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4In(List<String> values) {
addCriterion("other_field4 in", values, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4NotIn(List<String> values) {
addCriterion("other_field4 not in", values, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4Between(String value1, String value2) {
addCriterion("other_field4 between", value1, value2, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField4NotBetween(String value1, String value2) {
addCriterion("other_field4 not between", value1, value2, "otherField4");
return (Criteria) this;
}
public Criteria andOtherField5IsNull() {
addCriterion("other_field5 is null");
return (Criteria) this;
}
public Criteria andOtherField5IsNotNull() {
addCriterion("other_field5 is not null");
return (Criteria) this;
}
public Criteria andOtherField5EqualTo(String value) {
addCriterion("other_field5 =", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5NotEqualTo(String value) {
addCriterion("other_field5 <>", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5GreaterThan(String value) {
addCriterion("other_field5 >", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5GreaterThanOrEqualTo(String value) {
addCriterion("other_field5 >=", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5LessThan(String value) {
addCriterion("other_field5 <", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5LessThanOrEqualTo(String value) {
addCriterion("other_field5 <=", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5Like(String value) {
addCriterion("other_field5 like", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5NotLike(String value) {
addCriterion("other_field5 not like", value, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5In(List<String> values) {
addCriterion("other_field5 in", values, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5NotIn(List<String> values) {
addCriterion("other_field5 not in", values, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5Between(String value1, String value2) {
addCriterion("other_field5 between", value1, value2, "otherField5");
return (Criteria) this;
}
public Criteria andOtherField5NotBetween(String value1, String value2) {
addCriterion("other_field5 not between", value1, value2, "otherField5");
return (Criteria) this;
}
public Criteria andMaterialTypeIsNull() {
addCriterion("material_type is null");
return (Criteria) this;

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

@@ -12,6 +12,8 @@ public class MaterialExtend {
private String commodityUnit;
private String sku;
private BigDecimal purchaseDecimal;
private BigDecimal commodityDecimal;
@@ -66,6 +68,14 @@ public class MaterialExtend {
this.commodityUnit = commodityUnit == null ? null : commodityUnit.trim();
}
public String getSku() {
return sku;
}
public void setSku(String sku) {
this.sku = sku == null ? null : sku.trim();
}
public BigDecimal getPurchaseDecimal() {
return purchaseDecimal;
}

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

@@ -366,6 +366,76 @@ public class MaterialExtendExample {
return (Criteria) this;
}
public Criteria andSkuIsNull() {
addCriterion("sku is null");
return (Criteria) this;
}
public Criteria andSkuIsNotNull() {
addCriterion("sku is not null");
return (Criteria) this;
}
public Criteria andSkuEqualTo(String value) {
addCriterion("sku =", value, "sku");
return (Criteria) this;
}
public Criteria andSkuNotEqualTo(String value) {
addCriterion("sku <>", value, "sku");
return (Criteria) this;
}
public Criteria andSkuGreaterThan(String value) {
addCriterion("sku >", value, "sku");
return (Criteria) this;
}
public Criteria andSkuGreaterThanOrEqualTo(String value) {
addCriterion("sku >=", value, "sku");
return (Criteria) this;
}
public Criteria andSkuLessThan(String value) {
addCriterion("sku <", value, "sku");
return (Criteria) this;
}
public Criteria andSkuLessThanOrEqualTo(String value) {
addCriterion("sku <=", value, "sku");
return (Criteria) this;
}
public Criteria andSkuLike(String value) {
addCriterion("sku like", value, "sku");
return (Criteria) this;
}
public Criteria andSkuNotLike(String value) {
addCriterion("sku not like", value, "sku");
return (Criteria) this;
}
public Criteria andSkuIn(List<String> values) {
addCriterion("sku in", values, "sku");
return (Criteria) this;
}
public Criteria andSkuNotIn(List<String> values) {
addCriterion("sku not in", values, "sku");
return (Criteria) this;
}
public Criteria andSkuBetween(String value1, String value2) {
addCriterion("sku between", value1, value2, "sku");
return (Criteria) this;
}
public Criteria andSkuNotBetween(String value1, String value2) {
addCriterion("sku not between", value1, value2, "sku");
return (Criteria) this;
}
public Criteria andPurchaseDecimalIsNull() {
addCriterion("purchase_decimal is null");
return (Criteria) this;

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

@@ -7,8 +7,6 @@ public class Organization {
private String orgNo;
private String orgFullName;
private String orgAbr;
private Long parentId;
@@ -41,14 +39,6 @@ public class Organization {
this.orgNo = orgNo == null ? null : orgNo.trim();
}
public String getOrgFullName() {
return orgFullName;
}
public void setOrgFullName(String orgFullName) {
this.orgFullName = orgFullName == null ? null : orgFullName.trim();
}
public String getOrgAbr() {
return orgAbr;
}

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

@@ -235,76 +235,6 @@ public class OrganizationExample {
return (Criteria) this;
}
public Criteria andOrgFullNameIsNull() {
addCriterion("org_full_name is null");
return (Criteria) this;
}
public Criteria andOrgFullNameIsNotNull() {
addCriterion("org_full_name is not null");
return (Criteria) this;
}
public Criteria andOrgFullNameEqualTo(String value) {
addCriterion("org_full_name =", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameNotEqualTo(String value) {
addCriterion("org_full_name <>", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameGreaterThan(String value) {
addCriterion("org_full_name >", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameGreaterThanOrEqualTo(String value) {
addCriterion("org_full_name >=", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameLessThan(String value) {
addCriterion("org_full_name <", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameLessThanOrEqualTo(String value) {
addCriterion("org_full_name <=", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameLike(String value) {
addCriterion("org_full_name like", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameNotLike(String value) {
addCriterion("org_full_name not like", value, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameIn(List<String> values) {
addCriterion("org_full_name in", values, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameNotIn(List<String> values) {
addCriterion("org_full_name not in", values, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameBetween(String value1, String value2) {
addCriterion("org_full_name between", value1, value2, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgFullNameNotBetween(String value1, String value2) {
addCriterion("org_full_name not between", value1, value2, "orgFullName");
return (Criteria) this;
}
public Criteria andOrgAbrIsNull() {
addCriterion("org_abr is null");
return (Criteria) this;

8
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -582,14 +582,6 @@ public class DepotHeadService {
String accountmoneylistStr = dh.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountMoneyList(accountmoneylistStr);
}
if(dh.getOtherMoneyList() != null) {
String otherMoneyListStr = dh.getOtherMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOtherMoneyList(otherMoneyListStr);
}
if(dh.getOtherMoneyItem() != null) {
String otherMoneyItemStr = dh.getOtherMoneyItem().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOtherMoneyItem(otherMoneyItemStr);
}
if(dh.getChangeAmount() != null) {
dh.setChangeAmount(dh.getChangeAmount().abs());
}

23
jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java
View File

@@ -17,7 +17,9 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class MaterialAttributeService {
@@ -56,9 +58,28 @@ public class MaterialAttributeService {
public List<MaterialAttribute> select(String attributeField, int offset, int rows)
throws Exception{
String[] arr = {"color","size","brand","other1","other2"};
Map<String, String> map = new HashMap<>();
map.put("color", "颜色");
map.put("size", "尺寸");
map.put("brand", "品牌");
map.put("other1", "自定义1");
map.put("other2", "自定义2");
List<MaterialAttribute> list = new ArrayList<>();
try{
list= materialAttributeMapperEx.selectByConditionMaterialAttribute(attributeField, offset, rows);
List<MaterialAttribute> maList = materialAttributeMapperEx.selectByConditionMaterialAttribute(attributeField, offset, rows);
for(String field: arr) {
MaterialAttribute materialAttribute = new MaterialAttribute();
materialAttribute.setAttributeField(field);
materialAttribute.setAttributeName(map.get(field));
for(MaterialAttribute ma: maList) {
if(field.equals(ma.getAttributeField())){
materialAttribute.setAttributeName(ma.getAttributeName());
materialAttribute.setAttributeValue(ma.getAttributeValue());
}
}
list.add(materialAttribute);
}
}catch(Exception e){
JshException.readFail(logger, e);
}

2
jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java
View File

@@ -63,6 +63,6 @@ public class OrganizationComponent implements ICommonQuery {
@Override
public int checkIsNameExist(Long id, String name)throws Exception {
return 0;
return organizationService.checkIsNameExist(id, name);
}
}

22
jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
View File

@@ -73,7 +73,7 @@ public class OrganizationService {
try{
result=organizationMapper.insertSelective(organization);
logService.insertLog("机构",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(organization.getOrgFullName()).toString(),request);
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(organization.getOrgAbr()).toString(),request);
}catch(Exception e){
JshException.writeFail(logger, e);
}
@@ -87,7 +87,7 @@ public class OrganizationService {
try{
result=organizationMapper.updateByPrimaryKeySelective(organization);
logService.insertLog("机构",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(organization.getOrgFullName()).toString(), request);
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(organization.getOrgAbr()).toString(), request);
}catch(Exception e){
JshException.writeFail(logger, e);
}
@@ -110,7 +110,7 @@ public class OrganizationService {
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
List<Organization> list = getOrganizationListByIds(ids);
for(Organization organization: list){
sb.append("[").append(organization.getOrgFullName()).append("]");
sb.append("[").append(organization.getOrgAbr()).append("]");
}
logService.insertLog("机构", sb.toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
@@ -126,10 +126,22 @@ public class OrganizationService {
return result;
}
public int checkIsNameExist(Long id, String name)throws Exception {
OrganizationExample example = new OrganizationExample();
example.createCriteria().andIdNotEqualTo(id).andOrgAbrEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Organization> list=null;
try{
list= organizationMapper.selectByExample(example);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list==null?0:list.size();
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int addOrganization(Organization org) throws Exception{
logService.insertLog("机构",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(org.getOrgFullName()).toString(),
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(org.getOrgAbr()).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
//新增时间
Date date=new Date();
@@ -160,7 +172,7 @@ public class OrganizationService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int editOrganization(Organization org)throws Exception {
logService.insertLog("机构",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(org.getOrgFullName()).toString(),
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(org.getOrgAbr()).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
//修改时间
org.setUpdateTime(new Date());