From 07025a388193b25bab6ca2c9f9bfa5b9fe9d92d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 9 Jul 2021 00:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=87=91=E9=A2=9D=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/jsh/erp/controller/DepotHeadController.java | 4 ++--
.../erp/service/accountHead/AccountHeadService.java | 12 +++---------
.../jsh/erp/service/depotHead/DepotHeadService.java | 10 ++--------
.../jsh/erp/service/supplier/SupplierService.java | 10 ++++------
.../main/resources/mapper_xml/DepotItemMapperEx.xml | 8 ++++----
5 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 9766b628..334d524d 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -211,9 +211,9 @@ public class DepotHeadController {
beginNeed = supplier.getBeginNeedPay();
}
BigDecimal firstMoney = depotHeadService.findTotalPay(organId, beginTime, supType)
- .add(accountHeadService.findTotalPay(organId, beginTime, supType)).add(beginNeed);
+ .subtract(accountHeadService.findTotalPay(organId, beginTime, supType)).add(beginNeed);
BigDecimal lastMoney = depotHeadService.findTotalPay(organId, endTime, supType)
- .add(accountHeadService.findTotalPay(organId, endTime, supType)).add(beginNeed);
+ .subtract(accountHeadService.findTotalPay(organId, endTime, supType)).add(beginNeed);
map.put("firstMoney", firstMoney); //期初
map.put("lastMoney", lastMoney); //期末
}
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
index e29ddc22..ff365096 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
@@ -313,7 +313,7 @@ public class AccountHeadService {
}
/**
- * 查询单位的累计应收和累计应付，收预付款不计入此处
+ * 查询往来单位的累计应收和累计应付，只计入收款或付款
* @param supplierId
* @param endTime
* @param supType
@@ -322,17 +322,11 @@ public class AccountHeadService {
public BigDecimal findTotalPay(Integer supplierId, String endTime, String supType) {
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
- int i = 1;
if (("客户").equals(supType)) { //客户
- i = 1;
+ sum = allMoney(getS, "收款", "合计",endTime);
} else if (("供应商").equals(supType)) { //供应商
- i = -1;
+ sum = allMoney(getS, "付款", "合计",endTime);
}
- //收付款部分
- sum = sum.subtract((allMoney(getS, "收款", "合计",endTime)).multiply(new BigDecimal(i)));
- sum = sum.add((allMoney(getS, "付款", "合计",endTime)).multiply(new BigDecimal(i)));
- sum = sum.add((allMoney(getS, "收入", "合计",endTime).subtract(allMoney(getS, "收入", "实际",endTime))).multiply(new BigDecimal(i)));
- sum = sum.subtract((allMoney(getS, "支出", "合计",endTime).subtract(allMoney(getS, "支出", "实际",endTime))).multiply(new BigDecimal(i)));
return sum;
}
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 c09d28ad..3bbdefc5 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
@@ -551,17 +551,11 @@ public class DepotHeadService {
public BigDecimal findTotalPay(Integer supplierId, String endTime, String supType) {
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
- int i = 1;
if (("客户").equals(supType)) { //客户
- i = 1;
+ sum = allMoney(getS, "出库", "销售", "合计",endTime).subtract(allMoney(getS, "出库", "销售", "实际",endTime));
} else if (("供应商").equals(supType)) { //供应商
- i = -1;
+ sum = allMoney(getS, "入库", "采购", "合计",endTime).subtract(allMoney(getS, "入库", "采购", "实际",endTime));
}
- //进销部分
- sum = sum.subtract((allMoney(getS, "入库", "采购", "合计",endTime).subtract(allMoney(getS, "入库", "采购", "实际",endTime))).multiply(new BigDecimal(i)));
- sum = sum.subtract((allMoney(getS, "入库", "销售退货", "合计",endTime).subtract(allMoney(getS, "入库", "销售退货", "实际",endTime))).multiply(new BigDecimal(i)));
- sum = sum.add((allMoney(getS, "出库", "销售", "合计",endTime).subtract(allMoney(getS, "出库", "销售", "实际",endTime))).multiply(new BigDecimal(i)));
- sum = sum.add((allMoney(getS, "出库", "采购退货", "合计",endTime).subtract(allMoney(getS, "出库", "采购退货", "实际",endTime))).multiply(new BigDecimal(i)));
return sum;
}
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
index 16343dd6..1085eca1 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
@@ -105,15 +105,13 @@ public class SupplierService {
if(beginNeedPay==null) {
beginNeedPay = BigDecimal.ZERO;
}
- sum = sum.add(depotHeadService.findTotalPay(supplierId, endTime, supType));
- sum = sum.add(accountHeadService.findTotalPay(supplierId, endTime, supType));
+ sum = sum.add(depotHeadService.findTotalPay(supplierId, endTime, supType))
+ .subtract(accountHeadService.findTotalPay(supplierId, endTime, supType));
if(("客户").equals(s.getType())) {
- sum = sum.add(beginNeedGet).subtract(beginNeedPay);
+ sum = sum.add(beginNeedGet);
s.setAllNeedGet(sum);
- s.setAllNeedPay(BigDecimal.ZERO);
} else if(("供应商").equals(s.getType())) {
- sum = sum.add(beginNeedPay).subtract(beginNeedGet);
- s.setAllNeedGet(BigDecimal.ZERO);
+ sum = sum.add(beginNeedPay);
s.setAllNeedPay(sum);
}
resList.add(s);
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 1722079e..7891f202 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -187,8 +187,8 @@
and dh.oper_time <= #{endTime}
and ifnull(m.delete_flag,'0') !='1'
- group by m.id,m.name, m.model, m.unit, m.color, u.name
- order by m.name, m.model asc
+ group by m.id
+ order by m.id desc
limit #{offset},#{rows}
@@ -265,12 +265,12 @@