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

解决出入库汇总报错的bug

Browse Source
This commit is contained in:
季圣华
2021-06-02 23:31:45 +08:00
parent f7dae8b681
commit c25b6dd41e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@ public class AccountHeadController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
endTime = endTime + " 23:59:59";
BigDecimal sum = accountHeadService.findTotalPay(supplierId, endTime, supType); BigDecimal sum = accountHeadService.findTotalPay(supplierId, endTime, supType);
outer.put("getAllMoney", sum); outer.put("getAllMoney", sum);
map.put("rows", outer); map.put("rows", outer);

5
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -143,6 +143,8 @@ public class DepotHeadController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
List<DepotHeadVo4InOutMCount> resList = new ArrayList<>(); List<DepotHeadVo4InOutMCount> resList = new ArrayList<>();
beginTime = beginTime + " 00:00:00";
endTime = endTime + " 23:59:59";
List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, materialParam, depotId, oId, (currentPage-1)*pageSize, pageSize); List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, materialParam, depotId, oId, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, materialParam, depotId, oId); int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, materialParam, depotId, oId);
map.put("total", total); map.put("total", total);
@@ -191,6 +193,8 @@ public class DepotHeadController {
} else if (supType.equals("供应商")) { //供应商 } else if (supType.equals("供应商")) { //供应商
j = -1; j = -1;
} }
beginTime = beginTime + " 00:00:00";
endTime = endTime + " 23:59:59";
List<DepotHeadVo4StatementAccount> resList = new ArrayList<DepotHeadVo4StatementAccount>(); List<DepotHeadVo4StatementAccount> resList = new ArrayList<DepotHeadVo4StatementAccount>();
List<DepotHeadVo4StatementAccount> list = depotHeadService.findStatementAccount(beginTime, endTime, organId, supType, (currentPage-1)*pageSize, pageSize); List<DepotHeadVo4StatementAccount> list = depotHeadService.findStatementAccount(beginTime, endTime, organId, supType, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findStatementAccountCount(beginTime, endTime, organId, supType); int total = depotHeadService.findStatementAccountCount(beginTime, endTime, organId, supType);
@@ -273,6 +277,7 @@ public class DepotHeadController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
endTime = endTime + " 23:59:59";
BigDecimal sum = depotHeadService.findTotalPay(supplierId, endTime, supType); BigDecimal sum = depotHeadService.findTotalPay(supplierId, endTime, supType);
outer.put("getAllMoney", sum); outer.put("getAllMoney", sum);
map.put("rows", outer); map.put("rows", outer);