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

去掉注释

Browse Source
This commit is contained in:
季圣华
2019-03-06 20:10:38 +08:00
parent 5892199127
commit b869d3b2a5
5 changed files with 0 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/jsh/erp/controller/AccountHeadController.java
View File

@@ -79,13 +79,9 @@ public class AccountHeadController {
i = -1;
}
//收付款部分
// sum = sum + (allMoney(getS, "付款", "合计",endTime) + allMoney(getS, "付款", "实际",endTime)) * i;
sum = sum.add((allMoney(getS, "付款", "合计",endTime).add(allMoney(getS, "付款", "实际",endTime))).multiply(new BigDecimal(i)));
// sum = sum - (allMoney(getS, "收款", "合计",endTime) + allMoney(getS, "收款", "实际",endTime)) * i;
sum = sum.subtract((allMoney(getS, "收款", "合计",endTime).add(allMoney(getS, "收款", "实际",endTime))).multiply(new BigDecimal(i)));
// sum = sum + (allMoney(getS, "收入", "合计",endTime) - allMoney(getS, "收入", "实际",endTime)) * i;
sum = sum.add((allMoney(getS, "收入", "合计",endTime).subtract(allMoney(getS, "收入", "实际",endTime))).multiply(new BigDecimal(i)));
// sum = sum - (allMoney(getS, "支出", "合计",endTime) - allMoney(getS, "支出", "实际",endTime)) * i;
sum = sum.subtract((allMoney(getS, "支出", "合计",endTime).subtract(allMoney(getS, "支出", "实际",endTime))).multiply(new BigDecimal(i)));
outer.put("getAllMoney", sum);
map.put("rows", outer);

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

@@ -81,7 +81,6 @@ public class DepotHeadController {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
// String number = depotHeadService.buildNumber(type, subType, beginTime, endTime);
String number = depotHeadService.buildOnlyNumber();
map.put("DefaultNumber", number);
res.code = 200;
@@ -359,13 +358,9 @@ public class DepotHeadController {
i = -1;
}
//进销部分
// sum = sum - (allMoney(getS, "入库", "采购", "合计",endTime) - allMoney(getS, "入库", "采购", "实际",endTime)) * i;
sum = sum.subtract((allMoney(getS, "入库", "采购", "合计",endTime).subtract(allMoney(getS, "入库", "采购", "实际",endTime))).multiply(new BigDecimal(i)));
// sum = sum - (allMoney(getS, "入库", "销售退货", "合计",endTime) - allMoney(getS, "入库", "销售退货", "实际",endTime)) * i;
sum = sum.subtract((allMoney(getS, "入库", "销售退货", "合计",endTime).subtract(allMoney(getS, "入库", "销售退货", "实际",endTime))).multiply(new BigDecimal(i)));
// sum = sum + (allMoney(getS, "出库", "销售", "合计",endTime) - allMoney(getS, "出库", "销售", "实际",endTime)) * i;
sum = sum.add((allMoney(getS, "出库", "销售", "合计",endTime).subtract(allMoney(getS, "出库", "销售", "实际",endTime))).multiply(new BigDecimal(i)));
// sum = sum + (allMoney(getS, "出库", "采购退货", "合计",endTime) - allMoney(getS, "出库", "采购退货", "实际",endTime)) * i;
sum = sum.add((allMoney(getS, "出库", "采购退货", "合计",endTime).subtract(allMoney(getS, "出库", "采购退货", "实际",endTime))).multiply(new BigDecimal(i)));
outer.put("getAllMoney", sum);
map.put("rows", outer);

7
src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -41,13 +41,6 @@ public class UserController {
try {
String username = loginame.trim();
password = password.trim();
//因密码用MD5加密，需要对密码进行转化
// try {
// password = Tools.md5Encryp(password);
// } catch (NoSuchAlgorithmException e) {
// e.printStackTrace();
// logger.error(">>>>>>>>>>>>>>转化MD5字符串错误 ：" + e.getMessage(), e);
// }
//判断用户是否已经登录过，登录过不再处理
Object userInfo = request.getSession().getAttribute("user");
User sessionUser = new User();