From 40155c27528e15e7e933e6cbc39b37a818786aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 6 Jan 2019 15:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E7=BB=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotItemController.java | 66 ++++++++----------- .../entities/DepotItemVo4WithInfoEx.java | 10 +++ .../mapper_xml/DepotItemMapperEx.xml | 26 +++++--- 3 files changed, 56 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index c8980c7b..41a7bdcf 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -580,14 +580,12 @@ public class DepotItemController { if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); - Double prevSum = sumNumber("入库", pid, diEx.getMaterialid(), monthTime, true) - sumNumber("出库", pid, diEx.getMaterialid(), monthTime, true); - Double InSum = sumNumber("入库", pid, diEx.getMaterialid(), monthTime, false); - Double OutSum = sumNumber("出库", pid, diEx.getMaterialid(), monthTime, false); - Double prevPrice = sumPrice("入库", pid, diEx.getMaterialid(), monthTime, true) - sumPrice("出库", pid, diEx.getMaterialid(), monthTime, true); - Double InPrice = sumPrice("入库", pid, diEx.getMaterialid(), monthTime, false); - Double OutPrice = sumPrice("出库", pid, diEx.getMaterialid(), monthTime, false); - item.put("Id", diEx.getId()); - item.put("MaterialId", diEx.getMaterialid()); + Double prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true) - sumNumber("出库", pid, diEx.getMId(), monthTime, true); + Double InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false); + Double OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false); + Double prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true) - sumPrice("出库", pid, diEx.getMId(), monthTime, true); + Double InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false); + Double OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false); item.put("MaterialName", diEx.getMName()); item.put("MaterialModel", diEx.getMColor()); //扩展信息 @@ -641,9 +639,9 @@ public class DepotItemController { Double thisAllPrice = 0.0; if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { - Double prevPrice = sumPrice("入库", pid, diEx.getMaterialid(), monthTime, true) - sumPrice("出库", pid, diEx.getMaterialid(), monthTime, true); - Double InPrice = sumPrice("入库", pid, diEx.getMaterialid(), monthTime, false); - Double OutPrice = sumPrice("出库", pid, diEx.getMaterialid(), monthTime, false); + Double prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true) - sumPrice("出库", pid, diEx.getMId(), monthTime, true); + Double InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false); + Double OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false); thisAllPrice = thisAllPrice + (prevPrice + InPrice - OutPrice); } } @@ -689,12 +687,10 @@ public class DepotItemController { if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); - Double InSum = sumNumberBuyOrSale("入库", "采购", diEx.getMaterialid(), monthTime); - Double OutSum = sumNumberBuyOrSale("出库", "采购退货", diEx.getMaterialid(), monthTime); - Double InSumPrice = sumPriceBuyOrSale("入库", "采购", diEx.getMaterialid(), monthTime); - Double OutSumPrice = sumPriceBuyOrSale("出库", "采购退货", diEx.getMaterialid(), monthTime); - item.put("Id", diEx.getId()); - item.put("MaterialId", diEx.getMaterialid()); + Double InSum = sumNumberBuyOrSale("入库", "采购", diEx.getMId(), monthTime); + Double OutSum = sumNumberBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime); + Double InSumPrice = sumPriceBuyOrSale("入库", "采购", diEx.getMId(), monthTime); + Double OutSumPrice = sumPriceBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime); item.put("MaterialName", diEx.getMName()); item.put("MaterialModel", diEx.getMModel()); //扩展信息 @@ -751,16 +747,14 @@ public class DepotItemController { if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); - Double OutSumRetail = sumNumberBuyOrSale("出库", "零售", diEx.getMaterialid(), monthTime); - Double OutSum = sumNumberBuyOrSale("出库", "销售", diEx.getMaterialid(), monthTime); - Double InSumRetail = sumNumberBuyOrSale("入库", "零售退货", diEx.getMaterialid(), monthTime); - Double InSum = sumNumberBuyOrSale("入库", "销售退货", diEx.getMaterialid(), monthTime); - Double OutSumRetailPrice = sumPriceBuyOrSale("出库", "零售", diEx.getMaterialid(), monthTime); - Double OutSumPrice = sumPriceBuyOrSale("出库", "销售", diEx.getMaterialid(), monthTime); - Double InSumRetailPrice = sumPriceBuyOrSale("入库", "零售退货", diEx.getMaterialid(), monthTime); - Double InSumPrice = sumPriceBuyOrSale("入库", "销售退货", diEx.getMaterialid(), monthTime); - item.put("Id", diEx.getId()); - item.put("MaterialId", diEx.getMaterialid()); + Double OutSumRetail = sumNumberBuyOrSale("出库", "零售", diEx.getMId(), monthTime); + Double OutSum = sumNumberBuyOrSale("出库", "销售", diEx.getMId(), monthTime); + Double InSumRetail = sumNumberBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime); + Double InSum = sumNumberBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime); + Double OutSumRetailPrice = sumPriceBuyOrSale("出库", "零售", diEx.getMId(), monthTime); + Double OutSumPrice = sumPriceBuyOrSale("出库", "销售", diEx.getMId(), monthTime); + Double InSumRetailPrice = sumPriceBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime); + Double InSumPrice = sumPriceBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime); item.put("MaterialName", diEx.getMName()); item.put("MaterialModel", diEx.getMModel()); //扩展信息 @@ -817,10 +811,8 @@ public class DepotItemController { if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); - Double InSum = sumNumberGift("礼品充值", pid, diEx.getMaterialid(), "in"); - Double OutSum = sumNumberGift("礼品销售", pid, diEx.getMaterialid(), "out"); - item.put("Id", diEx.getId()); - item.put("MaterialId", diEx.getMaterialid()); + Double InSum = sumNumberGift("礼品充值", pid, diEx.getMId(), "in"); + Double OutSum = sumNumberGift("礼品销售", pid, diEx.getMId(), "out"); item.put("MaterialName", diEx.getMName()); item.put("MaterialModel", diEx.getMModel()); //扩展信息 @@ -876,12 +868,12 @@ public class DepotItemController { if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { String[] objs = new String[9]; - Double prevSum = sumNumber("入库", pid, diEx.getMaterialid(), monthTime, true) - sumNumber("出库", pid, diEx.getMaterialid(), monthTime, true); - Double InSum = sumNumber("入库", pid, diEx.getMaterialid(), monthTime, false); - Double OutSum = sumNumber("出库", pid, diEx.getMaterialid(), monthTime, false); - Double prevPrice = sumPrice("入库", pid, diEx.getMaterialid(), monthTime, true) - sumPrice("出库", pid, diEx.getMaterialid(), monthTime, true); - Double InPrice = sumPrice("入库", pid, diEx.getMaterialid(), monthTime, false); - Double OutPrice = sumPrice("出库", pid, diEx.getMaterialid(), monthTime, false); + Double prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true) - sumNumber("出库", pid, diEx.getMId(), monthTime, true); + Double InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false); + Double OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false); + Double prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true) - sumPrice("出库", pid, diEx.getMId(), monthTime, true); + Double InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false); + Double OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false); Double unitPrice = 0.0; if (prevSum + InSum - OutSum != 0.0) { unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum); diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java index 697dd3e1..b0b88dd2 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java @@ -48,6 +48,8 @@ public class DepotItemVo4WithInfoEx { private String mtype; + private Long MId; + private String MName; private String MModel; @@ -258,6 +260,14 @@ public class DepotItemVo4WithInfoEx { this.mtype = mtype; } + public Long getMId() { + return MId; + } + + public void setMId(Long MId) { + this.MId = MId; + } + public String getMName() { return MName; } diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 09c51cc1..604bf51c 100644 --- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -33,6 +33,14 @@ + + + + + + + + - + select m.id MId, m.Name MName, m.Model MModel, m.Unit MaterialUnit, m.Color MColor from jsh_depotitem di inner join jsh_material m on di.MaterialId=m.id where 1=1 - and HeaderId in (${headIds}) + and di.HeaderId in (${headIds}) - and MaterialId in (${materialIds}) + and di.MaterialId in (${materialIds}) - group by MaterialId + group by m.id,m.Name, m.Model, m.Unit, m.Color limit #{offset},#{rows}