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 aa61932f..9508a7c3 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 @@ -183,6 +183,7 @@ public class DepotItemController { BigDecimal totalAllPrice = BigDecimal.ZERO; BigDecimal totalTaxMoney = BigDecimal.ZERO; BigDecimal totalTaxLastMoney = BigDecimal.ZERO; + BigDecimal totalWeight = BigDecimal.ZERO; for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); item.put("id", diEx.getId()); @@ -226,6 +227,8 @@ public class DepotItemController { item.put("taxMoney", diEx.getTaxMoney()); item.put("taxLastMoney", diEx.getTaxLastMoney()); } + BigDecimal allWeight = diEx.getBasicNumber()==null||diEx.getWeight()==null?BigDecimal.ZERO:diEx.getBasicNumber().multiply(diEx.getWeight()); + item.put("weight", allWeight); item.put("remark", diEx.getRemark()); item.put("linkId", diEx.getLinkId()); item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId()); @@ -240,6 +243,7 @@ public class DepotItemController { totalAllPrice = totalAllPrice.add(diEx.getAllPrice()==null?BigDecimal.ZERO:diEx.getAllPrice()); totalTaxMoney = totalTaxMoney.add(diEx.getTaxMoney()==null?BigDecimal.ZERO:diEx.getTaxMoney()); totalTaxLastMoney = totalTaxLastMoney.add(diEx.getTaxLastMoney()==null?BigDecimal.ZERO:diEx.getTaxLastMoney()); + totalWeight = totalWeight.add(allWeight); } if(StringUtil.isNotEmpty(isReadOnly) && "1".equals(isReadOnly)) { JSONObject footItem = new JSONObject(); @@ -247,6 +251,7 @@ public class DepotItemController { footItem.put("allPrice", totalAllPrice); footItem.put("taxMoney", totalTaxMoney); footItem.put("taxLastMoney", totalTaxLastMoney); + footItem.put("weight", totalWeight); dataArray.add(footItem); } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java index 37ff5cb6..70a8ca37 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java @@ -48,6 +48,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{ private String barCode; + private BigDecimal weight; + public Long getMId() { return MId; } @@ -223,4 +225,12 @@ public class DepotItemVo4WithInfoEx extends DepotItem{ public void setBarCode(String barCode) { this.barCode = barCode; } + + public BigDecimal getWeight() { + return weight; + } + + public void setWeight(BigDecimal weight) { + this.weight = weight; + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 89c6b7a3..eb4f4e02 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -25,6 +25,7 @@ + @@ -234,7 +235,7 @@