From dd73a0d1e1b044b150a725dfcdfcb156d168baa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 22 Jul 2021 22:58:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8D=95=E6=8D=AE=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotItemController.java | 1 - .../controller/OrganizationController.java | 1 - .../erp/datasource/entities/DepotHead.java | 40 -- .../datasource/entities/DepotHeadExample.java | 260 ---------- .../erp/datasource/entities/DepotItem.java | 70 --- .../datasource/entities/DepotItemExample.java | 480 ------------------ .../datasource/entities/MaterialExtend.java | 10 + .../entities/MaterialExtendExample.java | 70 +++ .../erp/datasource/entities/Organization.java | 10 - .../entities/OrganizationExample.java | 70 --- .../service/depotHead/DepotHeadService.java | 8 - .../MaterialAttributeService.java | 23 +- .../organization/OrganizationComponent.java | 2 +- .../organization/OrganizationService.java | 22 +- .../resources/mapper_xml/DepotHeadMapper.xml | 103 +--- .../resources/mapper_xml/DepotItemMapper.xml | 130 +---- .../mapper_xml/MaterialExtendMapper.xml | 41 +- .../mapper_xml/OrganizationMapper.xml | 35 +- .../mapper_xml/OrganizationMapperEx.xml | 9 +- 19 files changed, 191 insertions(+), 1194 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index a65517ae..5edbb22c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -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()); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java index 42153604..8da8f630 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java @@ -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 dataParentList = organizationService.findByParentId(org.getParentId()); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java index c48e703e..94212251 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java index 0309a3f6..05b3322c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java @@ -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 values) { - addCriterion("hands_person_id in", values, "handsPersonId"); - return (Criteria) this; - } - - public Criteria andHandsPersonIdNotIn(List 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 values) { - addCriterion("other_money_list in", values, "otherMoneyList"); - return (Criteria) this; - } - - public Criteria andOtherMoneyListNotIn(List 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 values) { - addCriterion("other_money_item in", values, "otherMoneyItem"); - return (Criteria) this; - } - - public Criteria andOtherMoneyItemNotIn(List 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 values) { - addCriterion("account_day in", values, "accountDay"); - return (Criteria) this; - } - - public Criteria andAccountDayNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java index 21a98617..368c923d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java index b5a3eac8..9afc1541 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java @@ -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 values) { - addCriterion("img in", values, "img"); - return (Criteria) this; - } - - public Criteria andImgNotIn(List 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 values) { - addCriterion("incidentals in", values, "incidentals"); - return (Criteria) this; - } - - public Criteria andIncidentalsNotIn(List 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 values) { - addCriterion("other_field1 in", values, "otherField1"); - return (Criteria) this; - } - - public Criteria andOtherField1NotIn(List 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 values) { - addCriterion("other_field2 in", values, "otherField2"); - return (Criteria) this; - } - - public Criteria andOtherField2NotIn(List 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 values) { - addCriterion("other_field3 in", values, "otherField3"); - return (Criteria) this; - } - - public Criteria andOtherField3NotIn(List 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 values) { - addCriterion("other_field4 in", values, "otherField4"); - return (Criteria) this; - } - - public Criteria andOtherField4NotIn(List 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 values) { - addCriterion("other_field5 in", values, "otherField5"); - return (Criteria) this; - } - - public Criteria andOtherField5NotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtend.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtend.java index 51c35cbf..ca13b0c9 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtend.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtend.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtendExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtendExample.java index a1a9b4a8..107621ee 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtendExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExtendExample.java @@ -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 values) { + addCriterion("sku in", values, "sku"); + return (Criteria) this; + } + + public Criteria andSkuNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Organization.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Organization.java index b48824cf..a875e4a4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Organization.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Organization.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java index db6e97ad..8df0b5b5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java @@ -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 values) { - addCriterion("org_full_name in", values, "orgFullName"); - return (Criteria) this; - } - - public Criteria andOrgFullNameNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index a3c389ff..3904fd89 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -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()); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java index 971d0990..7fcb755d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java @@ -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 select(String attributeField, int offset, int rows) throws Exception{ + String[] arr = {"color","size","brand","other1","other2"}; + Map map = new HashMap<>(); + map.put("color", "颜色"); + map.put("size", "尺寸"); + map.put("brand", "品牌"); + map.put("other1", "自定义1"); + map.put("other2", "自定义2"); List list = new ArrayList<>(); try{ - list= materialAttributeMapperEx.selectByConditionMaterialAttribute(attributeField, offset, rows); + List 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); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java index 51e69af1..57681316 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java @@ -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); } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java index 70c50f68..549a8307 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java @@ -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 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 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()); diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml index 32bc8d34..b851a258 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml @@ -10,7 +10,6 @@ - @@ -26,9 +25,6 @@ - - - @@ -93,11 +89,10 @@ - id, type, sub_type, default_number, number, create_time, oper_time, organ_id, hands_person_id, - creator, account_id, change_amount, total_price, pay_type, bill_type, remark, file_name, - sales_man, account_id_list, account_money_list, discount, discount_money, discount_last_money, - other_money, other_money_list, other_money_item, account_day, status, link_number, - tenant_id, delete_flag + id, type, sub_type, default_number, number, create_time, oper_time, organ_id, creator, + account_id, change_amount, total_price, pay_type, bill_type, remark, file_name, sales_man, + account_id_list, account_money_list, discount, discount_money, discount_last_money, + other_money, status, link_number, tenant_id, delete_flag select @@ -127,21 +119,17 @@ insert into jsh_depot_item (id, header_id, material_id, material_extend_id, material_unit, oper_number, basic_number, unit_price, tax_unit_price, - all_price, remark, img, - incidentals, depot_id, another_depot_id, - tax_rate, tax_money, tax_last_money, - other_field1, other_field2, other_field3, - other_field4, other_field5, material_type, - tenant_id, delete_flag) + all_price, remark, depot_id, + another_depot_id, tax_rate, tax_money, + tax_last_money, material_type, tenant_id, + delete_flag) values (#{id,jdbcType=BIGINT}, #{headerId,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, #{materialExtendId,jdbcType=BIGINT}, #{materialUnit,jdbcType=VARCHAR}, #{operNumber,jdbcType=DECIMAL}, #{basicNumber,jdbcType=DECIMAL}, #{unitPrice,jdbcType=DECIMAL}, #{taxUnitPrice,jdbcType=DECIMAL}, - #{allPrice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, - #{incidentals,jdbcType=DECIMAL}, #{depotId,jdbcType=BIGINT}, #{anotherDepotId,jdbcType=BIGINT}, - #{taxRate,jdbcType=DECIMAL}, #{taxMoney,jdbcType=DECIMAL}, #{taxLastMoney,jdbcType=DECIMAL}, - #{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR}, - #{otherField4,jdbcType=VARCHAR}, #{otherField5,jdbcType=VARCHAR}, #{materialType,jdbcType=VARCHAR}, - #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) + #{allPrice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{depotId,jdbcType=BIGINT}, + #{anotherDepotId,jdbcType=BIGINT}, #{taxRate,jdbcType=DECIMAL}, #{taxMoney,jdbcType=DECIMAL}, + #{taxLastMoney,jdbcType=DECIMAL}, #{materialType,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, + #{deleteFlag,jdbcType=VARCHAR}) insert into jsh_depot_item @@ -179,12 +167,6 @@ remark, - - img, - - - incidentals, - depot_id, @@ -200,21 +182,6 @@ tax_last_money, - - other_field1, - - - other_field2, - - - other_field3, - - - other_field4, - - - other_field5, - material_type, @@ -259,12 +226,6 @@ #{remark,jdbcType=VARCHAR}, - - #{img,jdbcType=VARCHAR}, - - - #{incidentals,jdbcType=DECIMAL}, - #{depotId,jdbcType=BIGINT}, @@ -280,21 +241,6 @@ #{taxLastMoney,jdbcType=DECIMAL}, - - #{otherField1,jdbcType=VARCHAR}, - - - #{otherField2,jdbcType=VARCHAR}, - - - #{otherField3,jdbcType=VARCHAR}, - - - #{otherField4,jdbcType=VARCHAR}, - - - #{otherField5,jdbcType=VARCHAR}, - #{materialType,jdbcType=VARCHAR}, @@ -348,12 +294,6 @@ remark = #{record.remark,jdbcType=VARCHAR}, - - img = #{record.img,jdbcType=VARCHAR}, - - - incidentals = #{record.incidentals,jdbcType=DECIMAL}, - depot_id = #{record.depotId,jdbcType=BIGINT}, @@ -369,21 +309,6 @@ tax_last_money = #{record.taxLastMoney,jdbcType=DECIMAL}, - - other_field1 = #{record.otherField1,jdbcType=VARCHAR}, - - - other_field2 = #{record.otherField2,jdbcType=VARCHAR}, - - - other_field3 = #{record.otherField3,jdbcType=VARCHAR}, - - - other_field4 = #{record.otherField4,jdbcType=VARCHAR}, - - - other_field5 = #{record.otherField5,jdbcType=VARCHAR}, - material_type = #{record.materialType,jdbcType=VARCHAR}, @@ -411,18 +336,11 @@ tax_unit_price = #{record.taxUnitPrice,jdbcType=DECIMAL}, all_price = #{record.allPrice,jdbcType=DECIMAL}, remark = #{record.remark,jdbcType=VARCHAR}, - img = #{record.img,jdbcType=VARCHAR}, - incidentals = #{record.incidentals,jdbcType=DECIMAL}, depot_id = #{record.depotId,jdbcType=BIGINT}, another_depot_id = #{record.anotherDepotId,jdbcType=BIGINT}, tax_rate = #{record.taxRate,jdbcType=DECIMAL}, tax_money = #{record.taxMoney,jdbcType=DECIMAL}, tax_last_money = #{record.taxLastMoney,jdbcType=DECIMAL}, - other_field1 = #{record.otherField1,jdbcType=VARCHAR}, - other_field2 = #{record.otherField2,jdbcType=VARCHAR}, - other_field3 = #{record.otherField3,jdbcType=VARCHAR}, - other_field4 = #{record.otherField4,jdbcType=VARCHAR}, - other_field5 = #{record.otherField5,jdbcType=VARCHAR}, material_type = #{record.materialType,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} @@ -463,12 +381,6 @@ remark = #{remark,jdbcType=VARCHAR}, - - img = #{img,jdbcType=VARCHAR}, - - - incidentals = #{incidentals,jdbcType=DECIMAL}, - depot_id = #{depotId,jdbcType=BIGINT}, @@ -484,21 +396,6 @@ tax_last_money = #{taxLastMoney,jdbcType=DECIMAL}, - - other_field1 = #{otherField1,jdbcType=VARCHAR}, - - - other_field2 = #{otherField2,jdbcType=VARCHAR}, - - - other_field3 = #{otherField3,jdbcType=VARCHAR}, - - - other_field4 = #{otherField4,jdbcType=VARCHAR}, - - - other_field5 = #{otherField5,jdbcType=VARCHAR}, - material_type = #{materialType,jdbcType=VARCHAR}, @@ -523,18 +420,11 @@ tax_unit_price = #{taxUnitPrice,jdbcType=DECIMAL}, all_price = #{allPrice,jdbcType=DECIMAL}, remark = #{remark,jdbcType=VARCHAR}, - img = #{img,jdbcType=VARCHAR}, - incidentals = #{incidentals,jdbcType=DECIMAL}, depot_id = #{depotId,jdbcType=BIGINT}, another_depot_id = #{anotherDepotId,jdbcType=BIGINT}, tax_rate = #{taxRate,jdbcType=DECIMAL}, tax_money = #{taxMoney,jdbcType=DECIMAL}, tax_last_money = #{taxLastMoney,jdbcType=DECIMAL}, - other_field1 = #{otherField1,jdbcType=VARCHAR}, - other_field2 = #{otherField2,jdbcType=VARCHAR}, - other_field3 = #{otherField3,jdbcType=VARCHAR}, - other_field4 = #{otherField4,jdbcType=VARCHAR}, - other_field5 = #{otherField5,jdbcType=VARCHAR}, material_type = #{materialType,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, delete_flag = #{deleteFlag,jdbcType=VARCHAR} diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapper.xml index a90f29ef..0ebe989f 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapper.xml @@ -6,6 +6,7 @@ + @@ -77,9 +78,9 @@ - id, material_id, bar_code, commodity_unit, purchase_decimal, commodity_decimal, wholesale_decimal, - low_decimal, default_flag, create_time, create_serial, update_serial, update_time, - tenant_id, delete_Flag + id, material_id, bar_code, commodity_unit, sku, purchase_decimal, commodity_decimal, + wholesale_decimal, low_decimal, default_flag, create_time, create_serial, update_serial, + update_time, tenant_id, delete_Flag select @@ -107,14 +106,14 @@ - insert into jsh_organization (id, org_no, org_full_name, - org_abr, parent_id, sort, - remark, create_time, update_time, - tenant_id, delete_flag) - values (#{id,jdbcType=BIGINT}, #{orgNo,jdbcType=VARCHAR}, #{orgFullName,jdbcType=VARCHAR}, - #{orgAbr,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, - #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) + insert into jsh_organization (id, org_no, org_abr, + parent_id, sort, remark, + create_time, update_time, tenant_id, + delete_flag) + values (#{id,jdbcType=BIGINT}, #{orgNo,jdbcType=VARCHAR}, #{orgAbr,jdbcType=VARCHAR}, + #{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{tenantId,jdbcType=BIGINT}, + #{deleteFlag,jdbcType=VARCHAR}) insert into jsh_organization @@ -125,9 +124,6 @@ org_no, - - org_full_name, - org_abr, @@ -160,9 +156,6 @@ #{orgNo,jdbcType=VARCHAR}, - - #{orgFullName,jdbcType=VARCHAR}, - #{orgAbr,jdbcType=VARCHAR}, @@ -204,9 +197,6 @@ org_no = #{record.orgNo,jdbcType=VARCHAR}, - - org_full_name = #{record.orgFullName,jdbcType=VARCHAR}, - org_abr = #{record.orgAbr,jdbcType=VARCHAR}, @@ -240,7 +230,6 @@ update jsh_organization set id = #{record.id,jdbcType=BIGINT}, org_no = #{record.orgNo,jdbcType=VARCHAR}, - org_full_name = #{record.orgFullName,jdbcType=VARCHAR}, org_abr = #{record.orgAbr,jdbcType=VARCHAR}, parent_id = #{record.parentId,jdbcType=BIGINT}, sort = #{record.sort,jdbcType=VARCHAR}, @@ -259,9 +248,6 @@ org_no = #{orgNo,jdbcType=VARCHAR}, - - org_full_name = #{orgFullName,jdbcType=VARCHAR}, - org_abr = #{orgAbr,jdbcType=VARCHAR}, @@ -292,7 +278,6 @@ update jsh_organization set org_no = #{orgNo,jdbcType=VARCHAR}, - org_full_name = #{orgFullName,jdbcType=VARCHAR}, org_abr = #{orgAbr,jdbcType=VARCHAR}, parent_id = #{parentId,jdbcType=BIGINT}, sort = #{sort,jdbcType=VARCHAR}, diff --git a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml index 36841de3..6f011a3f 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml @@ -52,13 +52,11 @@ insert into jsh_organization - (org_no, org_full_name, - org_abr, delete_flag, + (org_no, org_abr, delete_flag, parent_id, sort, remark, create_time, update_time) values - (#{orgNo,jdbcType=VARCHAR}, #{orgFullName,jdbcType=VARCHAR}, - #{orgAbr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=CHAR}, + (#{orgNo,jdbcType=VARCHAR}, #{orgAbr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=CHAR}, #{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) @@ -74,8 +72,7 @@ update jsh_organization set update_time=#{updateTime}, - org_no = #{orgNo},org_full_name = #{orgFullName}, - org_abr = #{orgAbr}, + org_no = #{orgNo},org_abr = #{orgAbr}, delete_flag = #{deleteFlag},parent_id = #{parentId}, sort = #{sort},remark = #{remark} where id =#{id}