Skip to content
GitLab
"resources/vscode:/vscode.git/clone" did not exist on "e2cb276d982a199bae9d8ab5dce196f2aeb18936"
Commit 1dc95653 authored by cjl's avatar cjl
Browse files

1、修改double类型为BigDecimal 

2、修复sql中大于小于少&出错的问题
parents 6abe4bc8 4afc188b
Expand all Hide whitespace changes
Inline Side-by-side
sql/jsh_erp.sql
View file @ 1dc95653
This diff is collapsed.
src/main/java/com/jsh/erp/controller/AccountController.java
View file @ 1dc95653
package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.Account;
import com.jsh.erp.datasource.vo.AccountVo4InOutList;
import com.jsh.erp.service.account.AccountService;
import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/**
* @author jishenghua 75271*8920
*/
@RestController
@RequestMapping(value = "/account")
public class AccountController {
private Logger logger = LoggerFactory.getLogger(AccountController.class);
@Resource
private AccountService accountService;
/**
* 查找结算账户信息-下拉框
* @param request
* @return
*/
@GetMapping(value = "/findBySelect")
public String findBySelect(HttpServletRequest request) {
String res = null;
try {
List<Account> dataList = accountService.findBySelect();
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
for (Account account : dataList) {
JSONObject item = new JSONObject();
item.put("Id", account.getId());
//结算账户名称
item.put("AccountName", account.getName());
dataArray.add(item);
}
}
res = dataArray.toJSONString();
} catch(Exception e){
e.printStackTrace();
res = "获取数据失败";
}
return res;
}
/**
* 获取所有结算账户
* @param request
* @return
*/
@GetMapping(value = "/getAccount")
public BaseResponseInfo getAccount(HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<Account> accountList = accountService.getAccount();
map.put("accountList", accountList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 账户流水信息
* @param currentPage
* @param pageSize
* @param accountId
* @param initialAmount
* @param request
* @return
*/
@GetMapping(value = "/findAccountInOutList")
public BaseResponseInfo findAccountInOutList(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("accountId") Long accountId,
@RequestParam("initialAmount") Double initialAmount,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<AccountVo4InOutList> dataList = accountService.findAccountInOutList(accountId, (currentPage-1)*pageSize, pageSize);
int total = accountService.findAccountInOutListCount(accountId);
map.put("total", total);
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
for (AccountVo4InOutList aEx : dataList) {
String timeStr = aEx.getOperTime().toString();
Double balance = accountService.getAccountSum(accountId, timeStr, "date") + accountService.getAccountSumByHead(accountId, timeStr, "date")
+ accountService.getAccountSumByDetail(accountId, timeStr, "date") + accountService.getManyAccountSum(accountId, timeStr, "date") + initialAmount;
aEx.setBalance(balance);
dataArray.add(aEx);
}
}
map.put("rows", dataArray);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
@PostMapping(value = "/updateAmountIsDefault")
public String updateAmountIsDefault(@RequestParam("isDefault") Boolean isDefault,
@RequestParam("accountId") Long accountId,
HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>();
int res = accountService.updateAmountIsDefault(isDefault, accountId);
if(res > 0) {
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
} else {
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
}
}
}
package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.Account;
import com.jsh.erp.datasource.vo.AccountVo4InOutList;
import com.jsh.erp.service.account.AccountService;
import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/**
* @author jishenghua 75271*8920
*/
@RestController
@RequestMapping(value = "/account")
public class AccountController {
private Logger logger = LoggerFactory.getLogger(AccountController.class);
@Resource
private AccountService accountService;
/**
* 查找结算账户信息-下拉框
* @param request
* @return
*/
@GetMapping(value = "/findBySelect")
public String findBySelect(HttpServletRequest request) {
String res = null;
try {
List<Account> dataList = accountService.findBySelect();
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
for (Account account : dataList) {
JSONObject item = new JSONObject();
item.put("Id", account.getId());
//结算账户名称
item.put("AccountName", account.getName());
dataArray.add(item);
}
}
res = dataArray.toJSONString();
} catch(Exception e){
e.printStackTrace();
res = "获取数据失败";
}
return res;
}
/**
* 获取所有结算账户
* @param request
* @return
*/
@GetMapping(value = "/getAccount")
public BaseResponseInfo getAccount(HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<Account> accountList = accountService.getAccount();
map.put("accountList", accountList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 账户流水信息
* @param currentPage
* @param pageSize
* @param accountId
* @param initialAmount
* @param request
* @return
*/
@GetMapping(value = "/findAccountInOutList")
public BaseResponseInfo findAccountInOutList(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("accountId") Long accountId,
@RequestParam("initialAmount") BigDecimal initialAmount,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<AccountVo4InOutList> dataList = accountService.findAccountInOutList(accountId, (currentPage-1)*pageSize, pageSize);
int total = accountService.findAccountInOutListCount(accountId);
map.put("total", total);
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
for (AccountVo4InOutList aEx : dataList) {
String timeStr = aEx.getOperTime().toString();
BigDecimal balance = accountService.getAccountSum(accountId, timeStr, "date").add(accountService.getAccountSumByHead(accountId, timeStr, "date"))
.add(accountService.getAccountSumByDetail(accountId, timeStr, "date")).add(accountService.getManyAccountSum(accountId, timeStr, "date")).add(initialAmount);
aEx.setBalance(balance);
dataArray.add(aEx);
}
}
map.put("rows", dataArray);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
@PostMapping(value = "/updateAmountIsDefault")
public String updateAmountIsDefault(@RequestParam("isDefault") Boolean isDefault,
@RequestParam("accountId") Long accountId,
HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>();
int res = accountService.updateAmountIsDefault(isDefault, accountId);
if(res > 0) {
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
} else {
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
}
}
}
src/main/java/com/jsh/erp/controller/AccountHeadController.java
View file @ 1dc95653
......@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -69,7 +70,7 @@ public class AccountHeadController {
Map<String, Object> map = new HashMap<String, Object>();
try {
JSONObject outer = new JSONObject();
Double sum = 0.0;
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
int i = 1;
if (supType.equals("customer")) { //客户
......@@ -78,10 +79,14 @@ public class AccountHeadController {
i = -1;
}
//收付款部分
sum = sum + (allMoney(getS, "付款", "合计",endTime) + allMoney(getS, "付款", "实际",endTime)) * i;
sum = sum - (allMoney(getS, "收款", "合计",endTime) + allMoney(getS, "收款", "实际",endTime)) * i;
sum = sum + (allMoney(getS, "收入", "合计",endTime) - allMoney(getS, "收入", "实际",endTime)) * i;
sum = sum - (allMoney(getS, "支出", "合计",endTime) - allMoney(getS, "支出", "实际",endTime)) * i;
// 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);
res.code = 200;
......@@ -128,11 +133,11 @@ public class AccountHeadController {
* @param endTime
* @return
*/
public Double allMoney(String getS, String type, String mode, String endTime) {
Double allMoney = 0.0;
public BigDecimal allMoney(String getS, String type, String mode, String endTime) {
BigDecimal allMoney = BigDecimal.ZERO;
try {
Integer supplierId = Integer.valueOf(getS);
Double sum = accountHeadService.findAllMoney(supplierId, type, mode, endTime);
BigDecimal sum = accountHeadService.findAllMoney(supplierId, type, mode, endTime);
if(sum != null) {
allMoney = sum;
}
......@@ -140,8 +145,8 @@ public class AccountHeadController {
e.printStackTrace();
}
//返回正数，如果负数也转为正数
if (allMoney < 0) {
allMoney = -allMoney;
if ((allMoney.compareTo(BigDecimal.ZERO))==-1) {
allMoney = allMoney.abs();
}
return allMoney;
}
......
src/main/java/com/jsh/erp/controller/AccountItemController.java
View file @ 1dc95653
......@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -86,8 +87,8 @@ public class AccountItemController {
item.put("AccountName", ai.getAccountName());
item.put("InOutItemId", ai.getInoutitemid());
item.put("InOutItemName", ai.getInOutItemName());
Double eachAmount = ai.getEachamount();
item.put("EachAmount", eachAmount < 0 ? 0 - eachAmount : eachAmount);
BigDecimal eachAmount = ai.getEachamount();
item.put("EachAmount", (eachAmount.compareTo(BigDecimal.ZERO))==-1 ? BigDecimal.ZERO.subtract(eachAmount): eachAmount);
item.put("Remark", ai.getRemark());
dataArray.add(item);
}
......
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @ 1dc95653
......@@ -15,6 +15,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -152,13 +153,13 @@ public class DepotItemController {
if (null != list) {
for (DepotItemVo4Material di : list) {
JSONObject item = new JSONObject();
double prevSum = sumNumber("入库", pid, materialId, monthTime, true) - sumNumber("出库", pid, materialId, monthTime, true);
double InSum = sumNumber("入库", pid, materialId, monthTime, false);
double OutSum = sumNumber("出库", pid, materialId, monthTime, false);
BigDecimal prevSum = sumNumber("入库", pid, materialId, monthTime, true).subtract(sumNumber("出库", pid, materialId, monthTime, true));
BigDecimal InSum = sumNumber("入库", pid, materialId, monthTime, false);
BigDecimal OutSum = sumNumber("出库", pid, materialId, monthTime, false);
item.put("MaterialId", di.getMaterialid() == null ? "" : di.getMaterialid());
item.put("MaterialName", di.getMname());
item.put("MaterialModel", di.getMmodel());
item.put("thisSum", prevSum + InSum - OutSum);
item.put("thisSum", prevSum.add(InSum).subtract(OutSum));
dataArray.add(item);
}
}
......@@ -425,12 +426,12 @@ public class DepotItemController {
if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject();
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);
BigDecimal prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true).subtract(sumNumber("出库", pid, diEx.getMId(), monthTime, true));
BigDecimal InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false);
BigDecimal OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false);
BigDecimal prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true).subtract(sumPrice("出库", pid, diEx.getMId(), monthTime, true));
BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false);
BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false);
item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMColor());
//扩展信息
......@@ -438,21 +439,21 @@ public class DepotItemController {
item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit());
Double unitPrice = 0.0;
if (prevSum + InSum - OutSum != 0.0) {
unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum);
BigDecimal unitPrice = BigDecimal.ZERO;
if ((prevSum .add(InSum).subtract(OutSum)).compareTo(BigDecimal.ZERO)!= 0) {
unitPrice = (prevPrice.add(InPrice).subtract(OutPrice)).divide(prevSum.add(InSum).subtract(OutSum),2, BigDecimal.ROUND_HALF_UP);
/**
* 2019-01-15通过除法算出金额后，保留两位小数
* */
DecimalFormat df = new DecimalFormat("#.00");
unitPrice= Double.parseDouble(df.format(unitPrice));
unitPrice= new BigDecimal(df.format(unitPrice));
}
item.put("UnitPrice", unitPrice);
item.put("prevSum", prevSum);
item.put("InSum", InSum);
item.put("OutSum", OutSum);
item.put("thisSum", prevSum + InSum - OutSum);
item.put("thisAllPrice", prevPrice + InPrice - OutPrice);
item.put("thisSum", prevSum.add(InSum).subtract(OutSum));
item.put("thisAllPrice", prevPrice.add(InPrice).subtract(OutPrice));
dataArray.add(item);
}
}
......@@ -486,13 +487,13 @@ public class DepotItemController {
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, null, null);
Double thisAllPrice = 0.0;
BigDecimal thisAllPrice = BigDecimal.ZERO;
if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) {
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);
BigDecimal prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true).subtract(sumPrice("出库", pid, diEx.getMId(), monthTime, true));
BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false);
BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false);
thisAllPrice = thisAllPrice .add(prevPrice.add(InPrice).subtract(OutPrice));
}
}
map.put("totalCount", thisAllPrice);
......@@ -537,10 +538,10 @@ public class DepotItemController {
if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject();
Double InSum = sumNumberBuyOrSale("入库", "采购", diEx.getMId(), monthTime);
Double OutSum = sumNumberBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime);
Double InSumPrice = sumPriceBuyOrSale("入库", "采购", diEx.getMId(), monthTime);
Double OutSumPrice = sumPriceBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime);
BigDecimal InSum = sumNumberBuyOrSale("入库", "采购", diEx.getMId(), monthTime);
BigDecimal OutSum = sumNumberBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime);
BigDecimal InSumPrice = sumPriceBuyOrSale("入库", "采购", diEx.getMId(), monthTime);
BigDecimal OutSumPrice = sumPriceBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime);
item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMModel());
//扩展信息
......@@ -597,14 +598,14 @@ public class DepotItemController {
if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject();
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);
BigDecimal OutSumRetail = sumNumberBuyOrSale("出库", "零售", diEx.getMId(), monthTime);
BigDecimal OutSum = sumNumberBuyOrSale("出库", "销售", diEx.getMId(), monthTime);
BigDecimal InSumRetail = sumNumberBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime);
BigDecimal InSum = sumNumberBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime);
BigDecimal OutSumRetailPrice = sumPriceBuyOrSale("出库", "零售", diEx.getMId(), monthTime);
BigDecimal OutSumPrice = sumPriceBuyOrSale("出库", "销售", diEx.getMId(), monthTime);
BigDecimal InSumRetailPrice = sumPriceBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime);
BigDecimal InSumPrice = sumPriceBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime);
item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMModel());
//扩展信息
......@@ -612,10 +613,10 @@ public class DepotItemController {
item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("OutSum", OutSumRetail + OutSum);
item.put("InSum", InSumRetail + InSum);
item.put("OutSumPrice", OutSumRetailPrice + OutSumPrice);
item.put("InSumPrice", InSumRetailPrice + InSumPrice);
item.put("OutSum", OutSumRetail.add(OutSum));
item.put("InSum", InSumRetail.add(InSum));
item.put("OutSumPrice", OutSumRetailPrice.add(OutSumPrice));
item.put("InSumPrice", InSumRetailPrice.add(InSumPrice));
dataArray.add(item);
}
}
......@@ -661,8 +662,8 @@ public class DepotItemController {
if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject();
Double InSum = sumNumberGift("礼品充值", pid, diEx.getMId(), "in");
Double OutSum = sumNumberGift("礼品销售", pid, diEx.getMId(), "out");
BigDecimal InSum = sumNumberGift("礼品充值", pid, diEx.getMId(), "in");
BigDecimal OutSum = sumNumberGift("礼品销售", pid, diEx.getMId(), "out");
item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMModel());
//扩展信息
......@@ -670,7 +671,7 @@ public class DepotItemController {
item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("thisSum", InSum - OutSum);
item.put("thisSum", InSum.subtract(OutSum));
dataArray.add(item);
}
}
......@@ -718,23 +719,23 @@ public class DepotItemController {
if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) {
String[] objs = new String[9];
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);
BigDecimal prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true).subtract(sumNumber("出库", pid, diEx.getMId(), monthTime, true));
BigDecimal InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false);
BigDecimal OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false);
BigDecimal prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true).subtract(sumPrice("出库", pid, diEx.getMId(), monthTime, true));
BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false);
BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false);
BigDecimal unitPrice = BigDecimal.ZERO;
if ((prevSum.add(InSum).subtract(OutSum)).compareTo(BigDecimal.ZERO) != 0) {
unitPrice = (prevPrice.add(InPrice).subtract(OutPrice)).divide(prevSum.add(InSum).subtract(OutSum),2, BigDecimal.ROUND_HALF_UP);
/**
* 2019-01-15通过除法算出金额后，保留两位小数
* */
DecimalFormat df = new DecimalFormat("#.00");
unitPrice= Double.parseDouble(df.format(unitPrice));
unitPrice= new BigDecimal(df.format(unitPrice));
}
Double thisSum = prevSum + InSum - OutSum;
Double thisAllPrice = prevPrice + InPrice - OutPrice;
BigDecimal thisSum = prevSum.add(InSum).subtract(OutSum);
BigDecimal thisAllPrice = prevPrice.add(InPrice).subtract(OutPrice);
objs[0] = diEx.getMName().toString();
objs[1] = diEx.getMModel().toString();
objs[2] = diEx.getMaterialUnit().toString();
......@@ -770,10 +771,10 @@ public class DepotItemController {
* @param isPrev
* @return
*/
public Double sumNumber(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
Double sumNumber = 0.0;
public BigDecimal sumNumber(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
BigDecimal sumNumber = BigDecimal.ZERO;
try {
Double sum = depotItemService.findByType(type, ProjectId, MId, MonthTime, isPrev);
BigDecimal sum = depotItemService.findByType(type, ProjectId, MId, MonthTime, isPrev);
if(sum != null) {
sumNumber = sum;
}
......@@ -792,10 +793,10 @@ public class DepotItemController {
* @param isPrev
* @return
*/
public Double sumPrice(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
Double sumPrice = 0.0;
public BigDecimal sumPrice(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
BigDecimal sumPrice = BigDecimal.ZERO;
try {
Double sum = depotItemService.findPriceByType(type, ProjectId, MId, MonthTime, isPrev);
BigDecimal sum = depotItemService.findPriceByType(type, ProjectId, MId, MonthTime, isPrev);
if(sum != null) {
sumPrice = sum;
}
......@@ -805,11 +806,11 @@ public class DepotItemController {
return sumPrice;
}
public Double sumNumberBuyOrSale(String type, String subType, Long MId, String MonthTime) {
Double sumNumber = 0.0;
public BigDecimal sumNumberBuyOrSale(String type, String subType, Long MId, String MonthTime) {
BigDecimal sumNumber = BigDecimal.ZERO;
String sumType = "Number";
try {
Double sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
BigDecimal sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
if(sum != null) {
sumNumber = sum;
}
......@@ -819,11 +820,11 @@ public class DepotItemController {
return sumNumber;
}
public Double sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) {
Double sumPrice = 0.0;
public BigDecimal sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) {
BigDecimal sumPrice = BigDecimal.ZERO;
String sumType = "Price";
try {
Double sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
BigDecimal sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
if(sum != null) {
sumPrice = sum;
}
......@@ -841,12 +842,12 @@ public class DepotItemController {
* @param type
* @return
*/
public Double sumNumberGift(String subType, Integer ProjectId, Long MId, String type) {
Double sumNumber = 0.0;
public BigDecimal sumNumberGift(String subType, Integer ProjectId, Long MId, String type) {
BigDecimal sumNumber = BigDecimal.ZERO;
String allNumber = "";
try {
if (ProjectId != null) {
Double sum = depotItemService.findGiftByType(subType, ProjectId, MId, type);
BigDecimal sum = depotItemService.findGiftByType(subType, ProjectId, MId, type);
if(sum != null) {
sumNumber = sum;
}
......
src/main/java/com/jsh/erp/controller/MaterialController.java
View file @ 1dc95653
......@@ -18,6 +18,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -270,19 +271,19 @@ public class MaterialController {
for (int i = 1; i < src.getRows(); i++) {
Material m = new Material();
m.setName(ExcelUtils.getContent(src, i, 0));
m.setCategoryid(1l); //根目录
m.setCategoryid(1L); //根目录
m.setModel(ExcelUtils.getContent(src, i, 2));
String safetyStock = ExcelUtils.getContent(src, i, 3);
m.setSafetystock(parseDoubleEx(safetyStock));
m.setSafetystock(parseBigDecimalEx(safetyStock));
m.setUnit(ExcelUtils.getContent(src, i, 4));
String retailprice = ExcelUtils.getContent(src, i, 5);
m.setRetailprice(parseDoubleEx(retailprice));
m.setRetailprice(parseBigDecimalEx(retailprice));
String lowPrice = ExcelUtils.getContent(src, i, 6);
m.setLowprice(parseDoubleEx(lowPrice));
m.setLowprice(parseBigDecimalEx(lowPrice));
String presetpriceone = ExcelUtils.getContent(src, i, 7);
m.setPresetpriceone(parseDoubleEx(presetpriceone));
m.setPresetpriceone(parseBigDecimalEx(presetpriceone));
String presetpricetwo = ExcelUtils.getContent(src, i, 8);
m.setPresetpricetwo(parseDoubleEx(presetpricetwo));
m.setPresetpricetwo(parseBigDecimalEx(presetpricetwo));
m.setRemark(ExcelUtils.getContent(src, i, 9));
String enabled = ExcelUtils.getContent(src, i, 10);
m.setEnabled(enabled.equals("启用")? true: false);
......@@ -299,9 +300,9 @@ public class MaterialController {
response.sendRedirect("../pages/materials/material.html");
}
public Double parseDoubleEx(String str){
public BigDecimal parseBigDecimalEx(String str){
if(!StringUtil.isEmpty(str)) {
return Double.parseDouble(str);
return new BigDecimal(str);
} else {
return null;
}
......
src/main/java/com/jsh/erp/controller/SupplierController.java
View file @ 1dc95653
......@@ -18,6 +18,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -48,7 +49,7 @@ public class SupplierController {
*/
@PostMapping(value = "/updateAdvanceIn")
public String updateAdvanceIn(@RequestParam("supplierId") Long supplierId,
@RequestParam("advanceIn") Double advanceIn,
@RequestParam("advanceIn") BigDecimal advanceIn,
HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>();
int res = supplierService.updateAdvanceIn(supplierId, advanceIn);
......@@ -396,9 +397,9 @@ public class SupplierController {
s.setContacts(ExcelUtils.getContent(src, i, 2));
s.setPhonenum(ExcelUtils.getContent(src, i, 3));
s.setEmail(ExcelUtils.getContent(src, i, 4));
s.setAdvancein(parseDoubleEx(ExcelUtils.getContent(src, i, 5)));
s.setBeginneedget(parseDoubleEx(ExcelUtils.getContent(src, i, 6)));
s.setBeginneedpay(parseDoubleEx(ExcelUtils.getContent(src, i, 7)));
s.setAdvancein(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
s.setBeginneedget(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
s.setBeginneedpay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
s.setDescription(ExcelUtils.getContent(src, i, 8));
s.setFax(ExcelUtils.getContent(src, i, 9));
s.setTelephone(ExcelUtils.getContent(src, i, 10));
......@@ -406,7 +407,7 @@ public class SupplierController {
s.setTaxnum(ExcelUtils.getContent(src, i, 12));
s.setBankname(ExcelUtils.getContent(src, i, 13));
s.setAccountnumber(ExcelUtils.getContent(src, i, 14));
s.setTaxrate(parseDoubleEx(ExcelUtils.getContent(src, i, 15)));
s.setTaxrate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
String enabled = ExcelUtils.getContent(src, i, 16);
s.setEnabled(enabled.equals("启用")? true: false);
s.setIsystem(Byte.parseByte("1"));
......@@ -423,9 +424,9 @@ public class SupplierController {
return null;
}
public Double parseDoubleEx(String str){
public BigDecimal parseBigDecimalEx(String str){
if(!StringUtil.isEmpty(str)) {
return Double.parseDouble(str);
return new BigDecimal(str);
} else {
return null;
}
......
src/main/java/com/jsh/erp/datasource/entities/Account.java
View file @ 1dc95653
package com.jsh.erp.datasource.entities;
public class Account {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.SerialNo
*
* @mbggenerated
*/
private String serialno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.InitialAmount
*
* @mbggenerated
*/
private Double initialamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.CurrentAmount
*
* @mbggenerated
*/
private Double currentamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.IsDefault
*
* @mbggenerated
*/
private Boolean isdefault;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Id
*
* @return the value of jsh_account.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Id
*
* @param id the value for jsh_account.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Name
*
* @return the value of jsh_account.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Name
*
* @param name the value for jsh_account.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.SerialNo
*
* @return the value of jsh_account.SerialNo
*
* @mbggenerated
*/
public String getSerialno() {
return serialno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.SerialNo
*
* @param serialno the value for jsh_account.SerialNo
*
* @mbggenerated
*/
public void setSerialno(String serialno) {
this.serialno = serialno == null ? null : serialno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.InitialAmount
*
* @return the value of jsh_account.InitialAmount
*
* @mbggenerated
*/
public Double getInitialamount() {
return initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.InitialAmount
*
* @param initialamount the value for jsh_account.InitialAmount
*
* @mbggenerated
*/
public void setInitialamount(Double initialamount) {
this.initialamount = initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.CurrentAmount
*
* @return the value of jsh_account.CurrentAmount
*
* @mbggenerated
*/
public Double getCurrentamount() {
return currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.CurrentAmount
*
* @param currentamount the value for jsh_account.CurrentAmount
*
* @mbggenerated
*/
public void setCurrentamount(Double currentamount) {
this.currentamount = currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Remark
*
* @return the value of jsh_account.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Remark
*
* @param remark the value for jsh_account.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.IsDefault
*
* @return the value of jsh_account.IsDefault
*
* @mbggenerated
*/
public Boolean getIsdefault() {
return isdefault;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.IsDefault
*
* @param isdefault the value for jsh_account.IsDefault
*
* @mbggenerated
*/
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Account {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.SerialNo
*
* @mbggenerated
*/
private String serialno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.InitialAmount
*
* @mbggenerated
*/
private BigDecimal initialamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.CurrentAmount
*
* @mbggenerated
*/
private BigDecimal currentamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.IsDefault
*
* @mbggenerated
*/
private Boolean isdefault;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Id
*
* @return the value of jsh_account.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Id
*
* @param id the value for jsh_account.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Name
*
* @return the value of jsh_account.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Name
*
* @param name the value for jsh_account.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.SerialNo
*
* @return the value of jsh_account.SerialNo
*
* @mbggenerated
*/
public String getSerialno() {
return serialno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.SerialNo
*
* @param serialno the value for jsh_account.SerialNo
*
* @mbggenerated
*/
public void setSerialno(String serialno) {
this.serialno = serialno == null ? null : serialno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.InitialAmount
*
* @return the value of jsh_account.InitialAmount
*
* @mbggenerated
*/
public BigDecimal getInitialamount() {
return initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.InitialAmount
*
* @param initialamount the value for jsh_account.InitialAmount
*
* @mbggenerated
*/
public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.CurrentAmount
*
* @return the value of jsh_account.CurrentAmount
*
* @mbggenerated
*/
public BigDecimal getCurrentamount() {
return currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.CurrentAmount
*
* @param currentamount the value for jsh_account.CurrentAmount
*
* @mbggenerated
*/
public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Remark
*
* @return the value of jsh_account.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Remark
*
* @param remark the value for jsh_account.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.IsDefault
*
* @return the value of jsh_account.IsDefault
*
* @mbggenerated
*/
public Boolean getIsdefault() {
return isdefault;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.IsDefault
*
* @param isdefault the value for jsh_account.IsDefault
*
* @mbggenerated
*/
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/AccountHead.java
View file @ 1dc95653
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class AccountHead {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.OrganId
*
* @mbggenerated
*/
private Long organid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
private Long handspersonid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
private Double changeamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
private Double totalprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillNo
*
* @mbggenerated
*/
private String billno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillTime
*
* @mbggenerated
*/
private Date billtime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Id
*
* @return the value of jsh_accounthead.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Id
*
* @param id the value for jsh_accounthead.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Type
*
* @return the value of jsh_accounthead.Type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Type
*
* @param type the value for jsh_accounthead.Type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.OrganId
*
* @return the value of jsh_accounthead.OrganId
*
* @mbggenerated
*/
public Long getOrganid() {
return organid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.OrganId
*
* @param organid the value for jsh_accounthead.OrganId
*
* @mbggenerated
*/
public void setOrganid(Long organid) {
this.organid = organid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.HandsPersonId
*
* @return the value of jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public Long getHandspersonid() {
return handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.HandsPersonId
*
* @param handspersonid the value for jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.ChangeAmount
*
* @return the value of jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public Double getChangeamount() {
return changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.ChangeAmount
*
* @param changeamount the value for jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public void setChangeamount(Double changeamount) {
this.changeamount = changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.TotalPrice
*
* @return the value of jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public Double getTotalprice() {
return totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.TotalPrice
*
* @param totalprice the value for jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public void setTotalprice(Double totalprice) {
this.totalprice = totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.AccountId
*
* @return the value of jsh_accounthead.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.AccountId
*
* @param accountid the value for jsh_accounthead.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillNo
*
* @return the value of jsh_accounthead.BillNo
*
* @mbggenerated
*/
public String getBillno() {
return billno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillNo
*
* @param billno the value for jsh_accounthead.BillNo
*
* @mbggenerated
*/
public void setBillno(String billno) {
this.billno = billno == null ? null : billno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillTime
*
* @return the value of jsh_accounthead.BillTime
*
* @mbggenerated
*/
public Date getBilltime() {
return billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillTime
*
* @param billtime the value for jsh_accounthead.BillTime
*
* @mbggenerated
*/
public void setBilltime(Date billtime) {
this.billtime = billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Remark
*
* @return the value of jsh_accounthead.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Remark
*
* @param remark the value for jsh_accounthead.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class AccountHead {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.OrganId
*
* @mbggenerated
*/
private Long organid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
private Long handspersonid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
private BigDecimal changeamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
private BigDecimal totalprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillNo
*
* @mbggenerated
*/
private String billno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillTime
*
* @mbggenerated
*/
private Date billtime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Id
*
* @return the value of jsh_accounthead.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Id
*
* @param id the value for jsh_accounthead.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Type
*
* @return the value of jsh_accounthead.Type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Type
*
* @param type the value for jsh_accounthead.Type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.OrganId
*
* @return the value of jsh_accounthead.OrganId
*
* @mbggenerated
*/
public Long getOrganid() {
return organid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.OrganId
*
* @param organid the value for jsh_accounthead.OrganId
*
* @mbggenerated
*/
public void setOrganid(Long organid) {
this.organid = organid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.HandsPersonId
*
* @return the value of jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public Long getHandspersonid() {
return handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.HandsPersonId
*
* @param handspersonid the value for jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.ChangeAmount
*
* @return the value of jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public BigDecimal getChangeamount() {
return changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.ChangeAmount
*
* @param changeamount the value for jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.TotalPrice
*
* @return the value of jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public BigDecimal getTotalprice() {
return totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.TotalPrice
*
* @param totalprice the value for jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.AccountId
*
* @return the value of jsh_accounthead.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.AccountId
*
* @param accountid the value for jsh_accounthead.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillNo
*
* @return the value of jsh_accounthead.BillNo
*
* @mbggenerated
*/
public String getBillno() {
return billno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillNo
*
* @param billno the value for jsh_accounthead.BillNo
*
* @mbggenerated
*/
public void setBillno(String billno) {
this.billno = billno == null ? null : billno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillTime
*
* @return the value of jsh_accounthead.BillTime
*
* @mbggenerated
*/
public Date getBilltime() {
return billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillTime
*
* @param billtime the value for jsh_accounthead.BillTime
*
* @mbggenerated
*/
public void setBilltime(Date billtime) {
this.billtime = billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Remark
*
* @return the value of jsh_accounthead.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Remark
*
* @param remark the value for jsh_accounthead.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
View file @ 1dc95653
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class AccountHeadVo4ListEx {
private Long id;
private String type;
private Long organid;
private Long handspersonid;
private Double changeamount;
private Double totalprice;
private Long accountid;
private String billno;
private Date billtime;
private String remark;
private String organname;
private String handspersonname;
private String accountname;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Long getOrganid() {
return organid;
}
public void setOrganid(Long organid) {
this.organid = organid;
}
public Long getHandspersonid() {
return handspersonid;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
public Double getChangeamount() {
return changeamount;
}
public void setChangeamount(Double changeamount) {
this.changeamount = changeamount;
}
public Double getTotalprice() {
return totalprice;
}
public void setTotalprice(Double totalprice) {
this.totalprice = totalprice;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public String getBillno() {
return billno;
}
public void setBillno(String billno) {
this.billno = billno;
}
public Date getBilltime() {
return billtime;
}
public void setBilltime(Date billtime) {
this.billtime = billtime;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getOrganname() {
return organname;
}
public void setOrganname(String organname) {
this.organname = organname;
}
public String getHandspersonname() {
return handspersonname;
}
public void setHandspersonname(String handspersonname) {
this.handspersonname = handspersonname;
}
public String getAccountname() {
return accountname;
}
public void setAccountname(String accountname) {
this.accountname = accountname;
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class AccountHeadVo4ListEx {
private Long id;
private String type;
private Long organid;
private Long handspersonid;
private BigDecimal changeamount;
private BigDecimal totalprice;
private Long accountid;
private String billno;
private Date billtime;
private String remark;
private String organname;
private String handspersonname;
private String accountname;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Long getOrganid() {
return organid;
}
public void setOrganid(Long organid) {
this.organid = organid;
}
public Long getHandspersonid() {
return handspersonid;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
public BigDecimal getChangeamount() {
return changeamount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
}
public BigDecimal getTotalprice() {
return totalprice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public String getBillno() {
return billno;
}
public void setBillno(String billno) {
this.billno = billno;
}
public Date getBilltime() {
return billtime;
}
public void setBilltime(Date billtime) {
this.billtime = billtime;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getOrganname() {
return organname;
}
public void setOrganname(String organname) {
this.organname = organname;
}
public String getHandspersonname() {
return handspersonname;
}
public void setHandspersonname(String handspersonname) {
this.handspersonname = handspersonname;
}
public String getAccountname() {
return accountname;
}
public void setAccountname(String accountname) {
this.accountname = accountname;
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/AccountItem.java
View file @ 1dc95653
package com.jsh.erp.datasource.entities;
public class AccountItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.HeaderId
*
* @mbggenerated
*/
private Long headerid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
private Long inoutitemid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.EachAmount
*
* @mbggenerated
*/
private Double eachamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Id
*
* @return the value of jsh_accountitem.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Id
*
* @param id the value for jsh_accountitem.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.HeaderId
*
* @return the value of jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public Long getHeaderid() {
return headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.HeaderId
*
* @param headerid the value for jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.AccountId
*
* @return the value of jsh_accountitem.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.AccountId
*
* @param accountid the value for jsh_accountitem.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.InOutItemId
*
* @return the value of jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public Long getInoutitemid() {
return inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.InOutItemId
*
* @param inoutitemid the value for jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.EachAmount
*
* @return the value of jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public Double getEachamount() {
return eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.EachAmount
*
* @param eachamount the value for jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public void setEachamount(Double eachamount) {
this.eachamount = eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Remark
*
* @return the value of jsh_accountitem.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Remark
*
* @param remark the value for jsh_accountitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class AccountItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.HeaderId
*
* @mbggenerated
*/
private Long headerid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
private Long inoutitemid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.EachAmount
*
* @mbggenerated
*/
private BigDecimal eachamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Id
*
* @return the value of jsh_accountitem.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Id
*
* @param id the value for jsh_accountitem.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.HeaderId
*
* @return the value of jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public Long getHeaderid() {
return headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.HeaderId
*
* @param headerid the value for jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.AccountId
*
* @return the value of jsh_accountitem.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.AccountId
*
* @param accountid the value for jsh_accountitem.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.InOutItemId
*
* @return the value of jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public Long getInoutitemid() {
return inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.InOutItemId
*
* @param inoutitemid the value for jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.EachAmount
*
* @return the value of jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public BigDecimal getEachamount() {
return eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.EachAmount
*
* @param eachamount the value for jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Remark
*
* @return the value of jsh_accountitem.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Remark
*
* @param remark the value for jsh_accountitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment