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

1、修改double类型为BigDecimal

Browse Source 
2、修复sql中大于小于少&出错的问题
This commit is contained in:
cjl
2019-01-17 15:56:25 +08:00
parent 6abe4bc890 4afc188b73
commit 1dc95653f1
61 changed files with 24893 additions and 24820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10358
sql/jsh_erp.sql
View File

File diff suppressed because it is too large Load Diff

BIN
sql/华夏ERP数据库设计汇总.xlsx
View File

Binary file not shown.

283
src/main/java/com/jsh/erp/controller/AccountController.java
View File

@@ -1,141 +1,142 @@
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);
}
}
}

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

@@ -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;
}

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

@@ -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);
}

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

@@ -1,461 +1,468 @@
package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
import com.jsh.erp.service.depotHead.DepotHeadService;
import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo;
import com.jsh.erp.utils.StringUtil;
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.sql.Date;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/**
* @author ji-sheng-hua 752*718*920
*/
@RestController
@RequestMapping(value = "/depotHead")
public class DepotHeadController {
private Logger logger = LoggerFactory.getLogger(DepotHeadController.class);
@Resource
private DepotHeadService depotHeadService;
/**
* 批量设置状态-审核或者反审核
* @param status
* @param depotHeadIDs
* @param request
* @return
*/
@PostMapping(value = "/batchSetStatus")
public String batchSetStatus(@RequestParam("status") Boolean status,
@RequestParam("depotHeadIDs") String depotHeadIDs,
HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>();
int res = depotHeadService.batchSetStatus(status, depotHeadIDs);
if(res > 0) {
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
} else {
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
}
}
/**
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1
* @param type
* @param subType
* @param beginTime
* @param endTime
* @param request
* @return
*/
@GetMapping(value = "/buildNumber")
public BaseResponseInfo buildNumber(@RequestParam("type") String type,
@RequestParam("subType") String subType,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
String number = depotHeadService.buildNumber(type, subType, beginTime, endTime);
map.put("DefaultNumber", number);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 获取最大的id
* @param request
* @return
*/
@GetMapping(value = "/getMaxId")
public BaseResponseInfo getMaxId(HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
Long maxId = depotHeadService.getMaxId();
map.put("maxId", maxId);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 查找单据_根据月份(报表)
* @param monthTime
* @param request
* @return
*/
@GetMapping(value = "/findByMonth")
public BaseResponseInfo findByMonth(@RequestParam("monthTime") String monthTime,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHead> dataList = depotHeadService.findByMonth(monthTime);
String headId = "";
if (null != dataList) {
for (DepotHead depotHead : dataList) {
headId = headId + depotHead.getId() + ",";
}
}
if (headId != "") {
headId = headId.substring(0, headId.lastIndexOf(","));
}
map.put("HeadIds", headId);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 查找统计信息_根据礼品卡(报表)
* @param projectId
* @param request
* @return
*/
@GetMapping(value = "/findGiftReport")
public BaseResponseInfo findGiftReport(@RequestParam("projectId") String projectId,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHead> dataList_in = depotHeadService.getDepotHead();
String headId = "";
if (null != dataList_in) {
for (DepotHead depotHead : dataList_in) {
headId = headId + depotHead.getId() + ",";
}
List<DepotHead> dataList_out = depotHeadService.getDepotHeadGiftOut(projectId);
if (null != dataList_out) {
for (DepotHead depotHead : dataList_out) {
headId = headId + depotHead.getId() + ",";
}
}
}
if (headId != "") {
headId = headId.substring(0, headId.lastIndexOf(","));
}
map.put("HeadIds", headId);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 入库出库明细接口
* @param currentPage
* @param pageSize
* @param oId
* @param pid
* @param dids
* @param beginTime
* @param endTime
* @param type
* @param request
* @return
*/
@GetMapping(value = "/findInDetail")
public BaseResponseInfo findInDetail(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("organId") Integer oId,
@RequestParam("projectId") Integer pid,
@RequestParam("depotIds") String dids,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
@RequestParam("type") String type,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>();
List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
int total = depotHeadService.findByAllCount(beginTime, endTime, type, pid, dids, oId);
map.put("total", total);
//存放数据json数组
if (null != list) {
for (DepotHeadVo4InDetail dhd : list) {
resList.add(dhd);
}
}
map.put("rows", resList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 入库出库统计接口
* @param currentPage
* @param pageSize
* @param oId
* @param pid
* @param dids
* @param beginTime
* @param endTime
* @param type
* @param request
* @return
*/
@GetMapping(value = "/findInOutMaterialCount")
public BaseResponseInfo findInOutMaterialCount(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("organId") Integer oId,
@RequestParam("projectId") Integer pid,
@RequestParam("depotIds") String dids,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
@RequestParam("type") String type,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHeadVo4InOutMCount> resList = new ArrayList<DepotHeadVo4InOutMCount>();
List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, pid, dids, oId);
map.put("total", total);
//存放数据json数组
if (null != list) {
for (DepotHeadVo4InOutMCount dhc : list) {
resList.add(dhc);
}
}
map.put("rows", resList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 对账单接口
* @param currentPage
* @param pageSize
* @param beginTime
* @param endTime
* @param organId
* @param supType
* @param request
* @return
*/
@GetMapping(value = "/findStatementAccount")
public BaseResponseInfo findStatementAccount(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
@RequestParam("organId") Integer organId,
@RequestParam("supType") String supType,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
int j = 1;
if (supType.equals("客户")) { //客户
j = 1;
} else if (supType.equals("供应商")) { //供应商
j = -1;
}
List<DepotHeadVo4StatementAccount> resList = new ArrayList<DepotHeadVo4StatementAccount>();
List<DepotHeadVo4StatementAccount> list = depotHeadService.findStatementAccount(beginTime, endTime, organId, supType, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findStatementAccountCount(beginTime, endTime, organId, supType);
map.put("total", total);
//存放数据json数组
if (null != list) {
for (DepotHeadVo4StatementAccount dha : list) {
dha.setNumber(dha.getNumber()); //单据编号
dha.setType(dha.getType()); //类型
String type = dha.getType();
Double p1 = 0.0;
Double p2 = 0.0;
if (dha.getDiscountLastMoney() != null) {
p1 = dha.getDiscountLastMoney();
}
if (dha.getChangeAmount() != null) {
p2 = dha.getChangeAmount();
}
Double allPrice = 0.0;
if (p1 < 0) {
p1 = -p1;
}
if (p2 < 0) {
p2 = -p2;
}
if (type.equals("采购入库")) {
allPrice = -(p1 - p2);
} else if (type.equals("销售退货入库")) {
allPrice = -(p1 - p2);
} else if (type.equals("销售出库")) {
allPrice = p1 - p2;
} else if (type.equals("采购退货出库")) {
allPrice = p1 - p2;
} else if (type.equals("付款")) {
allPrice = p1 + p2;
} else if (type.equals("收款")) {
allPrice = -(p1 + p2);
} else if (type.equals("收入")) {
allPrice = p1 - p2;
} else if (type.equals("支出")) {
allPrice = -(p1 - p2);
}
dha.setDiscountLastMoney(p1); //金额
dha.setChangeAmount(p2); //金额
dha.setAllPrice(Double.parseDouble(String.format("%.2f", allPrice * j))); //计算后的金额
dha.setSupplierName(dha.getSupplierName()); //供应商
dha.setoTime(dha.getoTime()); //入库出库日期
resList.add(dha);
}
}
map.put("rows", resList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 查询单位的累计应收和累计应付，零售不能计入
* @param supplierId
* @param endTime
* @param supType
* @param request
* @return
*/
@GetMapping(value = "/findTotalPay")
public BaseResponseInfo findTotalPay(@RequestParam("supplierId") Integer supplierId,
@RequestParam("endTime") String endTime,
@RequestParam("supType") String supType,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
JSONObject outer = new JSONObject();
Double sum = 0.0;
String getS = supplierId.toString();
int i = 1;
if (supType.equals("customer")) { //客户
i = 1;
} else if (supType.equals("vendor")) { //供应商
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;
outer.put("getAllMoney", sum);
map.put("rows", outer);
res.code = 200;
res.data = map;
} catch (Exception e) {
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 根据编号查询单据信息
* @param number
* @param request
* @return
*/
@GetMapping(value = "/getDetailByNumber")
public BaseResponseInfo getDetailByNumber(@RequestParam("number") String number,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
DepotHeadVo4List dhl = new DepotHeadVo4List();
try {
List<DepotHeadVo4List> list = depotHeadService.getDetailByNumber(number);
if(list.size() == 1) {
dhl = list.get(0);
}
res.code = 200;
res.data = dhl;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 统计总金额
* @param getS
* @param type
* @param subType
* @param mode 合计或者金额
* @return
*/
public Double allMoney(String getS, String type, String subType, String mode, String endTime) {
Double allMoney = 0.0;
try {
Integer supplierId = Integer.valueOf(getS);
Double sum = depotHeadService.findAllMoney(supplierId, type, subType, mode, endTime);
if(sum != null) {
allMoney = sum;
}
} catch (Exception e) {
e.printStackTrace();
}
//返回正数，如果负数也转为正数
if (allMoney < 0) {
allMoney = -allMoney;
}
return allMoney;
}
}
package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
import com.jsh.erp.service.depotHead.DepotHeadService;
import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo;
import com.jsh.erp.utils.StringUtil;
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.sql.Date;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/**
* @author ji-sheng-hua 752*718*920
*/
@RestController
@RequestMapping(value = "/depotHead")
public class DepotHeadController {
private Logger logger = LoggerFactory.getLogger(DepotHeadController.class);
@Resource
private DepotHeadService depotHeadService;
/**
* 批量设置状态-审核或者反审核
* @param status
* @param depotHeadIDs
* @param request
* @return
*/
@PostMapping(value = "/batchSetStatus")
public String batchSetStatus(@RequestParam("status") Boolean status,
@RequestParam("depotHeadIDs") String depotHeadIDs,
HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>();
int res = depotHeadService.batchSetStatus(status, depotHeadIDs);
if(res > 0) {
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
} else {
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
}
}
/**
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1
* @param type
* @param subType
* @param beginTime
* @param endTime
* @param request
* @return
*/
@GetMapping(value = "/buildNumber")
public BaseResponseInfo buildNumber(@RequestParam("type") String type,
@RequestParam("subType") String subType,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
String number = depotHeadService.buildNumber(type, subType, beginTime, endTime);
map.put("DefaultNumber", number);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 获取最大的id
* @param request
* @return
*/
@GetMapping(value = "/getMaxId")
public BaseResponseInfo getMaxId(HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
Long maxId = depotHeadService.getMaxId();
map.put("maxId", maxId);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 查找单据_根据月份(报表)
* @param monthTime
* @param request
* @return
*/
@GetMapping(value = "/findByMonth")
public BaseResponseInfo findByMonth(@RequestParam("monthTime") String monthTime,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHead> dataList = depotHeadService.findByMonth(monthTime);
String headId = "";
if (null != dataList) {
for (DepotHead depotHead : dataList) {
headId = headId + depotHead.getId() + ",";
}
}
if (headId != "") {
headId = headId.substring(0, headId.lastIndexOf(","));
}
map.put("HeadIds", headId);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 查找统计信息_根据礼品卡(报表)
* @param projectId
* @param request
* @return
*/
@GetMapping(value = "/findGiftReport")
public BaseResponseInfo findGiftReport(@RequestParam("projectId") String projectId,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHead> dataList_in = depotHeadService.getDepotHead();
String headId = "";
if (null != dataList_in) {
for (DepotHead depotHead : dataList_in) {
headId = headId + depotHead.getId() + ",";
}
List<DepotHead> dataList_out = depotHeadService.getDepotHeadGiftOut(projectId);
if (null != dataList_out) {
for (DepotHead depotHead : dataList_out) {
headId = headId + depotHead.getId() + ",";
}
}
}
if (headId != "") {
headId = headId.substring(0, headId.lastIndexOf(","));
}
map.put("HeadIds", headId);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 入库出库明细接口
* @param currentPage
* @param pageSize
* @param oId
* @param pid
* @param dids
* @param beginTime
* @param endTime
* @param type
* @param request
* @return
*/
@GetMapping(value = "/findInDetail")
public BaseResponseInfo findInDetail(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("organId") Integer oId,
@RequestParam("projectId") Integer pid,
@RequestParam("depotIds") String dids,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
@RequestParam("type") String type,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>();
List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
int total = depotHeadService.findByAllCount(beginTime, endTime, type, pid, dids, oId);
map.put("total", total);
//存放数据json数组
if (null != list) {
for (DepotHeadVo4InDetail dhd : list) {
resList.add(dhd);
}
}
map.put("rows", resList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 入库出库统计接口
* @param currentPage
* @param pageSize
* @param oId
* @param pid
* @param dids
* @param beginTime
* @param endTime
* @param type
* @param request
* @return
*/
@GetMapping(value = "/findInOutMaterialCount")
public BaseResponseInfo findInOutMaterialCount(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("organId") Integer oId,
@RequestParam("projectId") Integer pid,
@RequestParam("depotIds") String dids,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
@RequestParam("type") String type,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHeadVo4InOutMCount> resList = new ArrayList<DepotHeadVo4InOutMCount>();
List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, pid, dids, oId);
map.put("total", total);
//存放数据json数组
if (null != list) {
for (DepotHeadVo4InOutMCount dhc : list) {
resList.add(dhc);
}
}
map.put("rows", resList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 对账单接口
* @param currentPage
* @param pageSize
* @param beginTime
* @param endTime
* @param organId
* @param supType
* @param request
* @return
*/
@GetMapping(value = "/findStatementAccount")
public BaseResponseInfo findStatementAccount(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
@RequestParam("organId") Integer organId,
@RequestParam("supType") String supType,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
int j = 1;
if (supType.equals("客户")) { //客户
j = 1;
} else if (supType.equals("供应商")) { //供应商
j = -1;
}
List<DepotHeadVo4StatementAccount> resList = new ArrayList<DepotHeadVo4StatementAccount>();
List<DepotHeadVo4StatementAccount> list = depotHeadService.findStatementAccount(beginTime, endTime, organId, supType, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findStatementAccountCount(beginTime, endTime, organId, supType);
map.put("total", total);
//存放数据json数组
if (null != list) {
for (DepotHeadVo4StatementAccount dha : list) {
dha.setNumber(dha.getNumber()); //单据编号
dha.setType(dha.getType()); //类型
String type = dha.getType();
BigDecimal p1 = BigDecimal.ZERO ;
BigDecimal p2 = BigDecimal.ZERO;
if (dha.getDiscountLastMoney() != null) {
p1 = dha.getDiscountLastMoney();
}
if (dha.getChangeAmount() != null) {
p2 = dha.getChangeAmount();
}
BigDecimal allPrice = BigDecimal.ZERO;
if ((p1.compareTo(BigDecimal.ZERO))==-1) {
p1 = p1.abs();
}
if ((p2 .compareTo(BigDecimal.ZERO))==-1) {
p2 = p2.abs();
}
if (type.equals("采购入库")) {
allPrice = p2 .subtract(p1);
} else if (type.equals("销售退货入库")) {
allPrice = p2 .subtract(p1);
} else if (type.equals("销售出库")) {
allPrice = p1 .subtract(p2);
} else if (type.equals("采购退货出库")) {
allPrice = p1 .subtract(p2);
} else if (type.equals("付款")) {
allPrice = p1.add(p2);
} else if (type.equals("收款")) {
allPrice = BigDecimal.ZERO.subtract(p1.add(p2));
} else if (type.equals("收入")) {
allPrice = p1 .subtract(p2);
} else if (type.equals("支出")) {
allPrice = p2 .subtract(p1);
}
dha.setDiscountLastMoney(p1); //金额
dha.setChangeAmount(p2); //金额
DecimalFormat df = new DecimalFormat(".##");
dha.setAllPrice(new BigDecimal(df.format(allPrice .multiply(new BigDecimal(j))))); //计算后的金额
dha.setSupplierName(dha.getSupplierName()); //供应商
dha.setoTime(dha.getoTime()); //入库出库日期
resList.add(dha);
}
}
map.put("rows", resList);
res.code = 200;
res.data = map;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 查询单位的累计应收和累计应付，零售不能计入
* @param supplierId
* @param endTime
* @param supType
* @param request
* @return
*/
@GetMapping(value = "/findTotalPay")
public BaseResponseInfo findTotalPay(@RequestParam("supplierId") Integer supplierId,
@RequestParam("endTime") String endTime,
@RequestParam("supType") String supType,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
JSONObject outer = new JSONObject();
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
int i = 1;
if (supType.equals("customer")) { //客户
i = 1;
} else if (supType.equals("vendor")) { //供应商
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);
res.code = 200;
res.data = map;
} catch (Exception e) {
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 根据编号查询单据信息
* @param number
* @param request
* @return
*/
@GetMapping(value = "/getDetailByNumber")
public BaseResponseInfo getDetailByNumber(@RequestParam("number") String number,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
DepotHeadVo4List dhl = new DepotHeadVo4List();
try {
List<DepotHeadVo4List> list = depotHeadService.getDetailByNumber(number);
if(list.size() == 1) {
dhl = list.get(0);
}
res.code = 200;
res.data = dhl;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 统计总金额
* @param getS
* @param type
* @param subType
* @param mode 合计或者金额
* @return
*/
public BigDecimal allMoney(String getS, String type, String subType, String mode, String endTime) {
BigDecimal allMoney = BigDecimal.ZERO;
try {
Integer supplierId = Integer.valueOf(getS);
BigDecimal sum = depotHeadService.findAllMoney(supplierId, type, subType, mode, endTime);
if(sum != null) {
allMoney = sum;
}
} catch (Exception e) {
e.printStackTrace();
}
//返回正数，如果负数也转为正数
if ((allMoney.compareTo(BigDecimal.ZERO))==-1) {
allMoney = allMoney.abs();
}
return allMoney;
}
}

135
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -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;
}

17
src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -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;
}

15
src/main/java/com/jsh/erp/controller/SupplierController.java
View File

@@ -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;
}

454
src/main/java/com/jsh/erp/datasource/entities/Account.java
View File

@@ -1,227 +1,229 @@
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;
}
}

1503
src/main/java/com/jsh/erp/datasource/entities/AccountExample.java
View File

File diff suppressed because it is too large Load Diff

649
src/main/java/com/jsh/erp/datasource/entities/AccountHead.java
View File

@@ -1,325 +1,326 @@
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();
}
}

1865
src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java
View File

File diff suppressed because it is too large Load Diff

271
src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
View File

@@ -1,136 +1,137 @@
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;
}
}

390
src/main/java/com/jsh/erp/datasource/entities/AccountItem.java
View File

@@ -1,195 +1,197 @@
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();
}
}

1343
src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java
View File

File diff suppressed because it is too large Load Diff

1225
src/main/java/com/jsh/erp/datasource/entities/Asset.java
View File

File diff suppressed because it is too large Load Diff

2725
src/main/java/com/jsh/erp/datasource/entities/AssetExample.java
View File

File diff suppressed because it is too large Load Diff

518
src/main/java/com/jsh/erp/datasource/entities/Depot.java
View File

@@ -1,259 +1,261 @@
package com.jsh.erp.datasource.entities;
public class Depot {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.address
*
* @mbggenerated
*/
private String address;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.warehousing
*
* @mbggenerated
*/
private Double warehousing;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.truckage
*
* @mbggenerated
*/
private Double truckage;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.type
*
* @mbggenerated
*/
private Integer type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.id
*
* @return the value of jsh_depot.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.id
*
* @param id the value for jsh_depot.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_depot.name
*
* @return the value of jsh_depot.name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.name
*
* @param name the value for jsh_depot.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_depot.address
*
* @return the value of jsh_depot.address
*
* @mbggenerated
*/
public String getAddress() {
return address;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.address
*
* @param address the value for jsh_depot.address
*
* @mbggenerated
*/
public void setAddress(String address) {
this.address = address == null ? null : address.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.warehousing
*
* @return the value of jsh_depot.warehousing
*
* @mbggenerated
*/
public Double getWarehousing() {
return warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.warehousing
*
* @param warehousing the value for jsh_depot.warehousing
*
* @mbggenerated
*/
public void setWarehousing(Double warehousing) {
this.warehousing = warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.truckage
*
* @return the value of jsh_depot.truckage
*
* @mbggenerated
*/
public Double getTruckage() {
return truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.truckage
*
* @param truckage the value for jsh_depot.truckage
*
* @mbggenerated
*/
public void setTruckage(Double truckage) {
this.truckage = truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.type
*
* @return the value of jsh_depot.type
*
* @mbggenerated
*/
public Integer getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.type
*
* @param type the value for jsh_depot.type
*
* @mbggenerated
*/
public void setType(Integer type) {
this.type = type;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.sort
*
* @return the value of jsh_depot.sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.sort
*
* @param sort the value for jsh_depot.sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.remark
*
* @return the value of jsh_depot.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.remark
*
* @param remark the value for jsh_depot.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 Depot {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.address
*
* @mbggenerated
*/
private String address;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.warehousing
*
* @mbggenerated
*/
private BigDecimal warehousing;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.truckage
*
* @mbggenerated
*/
private BigDecimal truckage;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.type
*
* @mbggenerated
*/
private Integer type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.id
*
* @return the value of jsh_depot.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.id
*
* @param id the value for jsh_depot.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_depot.name
*
* @return the value of jsh_depot.name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.name
*
* @param name the value for jsh_depot.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_depot.address
*
* @return the value of jsh_depot.address
*
* @mbggenerated
*/
public String getAddress() {
return address;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.address
*
* @param address the value for jsh_depot.address
*
* @mbggenerated
*/
public void setAddress(String address) {
this.address = address == null ? null : address.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.warehousing
*
* @return the value of jsh_depot.warehousing
*
* @mbggenerated
*/
public BigDecimal getWarehousing() {
return warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.warehousing
*
* @param warehousing the value for jsh_depot.warehousing
*
* @mbggenerated
*/
public void setWarehousing(BigDecimal warehousing) {
this.warehousing = warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.truckage
*
* @return the value of jsh_depot.truckage
*
* @mbggenerated
*/
public BigDecimal getTruckage() {
return truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.truckage
*
* @param truckage the value for jsh_depot.truckage
*
* @mbggenerated
*/
public void setTruckage(BigDecimal truckage) {
this.truckage = truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.type
*
* @return the value of jsh_depot.type
*
* @mbggenerated
*/
public Integer getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.type
*
* @param type the value for jsh_depot.type
*
* @mbggenerated
*/
public void setType(Integer type) {
this.type = type;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.sort
*
* @return the value of jsh_depot.sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.sort
*
* @param sort the value for jsh_depot.sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.remark
*
* @return the value of jsh_depot.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.remark
*
* @param remark the value for jsh_depot.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
}

1643
src/main/java/com/jsh/erp/datasource/entities/DepotExample.java
View File

File diff suppressed because it is too large Load Diff

1801
src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View File

File diff suppressed because it is too large Load Diff

4205
src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View File

File diff suppressed because it is too large Load Diff

1478
src/main/java/com/jsh/erp/datasource/entities/DepotItem.java
View File

File diff suppressed because it is too large Load Diff

3543
src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java
View File

File diff suppressed because it is too large Load Diff

511
src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4Material.java
View File

@@ -1,256 +1,257 @@
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class DepotItemVo4Material {
private Long id;
private Long headerid;
private Long materialid;
private String munit;
private Double opernumber;
private Double basicnumber;
private Double unitprice;
private Double taxunitprice;
private Double allprice;
private String remark;
private String img;
private Double incidentals;
private Long depotid;
private Long anotherdepotid;
private Double taxrate;
private Double taxmoney;
private Double taxlastmoney;
private String otherfield1;
private String otherfield2;
private String otherfield3;
private String otherfield4;
private String otherfield5;
private String mtype;
private String mname;
private String mmodel;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getMaterialid() {
return materialid;
}
public void setMaterialid(Long materialid) {
this.materialid = materialid;
}
public String getMunit() {
return munit;
}
public void setMunit(String munit) {
this.munit = munit;
}
public Double getOpernumber() {
return opernumber;
}
public void setOpernumber(Double opernumber) {
this.opernumber = opernumber;
}
public Double getBasicnumber() {
return basicnumber;
}
public void setBasicnumber(Double basicnumber) {
this.basicnumber = basicnumber;
}
public Double getUnitprice() {
return unitprice;
}
public void setUnitprice(Double unitprice) {
this.unitprice = unitprice;
}
public Double getTaxunitprice() {
return taxunitprice;
}
public void setTaxunitprice(Double taxunitprice) {
this.taxunitprice = taxunitprice;
}
public Double getAllprice() {
return allprice;
}
public void setAllprice(Double allprice) {
this.allprice = allprice;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public Double getIncidentals() {
return incidentals;
}
public void setIncidentals(Double incidentals) {
this.incidentals = incidentals;
}
public Long getDepotid() {
return depotid;
}
public void setDepotid(Long depotid) {
this.depotid = depotid;
}
public Long getAnotherdepotid() {
return anotherdepotid;
}
public void setAnotherdepotid(Long anotherdepotid) {
this.anotherdepotid = anotherdepotid;
}
public Double getTaxrate() {
return taxrate;
}
public void setTaxrate(Double taxrate) {
this.taxrate = taxrate;
}
public Double getTaxmoney() {
return taxmoney;
}
public void setTaxmoney(Double taxmoney) {
this.taxmoney = taxmoney;
}
public Double getTaxlastmoney() {
return taxlastmoney;
}
public void setTaxlastmoney(Double taxlastmoney) {
this.taxlastmoney = taxlastmoney;
}
public String getOtherfield1() {
return otherfield1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1;
}
public String getOtherfield2() {
return otherfield2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2;
}
public String getOtherfield3() {
return otherfield3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3;
}
public String getOtherfield4() {
return otherfield4;
}
public void setOtherfield4(String otherfield4) {
this.otherfield4 = otherfield4;
}
public String getOtherfield5() {
return otherfield5;
}
public void setOtherfield5(String otherfield5) {
this.otherfield5 = otherfield5;
}
public String getMtype() {
return mtype;
}
public void setMtype(String mtype) {
this.mtype = mtype;
}
public String getMname() {
return mname;
}
public void setMname(String mname) {
this.mname = mname;
}
public String getMmodel() {
return mmodel;
}
public void setMmodel(String mmodel) {
this.mmodel = mmodel;
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class DepotItemVo4Material {
private Long id;
private Long headerid;
private Long materialid;
private String munit;
private BigDecimal opernumber;
private BigDecimal basicnumber;
private BigDecimal unitprice;
private BigDecimal taxunitprice;
private BigDecimal allprice;
private String remark;
private String img;
private BigDecimal incidentals;
private Long depotid;
private Long anotherdepotid;
private BigDecimal taxrate;
private BigDecimal taxmoney;
private BigDecimal taxlastmoney;
private String otherfield1;
private String otherfield2;
private String otherfield3;
private String otherfield4;
private String otherfield5;
private String mtype;
private String mname;
private String mmodel;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getMaterialid() {
return materialid;
}
public void setMaterialid(Long materialid) {
this.materialid = materialid;
}
public String getMunit() {
return munit;
}
public void setMunit(String munit) {
this.munit = munit;
}
public BigDecimal getOpernumber() {
return opernumber;
}
public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber;
}
public BigDecimal getBasicnumber() {
return basicnumber;
}
public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber;
}
public BigDecimal getUnitprice() {
return unitprice;
}
public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice;
}
public BigDecimal getTaxunitprice() {
return taxunitprice;
}
public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice;
}
public BigDecimal getAllprice() {
return allprice;
}
public void setAllprice(BigDecimal allprice) {
this.allprice = allprice;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public BigDecimal getIncidentals() {
return incidentals;
}
public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals;
}
public Long getDepotid() {
return depotid;
}
public void setDepotid(Long depotid) {
this.depotid = depotid;
}
public Long getAnotherdepotid() {
return anotherdepotid;
}
public void setAnotherdepotid(Long anotherdepotid) {
this.anotherdepotid = anotherdepotid;
}
public BigDecimal getTaxrate() {
return taxrate;
}
public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate;
}
public BigDecimal getTaxmoney() {
return taxmoney;
}
public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney;
}
public BigDecimal getTaxlastmoney() {
return taxlastmoney;
}
public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney;
}
public String getOtherfield1() {
return otherfield1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1;
}
public String getOtherfield2() {
return otherfield2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2;
}
public String getOtherfield3() {
return otherfield3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3;
}
public String getOtherfield4() {
return otherfield4;
}
public void setOtherfield4(String otherfield4) {
this.otherfield4 = otherfield4;
}
public String getOtherfield5() {
return otherfield5;
}
public void setOtherfield5(String otherfield5) {
this.otherfield5 = otherfield5;
}
public String getMtype() {
return mtype;
}
public void setMtype(String mtype) {
this.mtype = mtype;
}
public String getMname() {
return mname;
}
public void setMname(String mname) {
this.mname = mname;
}
public String getMmodel() {
return mmodel;
}
public void setMmodel(String mmodel) {
this.mmodel = mmodel;
}
}

56
src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
View File

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class DepotItemVo4WithInfoEx {
private Long id;
@@ -10,31 +12,31 @@ public class DepotItemVo4WithInfoEx {
private String munit;
private Double opernumber;
private BigDecimal opernumber;
private Double basicnumber;
private BigDecimal basicnumber;
private Double unitprice;
private BigDecimal unitprice;
private Double taxunitprice;
private BigDecimal taxunitprice;
private Double allprice;
private BigDecimal allprice;
private String remark;
private String img;
private Double incidentals;
private BigDecimal incidentals;
private Long depotid;
private Long anotherdepotid;
private Double taxrate;
private BigDecimal taxrate;
private Double taxmoney;
private BigDecimal taxmoney;
private Double taxlastmoney;
private BigDecimal taxlastmoney;
private String otherfield1;
@@ -108,43 +110,43 @@ public class DepotItemVo4WithInfoEx {
this.munit = munit;
}
public Double getOpernumber() {
public BigDecimal getOpernumber() {
return opernumber;
}
public void setOpernumber(Double opernumber) {
public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber;
}
public Double getBasicnumber() {
public BigDecimal getBasicnumber() {
return basicnumber;
}
public void setBasicnumber(Double basicnumber) {
public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber;
}
public Double getUnitprice() {
public BigDecimal getUnitprice() {
return unitprice;
}
public void setUnitprice(Double unitprice) {
public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice;
}
public Double getTaxunitprice() {
public BigDecimal getTaxunitprice() {
return taxunitprice;
}
public void setTaxunitprice(Double taxunitprice) {
public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice;
}
public Double getAllprice() {
public BigDecimal getAllprice() {
return allprice;
}
public void setAllprice(Double allprice) {
public void setAllprice(BigDecimal allprice) {
this.allprice = allprice;
}
@@ -164,11 +166,11 @@ public class DepotItemVo4WithInfoEx {
this.img = img;
}
public Double getIncidentals() {
public BigDecimal getIncidentals() {
return incidentals;
}
public void setIncidentals(Double incidentals) {
public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals;
}
@@ -188,27 +190,27 @@ public class DepotItemVo4WithInfoEx {
this.anotherdepotid = anotherdepotid;
}
public Double getTaxrate() {
public BigDecimal getTaxrate() {
return taxrate;
}
public void setTaxrate(Double taxrate) {
public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate;
}
public Double getTaxmoney() {
public BigDecimal getTaxmoney() {
return taxmoney;
}
public void setTaxmoney(Double taxmoney) {
public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney;
}
public Double getTaxlastmoney() {
public BigDecimal getTaxlastmoney() {
return taxlastmoney;
}
public void setTaxlastmoney(Double taxlastmoney) {
public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney;
}

1478
src/main/java/com/jsh/erp/datasource/entities/Material.java
View File

File diff suppressed because it is too large Load Diff

3623
src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
View File

File diff suppressed because it is too large Load Diff

528
src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
View File

@@ -1,264 +1,266 @@
package com.jsh.erp.datasource.entities;
public class MaterialVo4Unit {
private Long id;
private Long categoryid;
private String name;
private String mfrs;
private Double packing;
private Double safetystock;
private String model;
private String standard;
private String color;
private String unit;
private String remark;
private Double retailprice;
private Double lowprice;
private Double presetpriceone;
private Double presetpricetwo;
private Long unitid;
private String firstoutunit;
private String firstinunit;
private String pricestrategy;
private Boolean enabled;
private String otherfield1;
private String otherfield2;
private String otherfield3;
private String unitName;
private String categoryName;
private String materialOther;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getCategoryid() {
return categoryid;
}
public void setCategoryid(Long categoryid) {
this.categoryid = categoryid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getMfrs() {
return mfrs;
}
public void setMfrs(String mfrs) {
this.mfrs = mfrs;
}
public Double getPacking() {
return packing;
}
public void setPacking(Double packing) {
this.packing = packing;
}
public Double getSafetystock() {
return safetystock;
}
public void setSafetystock(Double safetystock) {
this.safetystock = safetystock;
}
public String getModel() {
return model;
}
public void setModel(String model) {
this.model = model;
}
public String getStandard() {
return standard;
}
public void setStandard(String standard) {
this.standard = standard;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Double getRetailprice() {
return retailprice;
}
public void setRetailprice(Double retailprice) {
this.retailprice = retailprice;
}
public Double getLowprice() {
return lowprice;
}
public void setLowprice(Double lowprice) {
this.lowprice = lowprice;
}
public Double getPresetpriceone() {
return presetpriceone;
}
public void setPresetpriceone(Double presetpriceone) {
this.presetpriceone = presetpriceone;
}
public Double getPresetpricetwo() {
return presetpricetwo;
}
public void setPresetpricetwo(Double presetpricetwo) {
this.presetpricetwo = presetpricetwo;
}
public Long getUnitid() {
return unitid;
}
public void setUnitid(Long unitid) {
this.unitid = unitid;
}
public String getFirstoutunit() {
return firstoutunit;
}
public void setFirstoutunit(String firstoutunit) {
this.firstoutunit = firstoutunit;
}
public String getFirstinunit() {
return firstinunit;
}
public void setFirstinunit(String firstinunit) {
this.firstinunit = firstinunit;
}
public String getPricestrategy() {
return pricestrategy;
}
public void setPricestrategy(String pricestrategy) {
this.pricestrategy = pricestrategy;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
public String getOtherfield1() {
return otherfield1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1;
}
public String getOtherfield2() {
return otherfield2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2;
}
public String getOtherfield3() {
return otherfield3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3;
}
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getMaterialOther() {
return materialOther;
}
public void setMaterialOther(String materialOther) {
this.materialOther = materialOther;
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class MaterialVo4Unit {
private Long id;
private Long categoryid;
private String name;
private String mfrs;
private BigDecimal packing;
private BigDecimal safetystock;
private String model;
private String standard;
private String color;
private String unit;
private String remark;
private BigDecimal retailprice;
private BigDecimal lowprice;
private BigDecimal presetpriceone;
private BigDecimal presetpricetwo;
private Long unitid;
private String firstoutunit;
private String firstinunit;
private String pricestrategy;
private Boolean enabled;
private String otherfield1;
private String otherfield2;
private String otherfield3;
private String unitName;
private String categoryName;
private String materialOther;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getCategoryid() {
return categoryid;
}
public void setCategoryid(Long categoryid) {
this.categoryid = categoryid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getMfrs() {
return mfrs;
}
public void setMfrs(String mfrs) {
this.mfrs = mfrs;
}
public BigDecimal getPacking() {
return packing;
}
public void setPacking(BigDecimal packing) {
this.packing = packing;
}
public BigDecimal getSafetystock() {
return safetystock;
}
public void setSafetystock(BigDecimal safetystock) {
this.safetystock = safetystock;
}
public String getModel() {
return model;
}
public void setModel(String model) {
this.model = model;
}
public String getStandard() {
return standard;
}
public void setStandard(String standard) {
this.standard = standard;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public BigDecimal getRetailprice() {
return retailprice;
}
public void setRetailprice(BigDecimal retailprice) {
this.retailprice = retailprice;
}
public BigDecimal getLowprice() {
return lowprice;
}
public void setLowprice(BigDecimal lowprice) {
this.lowprice = lowprice;
}
public BigDecimal getPresetpriceone() {
return presetpriceone;
}
public void setPresetpriceone(BigDecimal presetpriceone) {
this.presetpriceone = presetpriceone;
}
public BigDecimal getPresetpricetwo() {
return presetpricetwo;
}
public void setPresetpricetwo(BigDecimal presetpricetwo) {
this.presetpricetwo = presetpricetwo;
}
public Long getUnitid() {
return unitid;
}
public void setUnitid(Long unitid) {
this.unitid = unitid;
}
public String getFirstoutunit() {
return firstoutunit;
}
public void setFirstoutunit(String firstoutunit) {
this.firstoutunit = firstoutunit;
}
public String getFirstinunit() {
return firstinunit;
}
public void setFirstinunit(String firstinunit) {
this.firstinunit = firstinunit;
}
public String getPricestrategy() {
return pricestrategy;
}
public void setPricestrategy(String pricestrategy) {
this.pricestrategy = pricestrategy;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
public String getOtherfield1() {
return otherfield1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1;
}
public String getOtherfield2() {
return otherfield2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2;
}
public String getOtherfield3() {
return otherfield3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3;
}
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getMaterialOther() {
return materialOther;
}
public void setMaterialOther(String materialOther) {
this.materialOther = materialOther;
}
}

1350
src/main/java/com/jsh/erp/datasource/entities/Supplier.java
View File

File diff suppressed because it is too large Load Diff

3363
src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java
View File

File diff suppressed because it is too large Load Diff

246
src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java
View File

@@ -1,123 +1,125 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.AccountHead;
import com.jsh.erp.datasource.entities.AccountHeadExample;
import java.util.List;
import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
import org.apache.ibatis.annotations.Param;
public interface AccountHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int countByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insert(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insertSelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
List<AccountHead> selectByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
AccountHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKey(AccountHead record);
List<AccountHeadVo4ListEx> selectByConditionAccountHead(
@Param("type") String type,
@Param("billNo") String billNo,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByAccountHead(
@Param("type") String type,
@Param("billNo") String billNo,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime);
Long getMaxId();
Double findAllMoney(
@Param("supplierId") Integer supplierId,
@Param("type") String type,
@Param("modeName") String modeName,
@Param("endTime") String endTime);
List<AccountHeadVo4ListEx> getDetailByNumber(
@Param("billNo") String billNo);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.AccountHead;
import com.jsh.erp.datasource.entities.AccountHeadExample;
import java.math.BigDecimal;
import java.util.List;
import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
import org.apache.ibatis.annotations.Param;
public interface AccountHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int countByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insert(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insertSelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
List<AccountHead> selectByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
AccountHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKey(AccountHead record);
List<AccountHeadVo4ListEx> selectByConditionAccountHead(
@Param("type") String type,
@Param("billNo") String billNo,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByAccountHead(
@Param("type") String type,
@Param("billNo") String billNo,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime);
Long getMaxId();
BigDecimal findAllMoney(
@Param("supplierId") Integer supplierId,
@Param("type") String type,
@Param("modeName") String modeName,
@Param("endTime") String endTime);
List<AccountHeadVo4ListEx> getDetailByNumber(
@Param("billNo") String billNo);
}

370
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View File

@@ -1,185 +1,187 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.util.List;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
import org.apache.ibatis.annotations.Param;
public interface DepotHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int countByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int deleteByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int insert(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int insertSelective(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
List<DepotHead> selectByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
DepotHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotHead record);
List<DepotHeadVo4List> selectByConditionDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds);
Long getMaxId();
String findMaterialsListByHeaderId(
@Param("id") Long id);
List<DepotHeadVo4InDetail> findByAll(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4InOutMCount> findInOutMaterialCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findInOutMaterialCountTotal(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4StatementAccount> findStatementAccount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStatementAccountCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType);
Double findAllMoney(
@Param("supplierId") Integer supplierId,
@Param("type") String type,
@Param("subType") String subType,
@Param("modeName") String modeName,
@Param("endTime") String endTime);
List<DepotHeadVo4List> getDetailByNumber(
@Param("number") String number);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.math.BigDecimal;
import java.util.List;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
import org.apache.ibatis.annotations.Param;
public interface DepotHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int countByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int deleteByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int insert(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int insertSelective(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
List<DepotHead> selectByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
DepotHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotHead record);
List<DepotHeadVo4List> selectByConditionDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds);
Long getMaxId();
String findMaterialsListByHeaderId(
@Param("id") Long id);
List<DepotHeadVo4InDetail> findByAll(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4InOutMCount> findInOutMaterialCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findInOutMaterialCountTotal(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4StatementAccount> findStatementAccount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStatementAccountCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType);
BigDecimal findAllMoney(
@Param("supplierId") Integer supplierId,
@Param("type") String type,
@Param("subType") String subType,
@Param("modeName") String modeName,
@Param("endTime") String endTime);
List<DepotHeadVo4List> getDetailByNumber(
@Param("number") String number);
}

433
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
View File

@@ -1,217 +1,218 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.*;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DepotItemMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int countByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insert(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insertSelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
List<DepotItem> selectByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
DepotItem selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotItem record);
List<DepotItem> selectByConditionDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark);
List<DepotItemVo4HeaderId> getHeaderIdByMaterial(
@Param("materialParam") String materialParam,
@Param("depotIds") String depotIds);
List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
@Param("mId") Long mId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findDetailByTypeAndMaterialIdCounts(
@Param("mId") Long mId);
List<DepotItemVo4Material> findStockNumByMaterialIdList(
@Param("mId") Long mId,
@Param("monthTime") String monthTime,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStockNumByMaterialIdCounts(
@Param("mId") Long mId,
@Param("monthTime") String monthTime);
int findByTypeAndMaterialIdIn(
@Param("mId") Long mId);
int findByTypeAndMaterialIdOut(
@Param("mId") Long mId);
List<DepotItemVo4WithInfoEx> getDetailList(
@Param("headerId") Long headerId);
List<DepotItemVo4WithInfoEx> findByAll(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds);
Double findByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double findByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double findByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double findByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double findPriceByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double findPriceByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double findPriceByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double findPriceByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
Double buyOrSaleNumber(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
Double buyOrSalePrice(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
Double findGiftByTypeIn(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
Double findGiftByTypeOut(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.*;
import java.math.BigDecimal;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DepotItemMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int countByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insert(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insertSelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
List<DepotItem> selectByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
DepotItem selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotItem record);
List<DepotItem> selectByConditionDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark);
List<DepotItemVo4HeaderId> getHeaderIdByMaterial(
@Param("materialParam") String materialParam,
@Param("depotIds") String depotIds);
List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
@Param("mId") Long mId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findDetailByTypeAndMaterialIdCounts(
@Param("mId") Long mId);
List<DepotItemVo4Material> findStockNumByMaterialIdList(
@Param("mId") Long mId,
@Param("monthTime") String monthTime,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStockNumByMaterialIdCounts(
@Param("mId") Long mId,
@Param("monthTime") String monthTime);
int findByTypeAndMaterialIdIn(
@Param("mId") Long mId);
int findByTypeAndMaterialIdOut(
@Param("mId") Long mId);
List<DepotItemVo4WithInfoEx> getDetailList(
@Param("headerId") Long headerId);
List<DepotItemVo4WithInfoEx> findByAll(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds);
BigDecimal findByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal buyOrSaleNumber(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
BigDecimal buyOrSalePrice(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
BigDecimal findGiftByTypeIn(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
BigDecimal findGiftByTypeOut(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
}

168
src/main/java/com/jsh/erp/datasource/vo/AccountItemVo4List.java
View File

@@ -1,84 +1,86 @@
package com.jsh.erp.datasource.vo;
public class AccountItemVo4List {
private Long id;
private Long headerid;
private Long accountid;
private Long inoutitemid;
private Double eachamount;
private String remark;
private String accountName;
private String inOutItemName;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public Long getInoutitemid() {
return inoutitemid;
}
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
public Double getEachamount() {
return eachamount;
}
public void setEachamount(Double eachamount) {
this.eachamount = eachamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getAccountName() {
return accountName;
}
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public String getInOutItemName() {
return inOutItemName;
}
public void setInOutItemName(String inOutItemName) {
this.inOutItemName = inOutItemName;
}
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class AccountItemVo4List {
private Long id;
private Long headerid;
private Long accountid;
private Long inoutitemid;
private BigDecimal eachamount;
private String remark;
private String accountName;
private String inOutItemName;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public Long getInoutitemid() {
return inoutitemid;
}
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
public BigDecimal getEachamount() {
return eachamount;
}
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getAccountName() {
return accountName;
}
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public String getInOutItemName() {
return inOutItemName;
}
public void setInOutItemName(String inOutItemName) {
this.inOutItemName = inOutItemName;
}
}

168
src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java
View File

@@ -1,84 +1,86 @@
package com.jsh.erp.datasource.vo;
public class AccountVo4InOutList {
private String number;
private String type;
private String supplierName;
private Double changeAmount;
private Double balance;
private String operTime;
private String aList;
private String amList;
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public Double getChangeAmount() {
return changeAmount;
}
public void setChangeAmount(Double changeAmount) {
this.changeAmount = changeAmount;
}
public Double getBalance() {
return balance;
}
public void setBalance(Double balance) {
this.balance = balance;
}
public String getOperTime() {
return operTime;
}
public void setOperTime(String operTime) {
this.operTime = operTime;
}
public String getaList() {
return aList;
}
public void setaList(String aList) {
this.aList = aList;
}
public String getAmList() {
return amList;
}
public void setAmList(String amList) {
this.amList = amList;
}
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class AccountVo4InOutList {
private String number;
private String type;
private String supplierName;
private BigDecimal changeAmount;
private BigDecimal balance;
private String operTime;
private String aList;
private String amList;
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public BigDecimal getChangeAmount() {
return changeAmount;
}
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
public BigDecimal getBalance() {
return balance;
}
public void setBalance(BigDecimal balance) {
this.balance = balance;
}
public String getOperTime() {
return operTime;
}
public void setOperTime(String operTime) {
this.operTime = operTime;
}
public String getaList() {
return aList;
}
public void setaList(String aList) {
this.aList = aList;
}
public String getAmList() {
return amList;
}
public void setAmList(String amList) {
this.amList = amList;
}
}

168
src/main/java/com/jsh/erp/datasource/vo/AccountVo4List.java
View File

@@ -1,84 +1,86 @@
package com.jsh.erp.datasource.vo;
public class AccountVo4List {
private Long id;
private String name;
private String serialno;
private Double initialamount;
private Double currentamount;
private String remark;
private Boolean isdefault;
private String thismonthamount;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSerialno() {
return serialno;
}
public void setSerialno(String serialno) {
this.serialno = serialno;
}
public Double getInitialamount() {
return initialamount;
}
public void setInitialamount(Double initialamount) {
this.initialamount = initialamount;
}
public Double getCurrentamount() {
return currentamount;
}
public void setCurrentamount(Double currentamount) {
this.currentamount = currentamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Boolean getIsdefault() {
return isdefault;
}
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
public String getThismonthamount() {
return thismonthamount;
}
public void setThismonthamount(String thismonthamount) {
this.thismonthamount = thismonthamount;
}
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class AccountVo4List {
private Long id;
private String name;
private String serialno;
private BigDecimal initialamount;
private BigDecimal currentamount;
private String remark;
private Boolean isdefault;
private String thismonthamount;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSerialno() {
return serialno;
}
public void setSerialno(String serialno) {
this.serialno = serialno;
}
public BigDecimal getInitialamount() {
return initialamount;
}
public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount;
}
public BigDecimal getCurrentamount() {
return currentamount;
}
public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Boolean getIsdefault() {
return isdefault;
}
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
public String getThismonthamount() {
return thismonthamount;
}
public void setThismonthamount(String thismonthamount) {
this.thismonthamount = thismonthamount;
}
}

213
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java
View File

@@ -1,107 +1,108 @@
package com.jsh.erp.datasource.vo;
import java.util.Date;
public class DepotHeadVo4InDetail {
private String Number;
private String MName;
private String Model;
private Double UnitPrice;
private Double OperNumber;
private Double AllPrice;
private String SName;
private String DName;
private String OperTime;
private String NewType;
public String getNumber() {
return Number;
}
public void setNumber(String number) {
Number = number;
}
public String getMName() {
return MName;
}
public void setMName(String MName) {
this.MName = MName;
}
public String getModel() {
return Model;
}
public void setModel(String model) {
Model = model;
}
public Double getUnitPrice() {
return UnitPrice;
}
public void setUnitPrice(Double unitPrice) {
UnitPrice = unitPrice;
}
public Double getOperNumber() {
return OperNumber;
}
public void setOperNumber(Double operNumber) {
OperNumber = operNumber;
}
public Double getAllPrice() {
return AllPrice;
}
public void setAllPrice(Double allPrice) {
AllPrice = allPrice;
}
public String getSName() {
return SName;
}
public void setSName(String SName) {
this.SName = SName;
}
public String getDName() {
return DName;
}
public void setDName(String DName) {
this.DName = DName;
}
public String getOperTime() {
return OperTime;
}
public void setOperTime(String operTime) {
OperTime = operTime;
}
public String getNewType() {
return NewType;
}
public void setNewType(String newType) {
NewType = newType;
}
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import java.util.Date;
public class DepotHeadVo4InDetail {
private String Number;
private String MName;
private String Model;
private BigDecimal UnitPrice;
private BigDecimal OperNumber;
private BigDecimal AllPrice;
private String SName;
private String DName;
private String OperTime;
private String NewType;
public String getNumber() {
return Number;
}
public void setNumber(String number) {
Number = number;
}
public String getMName() {
return MName;
}
public void setMName(String MName) {
this.MName = MName;
}
public String getModel() {
return Model;
}
public void setModel(String model) {
Model = model;
}
public BigDecimal getUnitPrice() {
return UnitPrice;
}
public void setUnitPrice(BigDecimal unitPrice) {
UnitPrice = unitPrice;
}
public BigDecimal getOperNumber() {
return OperNumber;
}
public void setOperNumber(BigDecimal operNumber) {
OperNumber = operNumber;
}
public BigDecimal getAllPrice() {
return AllPrice;
}
public void setAllPrice(BigDecimal allPrice) {
AllPrice = allPrice;
}
public String getSName() {
return SName;
}
public void setSName(String SName) {
this.SName = SName;
}
public String getDName() {
return DName;
}
public void setDName(String DName) {
this.DName = DName;
}
public String getOperTime() {
return OperTime;
}
public void setOperTime(String operTime) {
OperTime = operTime;
}
public String getNewType() {
return NewType;
}
public void setNewType(String newType) {
NewType = newType;
}
}

130
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java
View File

@@ -1,65 +1,67 @@
package com.jsh.erp.datasource.vo;
public class DepotHeadVo4InOutMCount {
private Long MaterialId;
private String mName;
private String Model;
private String categoryName;
private Double numSum;
private Double priceSum;
public Long getMaterialId() {
return MaterialId;
}
public void setMaterialId(Long materialId) {
MaterialId = materialId;
}
public String getmName() {
return mName;
}
public void setmName(String mName) {
this.mName = mName;
}
public String getModel() {
return Model;
}
public void setModel(String model) {
Model = model;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public Double getNumSum() {
return numSum;
}
public void setNumSum(Double numSum) {
this.numSum = numSum;
}
public Double getPriceSum() {
return priceSum;
}
public void setPriceSum(Double priceSum) {
this.priceSum = priceSum;
}
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class DepotHeadVo4InOutMCount {
private Long MaterialId;
private String mName;
private String Model;
private String categoryName;
private BigDecimal numSum;
private BigDecimal priceSum;
public Long getMaterialId() {
return MaterialId;
}
public void setMaterialId(Long materialId) {
MaterialId = materialId;
}
public String getmName() {
return mName;
}
public void setmName(String mName) {
this.mName = mName;
}
public String getModel() {
return Model;
}
public void setModel(String model) {
Model = model;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public BigDecimal getNumSum() {
return numSum;
}
public void setNumSum(BigDecimal numSum) {
this.numSum = numSum;
}
public BigDecimal getPriceSum() {
return priceSum;
}
public void setPriceSum(BigDecimal priceSum) {
this.priceSum = priceSum;
}
}

691
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View File

@@ -1,346 +1,347 @@
package com.jsh.erp.datasource.vo;
import java.util.Date;
public class DepotHeadVo4List {
private Long id;
private String type;
private String subtype;
private Long projectid;
private String defaultnumber;
private String number;
private String operpersonname;
private Date createtime;
private Date opertime;
private Long organid;
private Long handspersonid;
private Long accountid;
private Double changeamount;
private Long allocationprojectid;
private Double totalprice;
private String paytype;
private String remark;
private String salesman;
private String accountidlist;
private String accountmoneylist;
private Double discount;
private Double discountmoney;
private Double discountlastmoney;
private Double othermoney;
private String othermoneylist;
private String othermoneyitem;
private Integer accountday;
private Boolean status;
private String projectName;
private String organName;
private String handsPersonName;
private String accountName;
private String allocationProjectName;
private String materialsList;
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 String getSubtype() {
return subtype;
}
public void setSubtype(String subtype) {
this.subtype = subtype;
}
public Long getProjectid() {
return projectid;
}
public void setProjectid(Long projectid) {
this.projectid = projectid;
}
public String getDefaultnumber() {
return defaultnumber;
}
public void setDefaultnumber(String defaultnumber) {
this.defaultnumber = defaultnumber;
}
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getOperpersonname() {
return operpersonname;
}
public void setOperpersonname(String operpersonname) {
this.operpersonname = operpersonname;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Date getOpertime() {
return opertime;
}
public void setOpertime(Date opertime) {
this.opertime = opertime;
}
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 Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public Double getChangeamount() {
return changeamount;
}
public void setChangeamount(Double changeamount) {
this.changeamount = changeamount;
}
public Long getAllocationprojectid() {
return allocationprojectid;
}
public void setAllocationprojectid(Long allocationprojectid) {
this.allocationprojectid = allocationprojectid;
}
public Double getTotalprice() {
return totalprice;
}
public void setTotalprice(Double totalprice) {
this.totalprice = totalprice;
}
public String getPaytype() {
return paytype;
}
public void setPaytype(String paytype) {
this.paytype = paytype;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getSalesman() {
return salesman;
}
public void setSalesman(String salesman) {
this.salesman = salesman;
}
public String getAccountidlist() {
return accountidlist;
}
public void setAccountidlist(String accountidlist) {
this.accountidlist = accountidlist;
}
public String getAccountmoneylist() {
return accountmoneylist;
}
public void setAccountmoneylist(String accountmoneylist) {
this.accountmoneylist = accountmoneylist;
}
public Double getDiscount() {
return discount;
}
public void setDiscount(Double discount) {
this.discount = discount;
}
public Double getDiscountmoney() {
return discountmoney;
}
public void setDiscountmoney(Double discountmoney) {
this.discountmoney = discountmoney;
}
public Double getDiscountlastmoney() {
return discountlastmoney;
}
public void setDiscountlastmoney(Double discountlastmoney) {
this.discountlastmoney = discountlastmoney;
}
public Double getOthermoney() {
return othermoney;
}
public void setOthermoney(Double othermoney) {
this.othermoney = othermoney;
}
public String getOthermoneylist() {
return othermoneylist;
}
public void setOthermoneylist(String othermoneylist) {
this.othermoneylist = othermoneylist;
}
public String getOthermoneyitem() {
return othermoneyitem;
}
public void setOthermoneyitem(String othermoneyitem) {
this.othermoneyitem = othermoneyitem;
}
public Integer getAccountday() {
return accountday;
}
public void setAccountday(Integer accountday) {
this.accountday = accountday;
}
public Boolean getStatus() {
return status;
}
public void setStatus(Boolean status) {
this.status = status;
}
public String getProjectName() {
return projectName;
}
public void setProjectName(String projectName) {
this.projectName = projectName;
}
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;
}
public String getAllocationProjectName() {
return allocationProjectName;
}
public void setAllocationProjectName(String allocationProjectName) {
this.allocationProjectName = allocationProjectName;
}
public String getMaterialsList() {
return materialsList;
}
public void setMaterialsList(String materialsList) {
this.materialsList = materialsList;
}
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import java.util.Date;
public class DepotHeadVo4List {
private Long id;
private String type;
private String subtype;
private Long projectid;
private String defaultnumber;
private String number;
private String operpersonname;
private Date createtime;
private Date opertime;
private Long organid;
private Long handspersonid;
private Long accountid;
private BigDecimal changeamount;
private Long allocationprojectid;
private BigDecimal totalprice;
private String paytype;
private String remark;
private String salesman;
private String accountidlist;
private String accountmoneylist;
private BigDecimal discount;
private BigDecimal discountmoney;
private BigDecimal discountlastmoney;
private BigDecimal othermoney;
private String othermoneylist;
private String othermoneyitem;
private Integer accountday;
private Boolean status;
private String projectName;
private String organName;
private String handsPersonName;
private String accountName;
private String allocationProjectName;
private String materialsList;
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 String getSubtype() {
return subtype;
}
public void setSubtype(String subtype) {
this.subtype = subtype;
}
public Long getProjectid() {
return projectid;
}
public void setProjectid(Long projectid) {
this.projectid = projectid;
}
public String getDefaultnumber() {
return defaultnumber;
}
public void setDefaultnumber(String defaultnumber) {
this.defaultnumber = defaultnumber;
}
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getOperpersonname() {
return operpersonname;
}
public void setOperpersonname(String operpersonname) {
this.operpersonname = operpersonname;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Date getOpertime() {
return opertime;
}
public void setOpertime(Date opertime) {
this.opertime = opertime;
}
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 Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public BigDecimal getChangeamount() {
return changeamount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
}
public Long getAllocationprojectid() {
return allocationprojectid;
}
public void setAllocationprojectid(Long allocationprojectid) {
this.allocationprojectid = allocationprojectid;
}
public BigDecimal getTotalprice() {
return totalprice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
}
public String getPaytype() {
return paytype;
}
public void setPaytype(String paytype) {
this.paytype = paytype;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getSalesman() {
return salesman;
}
public void setSalesman(String salesman) {
this.salesman = salesman;
}
public String getAccountidlist() {
return accountidlist;
}
public void setAccountidlist(String accountidlist) {
this.accountidlist = accountidlist;
}
public String getAccountmoneylist() {
return accountmoneylist;
}
public void setAccountmoneylist(String accountmoneylist) {
this.accountmoneylist = accountmoneylist;
}
public BigDecimal getDiscount() {
return discount;
}
public void setDiscount(BigDecimal discount) {
this.discount = discount;
}
public BigDecimal getDiscountmoney() {
return discountmoney;
}
public void setDiscountmoney(BigDecimal discountmoney) {
this.discountmoney = discountmoney;
}
public BigDecimal getDiscountlastmoney() {
return discountlastmoney;
}
public void setDiscountlastmoney(BigDecimal discountlastmoney) {
this.discountlastmoney = discountlastmoney;
}
public BigDecimal getOthermoney() {
return othermoney;
}
public void setOthermoney(BigDecimal othermoney) {
this.othermoney = othermoney;
}
public String getOthermoneylist() {
return othermoneylist;
}
public void setOthermoneylist(String othermoneylist) {
this.othermoneylist = othermoneylist;
}
public String getOthermoneyitem() {
return othermoneyitem;
}
public void setOthermoneyitem(String othermoneyitem) {
this.othermoneyitem = othermoneyitem;
}
public Integer getAccountday() {
return accountday;
}
public void setAccountday(Integer accountday) {
this.accountday = accountday;
}
public Boolean getStatus() {
return status;
}
public void setStatus(Boolean status) {
this.status = status;
}
public String getProjectName() {
return projectName;
}
public void setProjectName(String projectName) {
this.projectName = projectName;
}
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;
}
public String getAllocationProjectName() {
return allocationProjectName;
}
public void setAllocationProjectName(String allocationProjectName) {
this.allocationProjectName = allocationProjectName;
}
public String getMaterialsList() {
return materialsList;
}
public void setMaterialsList(String materialsList) {
this.materialsList = materialsList;
}
}

150
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4StatementAccount.java
View File

@@ -1,75 +1,77 @@
package com.jsh.erp.datasource.vo;
public class DepotHeadVo4StatementAccount {
private String number;
private String type;
private Double discountLastMoney;
private Double changeAmount;
private Double allPrice;
private String supplierName;
private String oTime;
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Double getDiscountLastMoney() {
return discountLastMoney;
}
public void setDiscountLastMoney(Double discountLastMoney) {
this.discountLastMoney = discountLastMoney;
}
public Double getChangeAmount() {
return changeAmount;
}
public void setChangeAmount(Double changeAmount) {
this.changeAmount = changeAmount;
}
public Double getAllPrice() {
return allPrice;
}
public void setAllPrice(Double allPrice) {
this.allPrice = allPrice;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getoTime() {
return oTime;
}
public void setoTime(String oTime) {
this.oTime = oTime;
}
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class DepotHeadVo4StatementAccount {
private String number;
private String type;
private BigDecimal discountLastMoney;
private BigDecimal changeAmount;
private BigDecimal allPrice;
private String supplierName;
private String oTime;
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public BigDecimal getDiscountLastMoney() {
return discountLastMoney;
}
public void setDiscountLastMoney(BigDecimal discountLastMoney) {
this.discountLastMoney = discountLastMoney;
}
public BigDecimal getChangeAmount() {
return changeAmount;
}
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
public BigDecimal getAllPrice() {
return allPrice;
}
public void setAllPrice(BigDecimal allPrice) {
this.allPrice = allPrice;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getoTime() {
return oTime;
}
public void setoTime(String oTime) {
this.oTime = oTime;
}
}

34
src/main/java/com/jsh/erp/service/account/AccountService.java
View File

@@ -1,6 +1,5 @@
package com.jsh.erp.service.account;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.datasource.mappers.AccountHeadMapper;
@@ -19,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -56,13 +56,13 @@ public class AccountService {
if (null != list && null !=timeStr) {
for (AccountVo4List al : list) {
DecimalFormat df = new DecimalFormat(".##");
Double thisMonthAmount = getAccountSum(al.getId(), timeStr, "month") + getAccountSumByHead(al.getId(), timeStr, "month") + getAccountSumByDetail(al.getId(), timeStr, "month") + getManyAccountSum(al.getId(), timeStr, "month");
BigDecimal thisMonthAmount = getAccountSum(al.getId(), timeStr, "month").add(getAccountSumByHead(al.getId(), timeStr, "month")).add(getAccountSumByDetail(al.getId(), timeStr, "month")).add(getManyAccountSum(al.getId(), timeStr, "month"));
String thisMonthAmountFmt = "0";
if (thisMonthAmount != 0) {
if ((thisMonthAmount.compareTo(BigDecimal.ZERO))!=0) {
thisMonthAmountFmt = df.format(thisMonthAmount);
}
al.setThismonthamount(thisMonthAmountFmt); //本月发生额
Double currentAmount = getAccountSum(al.getId(), "", "month") + getAccountSumByHead(al.getId(), "", "month") + getAccountSumByDetail(al.getId(), "", "month") + getManyAccountSum(al.getId(), "", "month") + al.getInitialamount();
BigDecimal currentAmount = getAccountSum(al.getId(), "", "month").add(getAccountSumByHead(al.getId(), "", "month")).add(getAccountSumByDetail(al.getId(), "", "month")).add(getManyAccountSum(al.getId(), "", "month")) .add(al.getInitialamount()) ;
al.setCurrentamount(currentAmount);
resList.add(al);
}
@@ -78,7 +78,7 @@ public class AccountService {
public int insertAccount(String beanJson, HttpServletRequest request) {
Account account = JSONObject.parseObject(beanJson, Account.class);
if(account.getInitialamount() == null) {
account.setInitialamount(0d);
account.setInitialamount(BigDecimal.ZERO);
}
account.setIsdefault(false);
return accountMapper.insertSelective(account);
@@ -123,8 +123,8 @@ public class AccountService {
* @param id
* @return
*/
public Double getAccountSum(Long id, String timeStr, String type) {
Double accountSum = 0.0;
public BigDecimal getAccountSum(Long id, String timeStr, String type) {
BigDecimal accountSum = BigDecimal.ZERO;
try {
DepotHeadExample example = new DepotHeadExample();
if (!timeStr.equals("")) {
@@ -145,7 +145,7 @@ public class AccountService {
if (dataList != null) {
for (DepotHead depotHead : dataList) {
if(depotHead.getChangeamount()!=null) {
accountSum = accountSum + depotHead.getChangeamount();
accountSum = accountSum .add(depotHead.getChangeamount()) ;
}
}
}
@@ -161,8 +161,8 @@ public class AccountService {
* @param id
* @return
*/
public Double getAccountSumByHead(Long id, String timeStr, String type) {
Double accountSum = 0.0;
public BigDecimal getAccountSumByHead(Long id, String timeStr, String type) {
BigDecimal accountSum = BigDecimal.ZERO;
try {
AccountHeadExample example = new AccountHeadExample();
if (!timeStr.equals("")) {
@@ -183,7 +183,7 @@ public class AccountService {
if (dataList != null) {
for (AccountHead accountHead : dataList) {
if(accountHead.getChangeamount()!=null) {
accountSum = accountSum + accountHead.getChangeamount();
accountSum = accountSum.add(accountHead.getChangeamount());
}
}
}
@@ -199,8 +199,8 @@ public class AccountService {
* @param id
* @return
*/
public Double getAccountSumByDetail(Long id, String timeStr, String type) {
Double accountSum = 0.0;
public BigDecimal getAccountSumByDetail(Long id, String timeStr, String type) {
BigDecimal accountSum =BigDecimal.ZERO ;
try {
AccountHeadExample example = new AccountHeadExample();
if (!timeStr.equals("")) {
@@ -234,7 +234,7 @@ public class AccountService {
if (dataListOne != null) {
for (AccountItem accountItem : dataListOne) {
if(accountItem.getEachamount()!=null) {
accountSum = accountSum + accountItem.getEachamount();
accountSum = accountSum.add(accountItem.getEachamount());
}
}
}
@@ -253,8 +253,8 @@ public class AccountService {
* @param id
* @return
*/
public Double getManyAccountSum(Long id, String timeStr, String type) {
Double accountSum = 0.0;
public BigDecimal getManyAccountSum(Long id, String timeStr, String type) {
BigDecimal accountSum = BigDecimal.ZERO;
try {
DepotHeadExample example = new DepotHeadExample();
if (!timeStr.equals("")) {
@@ -282,7 +282,7 @@ public class AccountService {
String[] amList = accountMoneyList.split(",");
for (int i = 0; i < aList.length; i++) {
if (aList[i].toString().equals(id.toString())) {
accountSum = accountSum + Double.parseDouble(amList[i].toString());
accountSum = accountSum .add(new BigDecimal(amList[i]));
}
}
}

11
src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
View File

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -39,10 +40,10 @@ public class AccountHeadService {
if (null != list) {
for (AccountHeadVo4ListEx ah : list) {
if(ah.getChangeamount() != null) {
ah.setChangeamount(Math.abs(ah.getChangeamount()));
ah.setChangeamount(ah.getChangeamount().abs());
}
if(ah.getTotalprice() != null) {
ah.setTotalprice(Math.abs(ah.getTotalprice()));
ah.setTotalprice(ah.getTotalprice().abs());
}
resList.add(ah);
}
@@ -91,7 +92,7 @@ public class AccountHeadService {
return accountHeadMapper.getMaxId();
}
public Double findAllMoney(Integer supplierId, String type, String mode, String endTime) {
public BigDecimal findAllMoney(Integer supplierId, String type, String mode, String endTime) {
String modeName = "";
if (mode.equals("实际")) {
modeName = "ChangeAmount";
@@ -107,10 +108,10 @@ public class AccountHeadService {
if (null != list) {
for (AccountHeadVo4ListEx ah : list) {
if(ah.getChangeamount() != null) {
ah.setChangeamount(Math.abs(ah.getChangeamount()));
ah.setChangeamount(ah.getChangeamount().abs());
}
if(ah.getTotalprice() != null) {
ah.setTotalprice(Math.abs(ah.getTotalprice()));
ah.setTotalprice(ah.getTotalprice().abs());
}
resList.add(ah);
}

13
src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
View File

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.List;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
@@ -108,13 +109,13 @@ public class AccountItemService {
accountItem.setInoutitemid(tempInsertedJson.getLong("InOutItemId"));
}
if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) {
Double eachAmount = tempInsertedJson.getDouble("EachAmount");
BigDecimal eachAmount = tempInsertedJson.getBigDecimal("EachAmount");
if (listType.equals("付款")) {
eachAmount = 0 - eachAmount;
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
}
accountItem.setEachamount(eachAmount);
} else {
accountItem.setEachamount(0.0);
accountItem.setEachamount(BigDecimal.ZERO);
}
accountItem.setRemark(tempInsertedJson.getString("Remark"));
this.insertAccountItemWithObj(accountItem);
@@ -139,13 +140,13 @@ public class AccountItemService {
accountItem.setInoutitemid(tempUpdatedJson.getLong("InOutItemId"));
}
if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) {
Double eachAmount = tempUpdatedJson.getDouble("EachAmount");
BigDecimal eachAmount = tempUpdatedJson.getBigDecimal("EachAmount");
if (listType.equals("付款")) {
eachAmount = 0 - eachAmount;
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
}
accountItem.setEachamount(eachAmount);
} else {
accountItem.setEachamount(0.0);
accountItem.setEachamount(BigDecimal.ZERO);
}
accountItem.setRemark(tempUpdatedJson.getString("Remark"));
this.updateAccountItemWithObj(accountItem);

11
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
@@ -54,10 +55,10 @@ public class DepotHeadService {
dh.setOthermoneyitem(otherMoneyItemStr);
}
if(dh.getChangeamount() != null) {
dh.setChangeamount(Math.abs(dh.getChangeamount()));
dh.setChangeamount(dh.getChangeamount().abs());
}
if(dh.getTotalprice() != null) {
dh.setTotalprice(Math.abs(dh.getTotalprice()));
dh.setTotalprice(dh.getTotalprice().abs());
}
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh);
@@ -213,7 +214,7 @@ public class DepotHeadService {
return depotHeadMapper.findStatementAccountCount(beginTime, endTime, organId, supType);
}
public Double findAllMoney(Integer supplierId, String type, String subType, String mode, String endTime) {
public BigDecimal findAllMoney(Integer supplierId, String type, String subType, String mode, String endTime) {
String modeName = "";
if (mode.equals("实际")) {
modeName = "ChangeAmount";
@@ -237,10 +238,10 @@ public class DepotHeadService {
dh.setOthermoneyitem(otherMoneyItemStr);
}
if(dh.getChangeamount() != null) {
dh.setChangeamount(Math.abs(dh.getChangeamount()));
dh.setChangeamount(dh.getChangeamount().abs());
}
if(dh.getTotalprice() != null) {
dh.setTotalprice(Math.abs(dh.getTotalprice()));
dh.setTotalprice(dh.getTotalprice().abs());
}
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh);

45
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -157,7 +158,7 @@ public class DepotItemService {
return depotItemMapper.findByAllCount(headIds, materialIds);
}
public Double findByType(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
public BigDecimal findByType(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
if (TYPE.equals(type)) {
if (isPrev) {
return depotItemMapper.findByTypeInIsPrev(ProjectId, MId, MonthTime);
@@ -173,7 +174,7 @@ public class DepotItemService {
}
}
public Double findPriceByType(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
public BigDecimal findPriceByType(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
if (TYPE.equals(type)) {
if (isPrev) {
return depotItemMapper.findPriceByTypeInIsPrev(ProjectId, MId, MonthTime);
@@ -189,7 +190,7 @@ public class DepotItemService {
}
}
public Double buyOrSale(String type, String subType, Long MId, String MonthTime, String sumType) {
public BigDecimal buyOrSale(String type, String subType, Long MId, String MonthTime, String sumType) {
if (SUM_TYPE.equals(sumType)) {
return depotItemMapper.buyOrSaleNumber(type, subType, MId, MonthTime, sumType);
} else {
@@ -197,7 +198,7 @@ public class DepotItemService {
}
}
public Double findGiftByType(String subType, Integer ProjectId, Long MId, String type) {
public BigDecimal findGiftByType(String subType, Integer ProjectId, Long MId, String type) {
if (IN.equals(type)) {
return depotItemMapper.findGiftByTypeIn(subType, ProjectId, MId);
} else {
@@ -219,10 +220,10 @@ public class DepotItemService {
depotItem.setMaterialid(tempInsertedJson.getLong("MaterialId"));
depotItem.setMunit(tempInsertedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempInsertedJson.getDouble("OperNumber"));
depotItem.setOpernumber(tempInsertedJson.getBigDecimal("OperNumber"));
try {
String Unit = tempInsertedJson.get("Unit").toString();
Double oNumber = tempInsertedJson.getDouble("OperNumber");
BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString());
//以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称
@@ -235,7 +236,7 @@ public class DepotItemService {
if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位
depotItem.setBasicnumber(oNumber * ratio); //数量乘以比例
depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例
}
} else {
depotItem.setBasicnumber(oNumber); //其他情况
@@ -245,13 +246,13 @@ public class DepotItemService {
}
}
if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) {
depotItem.setUnitprice(tempInsertedJson.getDouble("UnitPrice"));
depotItem.setUnitprice(tempInsertedJson.getBigDecimal("UnitPrice"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) {
depotItem.setTaxunitprice(tempInsertedJson.getDouble("TaxUnitPrice"));
depotItem.setTaxunitprice(tempInsertedJson.getBigDecimal("TaxUnitPrice"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) {
depotItem.setAllprice(tempInsertedJson.getDouble("AllPrice"));
depotItem.setAllprice(tempInsertedJson.getBigDecimal("AllPrice"));
}
depotItem.setRemark(tempInsertedJson.getString("Remark"));
if (tempInsertedJson.get("DepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("DepotId").toString())) {
@@ -261,13 +262,13 @@ public class DepotItemService {
depotItem.setAnotherdepotid(tempInsertedJson.getLong("AnotherDepotId"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxRate").toString())) {
depotItem.setTaxrate(tempInsertedJson.getDouble("TaxRate"));
depotItem.setTaxrate(tempInsertedJson.getBigDecimal("TaxRate"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) {
depotItem.setTaxmoney(tempInsertedJson.getDouble("TaxMoney"));
depotItem.setTaxmoney(tempInsertedJson.getBigDecimal("TaxMoney"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
depotItem.setTaxlastmoney(tempInsertedJson.getDouble("TaxLastMoney"));
depotItem.setTaxlastmoney(tempInsertedJson.getBigDecimal("TaxLastMoney"));
}
if (tempInsertedJson.get("OtherField1") != null) {
depotItem.setOtherfield1(tempInsertedJson.getString("OtherField1"));
@@ -304,10 +305,10 @@ public class DepotItemService {
depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId"));
depotItem.setMunit(tempUpdatedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempUpdatedJson.getDouble("OperNumber"));
depotItem.setOpernumber(tempUpdatedJson.getBigDecimal("OperNumber"));
try {
String Unit = tempUpdatedJson.get("Unit").toString();
Double oNumber = tempUpdatedJson.getDouble("OperNumber");
BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
//以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称
@@ -320,7 +321,7 @@ public class DepotItemService {
if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位
depotItem.setBasicnumber(oNumber * ratio); //数量乘以比例
depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例
}
} else {
depotItem.setBasicnumber(oNumber); //其他情况
@@ -330,13 +331,13 @@ public class DepotItemService {
}
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) {
depotItem.setUnitprice(tempUpdatedJson.getDouble("UnitPrice"));
depotItem.setUnitprice(tempUpdatedJson.getBigDecimal("UnitPrice"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())) {
depotItem.setTaxunitprice(tempUpdatedJson.getDouble("TaxUnitPrice"));
depotItem.setTaxunitprice(tempUpdatedJson.getBigDecimal("TaxUnitPrice"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("AllPrice").toString())) {
depotItem.setAllprice(tempUpdatedJson.getDouble("AllPrice"));
depotItem.setAllprice(tempUpdatedJson.getBigDecimal("AllPrice"));
}
depotItem.setRemark(tempUpdatedJson.getString("Remark"));
if (tempUpdatedJson.get("DepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("DepotId").toString())) {
@@ -346,13 +347,13 @@ public class DepotItemService {
depotItem.setAnotherdepotid(tempUpdatedJson.getLong("AnotherDepotId"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxRate").toString())) {
depotItem.setTaxrate(tempUpdatedJson.getDouble("TaxRate"));
depotItem.setTaxrate(tempUpdatedJson.getBigDecimal("TaxRate"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxMoney").toString())) {
depotItem.setTaxmoney(tempUpdatedJson.getDouble("TaxMoney"));
depotItem.setTaxmoney(tempUpdatedJson.getBigDecimal("TaxMoney"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())) {
depotItem.setTaxlastmoney(tempUpdatedJson.getDouble("TaxLastMoney"));
depotItem.setTaxlastmoney(tempUpdatedJson.getBigDecimal("TaxLastMoney"));
}
depotItem.setOtherfield1(tempUpdatedJson.getString("OtherField1"));
depotItem.setOtherfield2(tempUpdatedJson.getString("OtherField2"));

5
src/main/java/com/jsh/erp/service/supplier/SupplierService.java
View File

@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
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;
@@ -75,9 +76,9 @@ public class SupplierService {
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateAdvanceIn(Long supplierId, Double advanceIn){
public int updateAdvanceIn(Long supplierId, BigDecimal advanceIn){
Supplier supplier = supplierMapper.selectByPrimaryKey(supplierId);
supplier.setAdvancein(supplier.getAdvancein() + advanceIn); //增加预收款的金额，可能增加的是负值
supplier.setAdvancein(supplier.getAdvancein().add(advanceIn)); //增加预收款的金额，可能增加的是负值
return supplierMapper.updateByPrimaryKeySelective(supplier);
}

30
src/main/resources/mapper_xml/AccountHeadMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountHead">
<!--
@@ -10,8 +10,8 @@
<result column="Type" jdbcType="VARCHAR" property="type" />
<result column="OrganId" jdbcType="BIGINT" property="organid" />
<result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
<result column="ChangeAmount" jdbcType="DOUBLE" property="changeamount" />
<result column="TotalPrice" jdbcType="DOUBLE" property="totalprice" />
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
<result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
<result column="AccountId" jdbcType="BIGINT" property="accountid" />
<result column="BillNo" jdbcType="VARCHAR" property="billno" />
<result column="BillTime" jdbcType="TIMESTAMP" property="billtime" />
@@ -147,7 +147,7 @@
AccountId, BillNo, BillTime,
Remark)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organid,jdbcType=BIGINT},
#{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DOUBLE}, #{totalprice,jdbcType=DOUBLE},
#{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, #{totalprice,jdbcType=DECIMAL},
#{accountid,jdbcType=BIGINT}, #{billno,jdbcType=VARCHAR}, #{billtime,jdbcType=TIMESTAMP},
#{remark,jdbcType=VARCHAR})
</insert>
@@ -203,10 +203,10 @@
#{handspersonid,jdbcType=BIGINT},
</if>
<if test="changeamount != null">
#{changeamount,jdbcType=DOUBLE},
#{changeamount,jdbcType=DECIMAL},
</if>
<if test="totalprice != null">
#{totalprice,jdbcType=DOUBLE},
#{totalprice,jdbcType=DECIMAL},
</if>
<if test="accountid != null">
#{accountid,jdbcType=BIGINT},
@@ -252,10 +252,10 @@
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
</if>
<if test="record.changeamount != null">
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
</if>
<if test="record.totalprice != null">
TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
</if>
<if test="record.accountid != null">
AccountId = #{record.accountid,jdbcType=BIGINT},
@@ -284,8 +284,8 @@
Type = #{record.type,jdbcType=VARCHAR},
OrganId = #{record.organid,jdbcType=BIGINT},
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
AccountId = #{record.accountid,jdbcType=BIGINT},
BillNo = #{record.billno,jdbcType=VARCHAR},
BillTime = #{record.billtime,jdbcType=TIMESTAMP},
@@ -311,10 +311,10 @@
HandsPersonId = #{handspersonid,jdbcType=BIGINT},
</if>
<if test="changeamount != null">
ChangeAmount = #{changeamount,jdbcType=DOUBLE},
ChangeAmount = #{changeamount,jdbcType=DECIMAL},
</if>
<if test="totalprice != null">
TotalPrice = #{totalprice,jdbcType=DOUBLE},
TotalPrice = #{totalprice,jdbcType=DECIMAL},
</if>
<if test="accountid != null">
AccountId = #{accountid,jdbcType=BIGINT},
@@ -340,8 +340,8 @@
set Type = #{type,jdbcType=VARCHAR},
OrganId = #{organid,jdbcType=BIGINT},
HandsPersonId = #{handspersonid,jdbcType=BIGINT},
ChangeAmount = #{changeamount,jdbcType=DOUBLE},
TotalPrice = #{totalprice,jdbcType=DOUBLE},
ChangeAmount = #{changeamount,jdbcType=DECIMAL},
TotalPrice = #{totalprice,jdbcType=DECIMAL},
AccountId = #{accountid,jdbcType=BIGINT},
BillNo = #{billno,jdbcType=VARCHAR},
BillTime = #{billtime,jdbcType=TIMESTAMP},

12
src/main/resources/mapper_xml/AccountHeadMapperEx.xml
View File

@@ -22,10 +22,10 @@
and ah.Type='${type}'
</if>
<if test="beginTime != null">
and ah.BillTime gt;= '%${beginTime}%'
and ah.BillTime &gt;= '%${beginTime}%'
</if>
<if test="endTime != null">
and ah.BillTime lt;= '%${endTime}%'
and ah.BillTime &lt;= '%${endTime}%'
</if>
order by ah.Id desc
<if test="offset != null and rows != null">
@@ -46,10 +46,10 @@
and Type='${type}'
</if>
<if test="beginTime != null">
and BillTime gt;= '%${beginTime}%'
and BillTime &gt;= '%${beginTime}%'
</if>
<if test="endTime != null">
and BillTime lt;= '%${endTime}%'
and BillTime &lt;= '%${endTime}%'
</if>
</select>
@@ -57,9 +57,9 @@
select max(Id) as Id from jsh_accounthead
</select>
<select id="findAllMoney" resultType="java.lang.Double">
<select id="findAllMoney" resultType="java.math.BigDecimal">
select sum(${modeName}) as allMoney from jsh_accounthead where Type='${type}'
and OrganId =${supplierId} and BillTime &lt;='${endTime}'
and OrganId =${supplierId} and BillTime <![CDATA[ <='${endTime}']]>
</select>
<select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">

18
src/main/resources/mapper_xml/AccountItemMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.AccountItemMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountItem">
<!--
@@ -10,7 +10,7 @@
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
<result column="AccountId" jdbcType="BIGINT" property="accountid" />
<result column="InOutItemId" jdbcType="BIGINT" property="inoutitemid" />
<result column="EachAmount" jdbcType="DOUBLE" property="eachamount" />
<result column="EachAmount" jdbcType="DECIMAL" property="eachamount" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
</resultMap>
<sql id="Example_Where_Clause">
@@ -141,7 +141,7 @@
InOutItemId, EachAmount, Remark
)
values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT},
#{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR}
#{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
@@ -184,7 +184,7 @@
#{inoutitemid,jdbcType=BIGINT},
</if>
<if test="eachamount != null">
#{eachamount,jdbcType=DOUBLE},
#{eachamount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
@@ -221,7 +221,7 @@
InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
</if>
<if test="record.eachamount != null">
EachAmount = #{record.eachamount,jdbcType=DOUBLE},
EachAmount = #{record.eachamount,jdbcType=DECIMAL},
</if>
<if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR},
@@ -241,7 +241,7 @@
HeaderId = #{record.headerid,jdbcType=BIGINT},
AccountId = #{record.accountid,jdbcType=BIGINT},
InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
EachAmount = #{record.eachamount,jdbcType=DOUBLE},
EachAmount = #{record.eachamount,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@@ -264,7 +264,7 @@
InOutItemId = #{inoutitemid,jdbcType=BIGINT},
</if>
<if test="eachamount != null">
EachAmount = #{eachamount,jdbcType=DOUBLE},
EachAmount = #{eachamount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR},
@@ -281,7 +281,7 @@
set HeaderId = #{headerid,jdbcType=BIGINT},
AccountId = #{accountid,jdbcType=BIGINT},
InOutItemId = #{inoutitemid,jdbcType=BIGINT},
EachAmount = #{eachamount,jdbcType=DOUBLE},
EachAmount = #{eachamount,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT}
</update>

30
src/main/resources/mapper_xml/AccountMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.AccountMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Account">
<!--
@@ -9,8 +9,8 @@
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="SerialNo" jdbcType="VARCHAR" property="serialno" />
<result column="InitialAmount" jdbcType="DOUBLE" property="initialamount" />
<result column="CurrentAmount" jdbcType="DOUBLE" property="currentamount" />
<result column="InitialAmount" jdbcType="DECIMAL" property="initialamount" />
<result column="CurrentAmount" jdbcType="DECIMAL" property="currentamount" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="IsDefault" jdbcType="BIT" property="isdefault" />
</resultMap>
@@ -142,7 +142,7 @@
InitialAmount, CurrentAmount, Remark,
IsDefault)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialno,jdbcType=VARCHAR},
#{initialamount,jdbcType=DOUBLE}, #{currentamount,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR},
#{initialamount,jdbcType=DECIMAL}, #{currentamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR},
#{isdefault,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
@@ -185,10 +185,10 @@
#{serialno,jdbcType=VARCHAR},
</if>
<if test="initialamount != null">
#{initialamount,jdbcType=DOUBLE},
#{initialamount,jdbcType=DECIMAL},
</if>
<if test="currentamount != null">
#{currentamount,jdbcType=DOUBLE},
#{currentamount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
@@ -225,10 +225,10 @@
SerialNo = #{record.serialno,jdbcType=VARCHAR},
</if>
<if test="record.initialamount != null">
InitialAmount = #{record.initialamount,jdbcType=DOUBLE},
InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
</if>
<if test="record.currentamount != null">
CurrentAmount = #{record.currentamount,jdbcType=DOUBLE},
CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
</if>
<if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR},
@@ -250,8 +250,8 @@
set Id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR},
SerialNo = #{record.serialno,jdbcType=VARCHAR},
InitialAmount = #{record.initialamount,jdbcType=DOUBLE},
CurrentAmount = #{record.currentamount,jdbcType=DOUBLE},
InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR},
IsDefault = #{record.isdefault,jdbcType=BIT}
<if test="_parameter != null">
@@ -272,10 +272,10 @@
SerialNo = #{serialno,jdbcType=VARCHAR},
</if>
<if test="initialamount != null">
InitialAmount = #{initialamount,jdbcType=DOUBLE},
InitialAmount = #{initialamount,jdbcType=DECIMAL},
</if>
<if test="currentamount != null">
CurrentAmount = #{currentamount,jdbcType=DOUBLE},
CurrentAmount = #{currentamount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR},
@@ -294,8 +294,8 @@
update jsh_account
set Name = #{name,jdbcType=VARCHAR},
SerialNo = #{serialno,jdbcType=VARCHAR},
InitialAmount = #{initialamount,jdbcType=DOUBLE},
CurrentAmount = #{currentamount,jdbcType=DOUBLE},
InitialAmount = #{initialamount,jdbcType=DECIMAL},
CurrentAmount = #{currentamount,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR},
IsDefault = #{isdefault,jdbcType=BIT}
where Id = #{id,jdbcType=BIGINT}

2
src/main/resources/mapper_xml/AccountMapperEx.xml
View File

@@ -9,7 +9,7 @@
<result column="Number" jdbcType="VARCHAR" property="number" />
<result column="newType" jdbcType="VARCHAR" property="type" />
<result column="supplier" jdbcType="VARCHAR" property="supplierName" />
<result column="ChangeAmount" jdbcType="DOUBLE" property="changeAmount" />
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeAmount" />
<result column="oTime" jdbcType="VARCHAR" property="operTime" />
<result column="AList" jdbcType="VARCHAR" property="aList" />
<result column="AMList" jdbcType="VARCHAR" property="amList" />

22
src/main/resources/mapper_xml/AssetMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.AssetMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Asset">
<!--
@@ -12,7 +12,7 @@
<result column="labels" jdbcType="VARCHAR" property="labels" />
<result column="status" jdbcType="SMALLINT" property="status" />
<result column="userID" jdbcType="BIGINT" property="userid" />
<result column="price" jdbcType="DOUBLE" property="price" />
<result column="price" jdbcType="DECIMAL" property="price" />
<result column="purchasedate" jdbcType="TIMESTAMP" property="purchasedate" />
<result column="periodofvalidity" jdbcType="TIMESTAMP" property="periodofvalidity" />
<result column="warrantydate" jdbcType="TIMESTAMP" property="warrantydate" />
@@ -195,7 +195,7 @@
addMonth)
values (#{id,jdbcType=BIGINT}, #{assetnameid,jdbcType=BIGINT}, #{location,jdbcType=VARCHAR},
#{labels,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, #{userid,jdbcType=BIGINT},
#{price,jdbcType=DOUBLE}, #{purchasedate,jdbcType=TIMESTAMP}, #{periodofvalidity,jdbcType=TIMESTAMP},
#{price,jdbcType=DECIMAL}, #{purchasedate,jdbcType=TIMESTAMP}, #{periodofvalidity,jdbcType=TIMESTAMP},
#{warrantydate,jdbcType=TIMESTAMP}, #{assetnum,jdbcType=VARCHAR}, #{serialnum,jdbcType=VARCHAR},
#{supplier,jdbcType=BIGINT}, #{createtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT},
#{updatetime,jdbcType=TIMESTAMP}, #{updator,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR},
@@ -286,7 +286,7 @@
#{userid,jdbcType=BIGINT},
</if>
<if test="price != null">
#{price,jdbcType=DOUBLE},
#{price,jdbcType=DECIMAL},
</if>
<if test="purchasedate != null">
#{purchasedate,jdbcType=TIMESTAMP},
@@ -362,7 +362,7 @@
userID = #{record.userid,jdbcType=BIGINT},
</if>
<if test="record.price != null">
price = #{record.price,jdbcType=DOUBLE},
price = #{record.price,jdbcType=DECIMAL},
</if>
<if test="record.purchasedate != null">
purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
@@ -417,7 +417,7 @@
labels = #{record.labels,jdbcType=VARCHAR},
status = #{record.status,jdbcType=SMALLINT},
userID = #{record.userid,jdbcType=BIGINT},
price = #{record.price,jdbcType=DOUBLE},
price = #{record.price,jdbcType=DECIMAL},
purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP},
@@ -446,7 +446,7 @@
labels = #{record.labels,jdbcType=VARCHAR},
status = #{record.status,jdbcType=SMALLINT},
userID = #{record.userid,jdbcType=BIGINT},
price = #{record.price,jdbcType=DOUBLE},
price = #{record.price,jdbcType=DECIMAL},
purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP},
@@ -484,7 +484,7 @@
userID = #{userid,jdbcType=BIGINT},
</if>
<if test="price != null">
price = #{price,jdbcType=DOUBLE},
price = #{price,jdbcType=DECIMAL},
</if>
<if test="purchasedate != null">
purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
@@ -536,7 +536,7 @@
labels = #{labels,jdbcType=VARCHAR},
status = #{status,jdbcType=SMALLINT},
userID = #{userid,jdbcType=BIGINT},
price = #{price,jdbcType=DOUBLE},
price = #{price,jdbcType=DECIMAL},
purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{warrantydate,jdbcType=TIMESTAMP},
@@ -562,7 +562,7 @@
labels = #{labels,jdbcType=VARCHAR},
status = #{status,jdbcType=SMALLINT},
userID = #{userid,jdbcType=BIGINT},
price = #{price,jdbcType=DOUBLE},
price = #{price,jdbcType=DECIMAL},
purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{warrantydate,jdbcType=TIMESTAMP},

82
src/main/resources/mapper_xml/DepotHeadMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
<!--
@@ -18,18 +18,18 @@
<result column="OrganId" jdbcType="BIGINT" property="organid" />
<result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
<result column="AccountId" jdbcType="BIGINT" property="accountid" />
<result column="ChangeAmount" jdbcType="DOUBLE" property="changeamount" />
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
<result column="AllocationProjectId" jdbcType="BIGINT" property="allocationprojectid" />
<result column="TotalPrice" jdbcType="DOUBLE" property="totalprice" />
<result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
<result column="PayType" jdbcType="VARCHAR" property="paytype" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="Salesman" jdbcType="VARCHAR" property="salesman" />
<result column="AccountIdList" jdbcType="VARCHAR" property="accountidlist" />
<result column="AccountMoneyList" jdbcType="VARCHAR" property="accountmoneylist" />
<result column="Discount" jdbcType="DOUBLE" property="discount" />
<result column="DiscountMoney" jdbcType="DOUBLE" property="discountmoney" />
<result column="DiscountLastMoney" jdbcType="DOUBLE" property="discountlastmoney" />
<result column="OtherMoney" jdbcType="DOUBLE" property="othermoney" />
<result column="Discount" jdbcType="DECIMAL" property="discount" />
<result column="DiscountMoney" jdbcType="DECIMAL" property="discountmoney" />
<result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountlastmoney" />
<result column="OtherMoney" jdbcType="DECIMAL" property="othermoney" />
<result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
<result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
<result column="AccountDay" jdbcType="INTEGER" property="accountday" />
@@ -176,10 +176,10 @@
#{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
#{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
#{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT},
#{changeamount,jdbcType=DOUBLE}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DOUBLE},
#{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL},
#{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR},
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DOUBLE},
#{discountmoney,jdbcType=DOUBLE}, #{discountlastmoney,jdbcType=DOUBLE}, #{othermoney,jdbcType=DOUBLE},
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
#{status,jdbcType=BIT})
</insert>
@@ -313,13 +313,13 @@
#{accountid,jdbcType=BIGINT},
</if>
<if test="changeamount != null">
#{changeamount,jdbcType=DOUBLE},
#{changeamount,jdbcType=DECIMAL},
</if>
<if test="allocationprojectid != null">
#{allocationprojectid,jdbcType=BIGINT},
</if>
<if test="totalprice != null">
#{totalprice,jdbcType=DOUBLE},
#{totalprice,jdbcType=DECIMAL},
</if>
<if test="paytype != null">
#{paytype,jdbcType=VARCHAR},
@@ -337,16 +337,16 @@
#{accountmoneylist,jdbcType=VARCHAR},
</if>
<if test="discount != null">
#{discount,jdbcType=DOUBLE},
#{discount,jdbcType=DECIMAL},
</if>
<if test="discountmoney != null">
#{discountmoney,jdbcType=DOUBLE},
#{discountmoney,jdbcType=DECIMAL},
</if>
<if test="discountlastmoney != null">
#{discountlastmoney,jdbcType=DOUBLE},
#{discountlastmoney,jdbcType=DECIMAL},
</if>
<if test="othermoney != null">
#{othermoney,jdbcType=DOUBLE},
#{othermoney,jdbcType=DECIMAL},
</if>
<if test="othermoneylist != null">
#{othermoneylist,jdbcType=VARCHAR},
@@ -416,13 +416,13 @@
AccountId = #{record.accountid,jdbcType=BIGINT},
</if>
<if test="record.changeamount != null">
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
</if>
<if test="record.allocationprojectid != null">
AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
</if>
<if test="record.totalprice != null">
TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
</if>
<if test="record.paytype != null">
PayType = #{record.paytype,jdbcType=VARCHAR},
@@ -440,16 +440,16 @@
AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
</if>
<if test="record.discount != null">
Discount = #{record.discount,jdbcType=DOUBLE},
Discount = #{record.discount,jdbcType=DECIMAL},
</if>
<if test="record.discountmoney != null">
DiscountMoney = #{record.discountmoney,jdbcType=DOUBLE},
DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
</if>
<if test="record.discountlastmoney != null">
DiscountLastMoney = #{record.discountlastmoney,jdbcType=DOUBLE},
DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
</if>
<if test="record.othermoney != null">
OtherMoney = #{record.othermoney,jdbcType=DOUBLE},
OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
</if>
<if test="record.othermoneylist != null">
OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
@@ -486,18 +486,18 @@
OrganId = #{record.organid,jdbcType=BIGINT},
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
AccountId = #{record.accountid,jdbcType=BIGINT},
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
PayType = #{record.paytype,jdbcType=VARCHAR},
Remark = #{record.remark,jdbcType=VARCHAR},
Salesman = #{record.salesman,jdbcType=VARCHAR},
AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
Discount = #{record.discount,jdbcType=DOUBLE},
DiscountMoney = #{record.discountmoney,jdbcType=DOUBLE},
DiscountLastMoney = #{record.discountlastmoney,jdbcType=DOUBLE},
OtherMoney = #{record.othermoney,jdbcType=DOUBLE},
Discount = #{record.discount,jdbcType=DECIMAL},
DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
AccountDay = #{record.accountday,jdbcType=INTEGER},
@@ -547,13 +547,13 @@
AccountId = #{accountid,jdbcType=BIGINT},
</if>
<if test="changeamount != null">
ChangeAmount = #{changeamount,jdbcType=DOUBLE},
ChangeAmount = #{changeamount,jdbcType=DECIMAL},
</if>
<if test="allocationprojectid != null">
AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
</if>
<if test="totalprice != null">
TotalPrice = #{totalprice,jdbcType=DOUBLE},
TotalPrice = #{totalprice,jdbcType=DECIMAL},
</if>
<if test="paytype != null">
PayType = #{paytype,jdbcType=VARCHAR},
@@ -571,16 +571,16 @@
AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
</if>
<if test="discount != null">
Discount = #{discount,jdbcType=DOUBLE},
Discount = #{discount,jdbcType=DECIMAL},
</if>
<if test="discountmoney != null">
DiscountMoney = #{discountmoney,jdbcType=DOUBLE},
DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
</if>
<if test="discountlastmoney != null">
DiscountLastMoney = #{discountlastmoney,jdbcType=DOUBLE},
DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
</if>
<if test="othermoney != null">
OtherMoney = #{othermoney,jdbcType=DOUBLE},
OtherMoney = #{othermoney,jdbcType=DECIMAL},
</if>
<if test="othermoneylist != null">
OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
@@ -614,18 +614,18 @@
OrganId = #{organid,jdbcType=BIGINT},
HandsPersonId = #{handspersonid,jdbcType=BIGINT},
AccountId = #{accountid,jdbcType=BIGINT},
ChangeAmount = #{changeamount,jdbcType=DOUBLE},
ChangeAmount = #{changeamount,jdbcType=DECIMAL},
AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
TotalPrice = #{totalprice,jdbcType=DOUBLE},
TotalPrice = #{totalprice,jdbcType=DECIMAL},
PayType = #{paytype,jdbcType=VARCHAR},
Remark = #{remark,jdbcType=VARCHAR},
Salesman = #{salesman,jdbcType=VARCHAR},
AccountIdList = #{accountidlist,jdbcType=VARCHAR},
AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
Discount = #{discount,jdbcType=DOUBLE},
DiscountMoney = #{discountmoney,jdbcType=DOUBLE},
DiscountLastMoney = #{discountlastmoney,jdbcType=DOUBLE},
OtherMoney = #{othermoney,jdbcType=DOUBLE},
Discount = #{discount,jdbcType=DECIMAL},
DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
OtherMoney = #{othermoney,jdbcType=DECIMAL},
OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
AccountDay = #{accountday,jdbcType=INTEGER},

16
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -14,9 +14,9 @@
<result column="Number" jdbcType="VARCHAR" property="Number" />
<result column="MName" jdbcType="VARCHAR" property="MName" />
<result column="Model" jdbcType="VARCHAR" property="Model" />
<result column="UnitPrice" jdbcType="DOUBLE" property="UnitPrice" />
<result column="OperNumber" jdbcType="DOUBLE" property="OperNumber" />
<result column="AllPrice" jdbcType="DOUBLE" property="AllPrice" />
<result column="UnitPrice" jdbcType="DECIMAL" property="UnitPrice" />
<result column="OperNumber" jdbcType="DECIMAL" property="OperNumber" />
<result column="AllPrice" jdbcType="DECIMAL" property="AllPrice" />
<result column="SName" jdbcType="VARCHAR" property="SName" />
<result column="DName" jdbcType="VARCHAR" property="DName" />
<result column="OperTime" jdbcType="VARCHAR" property="OperTime" />
@@ -28,15 +28,15 @@
<result column="mName" jdbcType="VARCHAR" property="mName" />
<result column="Model" jdbcType="VARCHAR" property="Model" />
<result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
<result column="numSum" jdbcType="DOUBLE" property="numSum" />
<result column="priceSum" jdbcType="DOUBLE" property="priceSum" />
<result column="numSum" jdbcType="DECIMAL" property="numSum" />
<result column="priceSum" jdbcType="DECIMAL" property="priceSum" />
</resultMap>
<resultMap id="ResultStatementAccount" type="com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount">
<result column="Number" jdbcType="VARCHAR" property="number" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="DiscountLastMoney" jdbcType="DOUBLE" property="discountLastMoney" />
<result column="ChangeAmount" jdbcType="DOUBLE" property="changeAmount" />
<result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountLastMoney" />
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeAmount" />
<result column="supplierName" jdbcType="VARCHAR" property="supplierName" />
<result column="oTime" jdbcType="VARCHAR" property="oTime" />
</resultMap>
@@ -262,7 +262,7 @@
) cc
</select>
<select id="findAllMoney" resultType="java.lang.Double">
<select id="findAllMoney" resultType="java.math.BigDecimal">
select sum(${modeName}) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
and OrganId =${supplierId} and OperTime &lt;='${endTime}'
</select>

122
src/main/resources/mapper_xml/DepotItemMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotItem">
<!--
@@ -10,19 +10,19 @@
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
<result column="MaterialId" jdbcType="BIGINT" property="materialid" />
<result column="MUnit" jdbcType="VARCHAR" property="munit" />
<result column="OperNumber" jdbcType="DOUBLE" property="opernumber" />
<result column="BasicNumber" jdbcType="DOUBLE" property="basicnumber" />
<result column="UnitPrice" jdbcType="DOUBLE" property="unitprice" />
<result column="TaxUnitPrice" jdbcType="DOUBLE" property="taxunitprice" />
<result column="AllPrice" jdbcType="DOUBLE" property="allprice" />
<result column="OperNumber" jdbcType="DECIMAL" property="opernumber" />
<result column="BasicNumber" jdbcType="DECIMAL" property="basicnumber" />
<result column="UnitPrice" jdbcType="DECIMAL" property="unitprice" />
<result column="TaxUnitPrice" jdbcType="DECIMAL" property="taxunitprice" />
<result column="AllPrice" jdbcType="DECIMAL" property="allprice" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="Img" jdbcType="VARCHAR" property="img" />
<result column="Incidentals" jdbcType="DOUBLE" property="incidentals" />
<result column="Incidentals" jdbcType="DECIMAL" property="incidentals" />
<result column="DepotId" jdbcType="BIGINT" property="depotid" />
<result column="AnotherDepotId" jdbcType="BIGINT" property="anotherdepotid" />
<result column="TaxRate" jdbcType="DOUBLE" property="taxrate" />
<result column="TaxMoney" jdbcType="DOUBLE" property="taxmoney" />
<result column="TaxLastMoney" jdbcType="DOUBLE" property="taxlastmoney" />
<result column="TaxRate" jdbcType="DECIMAL" property="taxrate" />
<result column="TaxMoney" jdbcType="DECIMAL" property="taxmoney" />
<result column="TaxLastMoney" jdbcType="DECIMAL" property="taxlastmoney" />
<result column="OtherField1" jdbcType="VARCHAR" property="otherfield1" />
<result column="OtherField2" jdbcType="VARCHAR" property="otherfield2" />
<result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" />
@@ -165,11 +165,11 @@
OtherField2, OtherField3, OtherField4,
OtherField5, MType)
values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT},
#{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DOUBLE}, #{basicnumber,jdbcType=DOUBLE},
#{unitprice,jdbcType=DOUBLE}, #{taxunitprice,jdbcType=DOUBLE}, #{allprice,jdbcType=DOUBLE},
#{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{incidentals,jdbcType=DOUBLE},
#{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DOUBLE},
#{taxmoney,jdbcType=DOUBLE}, #{taxlastmoney,jdbcType=DOUBLE}, #{otherfield1,jdbcType=VARCHAR},
#{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DECIMAL}, #{basicnumber,jdbcType=DECIMAL},
#{unitprice,jdbcType=DECIMAL}, #{taxunitprice,jdbcType=DECIMAL}, #{allprice,jdbcType=DECIMAL},
#{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{incidentals,jdbcType=DECIMAL},
#{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DECIMAL},
#{taxmoney,jdbcType=DECIMAL}, #{taxlastmoney,jdbcType=DECIMAL}, #{otherfield1,jdbcType=VARCHAR},
#{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{otherfield4,jdbcType=VARCHAR},
#{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR})
</insert>
@@ -264,19 +264,19 @@
#{munit,jdbcType=VARCHAR},
</if>
<if test="opernumber != null">
#{opernumber,jdbcType=DOUBLE},
#{opernumber,jdbcType=DECIMAL},
</if>
<if test="basicnumber != null">
#{basicnumber,jdbcType=DOUBLE},
#{basicnumber,jdbcType=DECIMAL},
</if>
<if test="unitprice != null">
#{unitprice,jdbcType=DOUBLE},
#{unitprice,jdbcType=DECIMAL},
</if>
<if test="taxunitprice != null">
#{taxunitprice,jdbcType=DOUBLE},
#{taxunitprice,jdbcType=DECIMAL},
</if>
<if test="allprice != null">
#{allprice,jdbcType=DOUBLE},
#{allprice,jdbcType=DECIMAL},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
@@ -285,7 +285,7 @@
#{img,jdbcType=VARCHAR},
</if>
<if test="incidentals != null">
#{incidentals,jdbcType=DOUBLE},
#{incidentals,jdbcType=DECIMAL},
</if>
<if test="depotid != null">
#{depotid,jdbcType=BIGINT},
@@ -294,13 +294,13 @@
#{anotherdepotid,jdbcType=BIGINT},
</if>
<if test="taxrate != null">
#{taxrate,jdbcType=DOUBLE},
#{taxrate,jdbcType=DECIMAL},
</if>
<if test="taxmoney != null">
#{taxmoney,jdbcType=DOUBLE},
#{taxmoney,jdbcType=DECIMAL},
</if>
<if test="taxlastmoney != null">
#{taxlastmoney,jdbcType=DOUBLE},
#{taxlastmoney,jdbcType=DECIMAL},
</if>
<if test="otherfield1 != null">
#{otherfield1,jdbcType=VARCHAR},
@@ -352,19 +352,19 @@
MUnit = #{record.munit,jdbcType=VARCHAR},
</if>
<if test="record.opernumber != null">
OperNumber = #{record.opernumber,jdbcType=DOUBLE},
OperNumber = #{record.opernumber,jdbcType=DECIMAL},
</if>
<if test="record.basicnumber != null">
BasicNumber = #{record.basicnumber,jdbcType=DOUBLE},
BasicNumber = #{record.basicnumber,jdbcType=DECIMAL},
</if>
<if test="record.unitprice != null">
UnitPrice = #{record.unitprice,jdbcType=DOUBLE},
UnitPrice = #{record.unitprice,jdbcType=DECIMAL},
</if>
<if test="record.taxunitprice != null">
TaxUnitPrice = #{record.taxunitprice,jdbcType=DOUBLE},
TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL},
</if>
<if test="record.allprice != null">
AllPrice = #{record.allprice,jdbcType=DOUBLE},
AllPrice = #{record.allprice,jdbcType=DECIMAL},
</if>
<if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR},
@@ -373,7 +373,7 @@
Img = #{record.img,jdbcType=VARCHAR},
</if>
<if test="record.incidentals != null">
Incidentals = #{record.incidentals,jdbcType=DOUBLE},
Incidentals = #{record.incidentals,jdbcType=DECIMAL},
</if>
<if test="record.depotid != null">
DepotId = #{record.depotid,jdbcType=BIGINT},
@@ -382,13 +382,13 @@
AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT},
</if>
<if test="record.taxrate != null">
TaxRate = #{record.taxrate,jdbcType=DOUBLE},
TaxRate = #{record.taxrate,jdbcType=DECIMAL},
</if>
<if test="record.taxmoney != null">
TaxMoney = #{record.taxmoney,jdbcType=DOUBLE},
TaxMoney = #{record.taxmoney,jdbcType=DECIMAL},
</if>
<if test="record.taxlastmoney != null">
TaxLastMoney = #{record.taxlastmoney,jdbcType=DOUBLE},
TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL},
</if>
<if test="record.otherfield1 != null">
OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
@@ -423,19 +423,19 @@
HeaderId = #{record.headerid,jdbcType=BIGINT},
MaterialId = #{record.materialid,jdbcType=BIGINT},
MUnit = #{record.munit,jdbcType=VARCHAR},
OperNumber = #{record.opernumber,jdbcType=DOUBLE},
BasicNumber = #{record.basicnumber,jdbcType=DOUBLE},
UnitPrice = #{record.unitprice,jdbcType=DOUBLE},
TaxUnitPrice = #{record.taxunitprice,jdbcType=DOUBLE},
AllPrice = #{record.allprice,jdbcType=DOUBLE},
OperNumber = #{record.opernumber,jdbcType=DECIMAL},
BasicNumber = #{record.basicnumber,jdbcType=DECIMAL},
UnitPrice = #{record.unitprice,jdbcType=DECIMAL},
TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL},
AllPrice = #{record.allprice,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR},
Img = #{record.img,jdbcType=VARCHAR},
Incidentals = #{record.incidentals,jdbcType=DOUBLE},
Incidentals = #{record.incidentals,jdbcType=DECIMAL},
DepotId = #{record.depotid,jdbcType=BIGINT},
AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT},
TaxRate = #{record.taxrate,jdbcType=DOUBLE},
TaxMoney = #{record.taxmoney,jdbcType=DOUBLE},
TaxLastMoney = #{record.taxlastmoney,jdbcType=DOUBLE},
TaxRate = #{record.taxrate,jdbcType=DECIMAL},
TaxMoney = #{record.taxmoney,jdbcType=DECIMAL},
TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL},
OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
OtherField2 = #{record.otherfield2,jdbcType=VARCHAR},
OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
@@ -463,19 +463,19 @@
MUnit = #{munit,jdbcType=VARCHAR},
</if>
<if test="opernumber != null">
OperNumber = #{opernumber,jdbcType=DOUBLE},
OperNumber = #{opernumber,jdbcType=DECIMAL},
</if>
<if test="basicnumber != null">
BasicNumber = #{basicnumber,jdbcType=DOUBLE},
BasicNumber = #{basicnumber,jdbcType=DECIMAL},
</if>
<if test="unitprice != null">
UnitPrice = #{unitprice,jdbcType=DOUBLE},
UnitPrice = #{unitprice,jdbcType=DECIMAL},
</if>
<if test="taxunitprice != null">
TaxUnitPrice = #{taxunitprice,jdbcType=DOUBLE},
TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL},
</if>
<if test="allprice != null">
AllPrice = #{allprice,jdbcType=DOUBLE},
AllPrice = #{allprice,jdbcType=DECIMAL},
</if>
<if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR},
@@ -484,7 +484,7 @@
Img = #{img,jdbcType=VARCHAR},
</if>
<if test="incidentals != null">
Incidentals = #{incidentals,jdbcType=DOUBLE},
Incidentals = #{incidentals,jdbcType=DECIMAL},
</if>
<if test="depotid != null">
DepotId = #{depotid,jdbcType=BIGINT},
@@ -493,13 +493,13 @@
AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT},
</if>
<if test="taxrate != null">
TaxRate = #{taxrate,jdbcType=DOUBLE},
TaxRate = #{taxrate,jdbcType=DECIMAL},
</if>
<if test="taxmoney != null">
TaxMoney = #{taxmoney,jdbcType=DOUBLE},
TaxMoney = #{taxmoney,jdbcType=DECIMAL},
</if>
<if test="taxlastmoney != null">
TaxLastMoney = #{taxlastmoney,jdbcType=DOUBLE},
TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL},
</if>
<if test="otherfield1 != null">
OtherField1 = #{otherfield1,jdbcType=VARCHAR},
@@ -531,19 +531,19 @@
set HeaderId = #{headerid,jdbcType=BIGINT},
MaterialId = #{materialid,jdbcType=BIGINT},
MUnit = #{munit,jdbcType=VARCHAR},
OperNumber = #{opernumber,jdbcType=DOUBLE},
BasicNumber = #{basicnumber,jdbcType=DOUBLE},
UnitPrice = #{unitprice,jdbcType=DOUBLE},
TaxUnitPrice = #{taxunitprice,jdbcType=DOUBLE},
AllPrice = #{allprice,jdbcType=DOUBLE},
OperNumber = #{opernumber,jdbcType=DECIMAL},
BasicNumber = #{basicnumber,jdbcType=DECIMAL},
UnitPrice = #{unitprice,jdbcType=DECIMAL},
TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL},
AllPrice = #{allprice,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR},
Img = #{img,jdbcType=VARCHAR},
Incidentals = #{incidentals,jdbcType=DOUBLE},
Incidentals = #{incidentals,jdbcType=DECIMAL},
DepotId = #{depotid,jdbcType=BIGINT},
AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT},
TaxRate = #{taxrate,jdbcType=DOUBLE},
TaxMoney = #{taxmoney,jdbcType=DOUBLE},
TaxLastMoney = #{taxlastmoney,jdbcType=DOUBLE},
TaxRate = #{taxrate,jdbcType=DECIMAL},
TaxMoney = #{taxmoney,jdbcType=DECIMAL},
TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL},
OtherField1 = #{otherfield1,jdbcType=VARCHAR},
OtherField2 = #{otherfield2,jdbcType=VARCHAR},
OtherField3 = #{otherfield3,jdbcType=VARCHAR},

24
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -169,7 +169,7 @@
group by m.id) cc
</select>
<select id="findByTypeInIsPrev" resultType="java.lang.Double">
<select id="findByTypeInIsPrev" resultType="java.math.BigDecimal">
select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId})
@@ -180,7 +180,7 @@
and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
</select>
<select id="findByTypeInIsNotPrev" resultType="java.lang.Double">
<select id="findByTypeInIsNotPrev" resultType="java.math.BigDecimal">
select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId})
@@ -192,14 +192,14 @@
and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select>
<select id="findByTypeOutIsPrev" resultType="java.lang.Double">
<select id="findByTypeOutIsPrev" resultType="java.math.BigDecimal">
select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId}
and MaterialId = ${MId}
and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00'
</select>
<select id="findByTypeOutIsNotPrev" resultType="java.lang.Double">
<select id="findByTypeOutIsNotPrev" resultType="java.math.BigDecimal">
select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId}
and MaterialId = ${MId}
@@ -208,7 +208,7 @@
</select>
<select id="findPriceByTypeInIsPrev" resultType="java.lang.Double">
<select id="findPriceByTypeInIsPrev" resultType="java.math.BigDecimal">
select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId})
@@ -219,7 +219,7 @@
and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
</select>
<select id="findPriceByTypeInIsNotPrev" resultType="java.lang.Double">
<select id="findPriceByTypeInIsNotPrev" resultType="java.math.BigDecimal">
select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId})
@@ -231,14 +231,14 @@
and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select>
<select id="findPriceByTypeOutIsPrev" resultType="java.lang.Double">
<select id="findPriceByTypeOutIsPrev" resultType="java.math.BigDecimal">
select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId}
and MaterialId = ${MId}
and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00'
</select>
<select id="findPriceByTypeOutIsNotPrev" resultType="java.lang.Double">
<select id="findPriceByTypeOutIsNotPrev" resultType="java.math.BigDecimal">
select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId}
and MaterialId = ${MId}
@@ -246,28 +246,28 @@
and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select>
<select id="buyOrSaleNumber" resultType="java.lang.Double">
<select id="buyOrSaleNumber" resultType="java.math.BigDecimal">
select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}'
and MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select>
<select id="buyOrSalePrice" resultType="java.lang.Double">
<select id="buyOrSalePrice" resultType="java.math.BigDecimal">
select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}'
and MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select>
<select id="findGiftByTypeIn" resultType="java.lang.Double">
<select id="findGiftByTypeIn" resultType="java.math.BigDecimal">
select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}'
and jsh_depotitem.AnotherDepotId=${ProjectId}
and jsh_depotitem.MaterialId =${MId}
</select>
<select id="findGiftByTypeOut" resultType="java.lang.Double">
<select id="findGiftByTypeOut" resultType="java.math.BigDecimal">
select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}'
and jsh_depotitem.DepotId=${ProjectId}

30
src/main/resources/mapper_xml/DepotMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.DepotMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Depot">
<!--
@@ -9,8 +9,8 @@
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="warehousing" jdbcType="DOUBLE" property="warehousing" />
<result column="truckage" jdbcType="DOUBLE" property="truckage" />
<result column="warehousing" jdbcType="DECIMAL" property="warehousing" />
<result column="truckage" jdbcType="DECIMAL" property="truckage" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
@@ -143,7 +143,7 @@
warehousing, truckage, type,
sort, remark)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{warehousing,jdbcType=DOUBLE}, #{truckage,jdbcType=DOUBLE}, #{type,jdbcType=INTEGER},
#{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER},
#{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
@@ -189,10 +189,10 @@
#{address,jdbcType=VARCHAR},
</if>
<if test="warehousing != null">
#{warehousing,jdbcType=DOUBLE},
#{warehousing,jdbcType=DECIMAL},
</if>
<if test="truckage != null">
#{truckage,jdbcType=DOUBLE},
#{truckage,jdbcType=DECIMAL},
</if>
<if test="type != null">
#{type,jdbcType=INTEGER},
@@ -232,10 +232,10 @@
address = #{record.address,jdbcType=VARCHAR},
</if>
<if test="record.warehousing != null">
warehousing = #{record.warehousing,jdbcType=DOUBLE},
warehousing = #{record.warehousing,jdbcType=DECIMAL},
</if>
<if test="record.truckage != null">
truckage = #{record.truckage,jdbcType=DOUBLE},
truckage = #{record.truckage,jdbcType=DECIMAL},
</if>
<if test="record.type != null">
type = #{record.type,jdbcType=INTEGER},
@@ -260,8 +260,8 @@
set id = #{record.id,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR},
address = #{record.address,jdbcType=VARCHAR},
warehousing = #{record.warehousing,jdbcType=DOUBLE},
truckage = #{record.truckage,jdbcType=DOUBLE},
warehousing = #{record.warehousing,jdbcType=DECIMAL},
truckage = #{record.truckage,jdbcType=DECIMAL},
type = #{record.type,jdbcType=INTEGER},
sort = #{record.sort,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR}
@@ -283,10 +283,10 @@
address = #{address,jdbcType=VARCHAR},
</if>
<if test="warehousing != null">
warehousing = #{warehousing,jdbcType=DOUBLE},
warehousing = #{warehousing,jdbcType=DECIMAL},
</if>
<if test="truckage != null">
truckage = #{truckage,jdbcType=DOUBLE},
truckage = #{truckage,jdbcType=DECIMAL},
</if>
<if test="type != null">
type = #{type,jdbcType=INTEGER},
@@ -308,8 +308,8 @@
update jsh_depot
set name = #{name,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR},
warehousing = #{warehousing,jdbcType=DOUBLE},
truckage = #{truckage,jdbcType=DOUBLE},
warehousing = #{warehousing,jdbcType=DECIMAL},
truckage = #{truckage,jdbcType=DECIMAL},
type = #{type,jdbcType=INTEGER},
sort = #{sort,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR}

16
src/main/resources/mapper_xml/LogMapperEx.xml
View File

@@ -18,10 +18,10 @@
and status=${status}
</if>
<if test="beginTime != null">
and createtime gt;= '%${beginTime}%'
and createtime &gt;= '%${beginTime}%'
</if>
<if test="endTime != null">
and createtime lt;= '%${endTime}%'
and createtime &lt;= '%${endTime}%'
</if>
<if test="contentdetails != null">
and contentdetails like '%${contentdetails}%'
@@ -48,12 +48,12 @@
<if test="status != null">
and status = ${status}
</if>
<if test="beginTime != null">
and createtime &gt;= '${beginTime}'
</if>
<if test="endTime != null">
and createtime &lt;= '${endTime}'
</if>
<if test="beginTime != null"><![CDATA[
and createtime >= '${beginTime}'
]]></if>
<if test="endTime != null"><![CDATA[
and createtime <= '${endTime}'
]]></if>
<if test="contentdetails != null">
and contentdetails like '%${contentdetails}%'
</if>

82
src/main/resources/mapper_xml/MaterialMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Material">
<!--
@@ -10,17 +10,17 @@
<result column="CategoryId" jdbcType="BIGINT" property="categoryid" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="Mfrs" jdbcType="VARCHAR" property="mfrs" />
<result column="Packing" jdbcType="DOUBLE" property="packing" />
<result column="SafetyStock" jdbcType="DOUBLE" property="safetystock" />
<result column="Packing" jdbcType="DECIMAL" property="packing" />
<result column="SafetyStock" jdbcType="DECIMAL" property="safetystock" />
<result column="Model" jdbcType="VARCHAR" property="model" />
<result column="Standard" jdbcType="VARCHAR" property="standard" />
<result column="Color" jdbcType="VARCHAR" property="color" />
<result column="Unit" jdbcType="VARCHAR" property="unit" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="RetailPrice" jdbcType="DOUBLE" property="retailprice" />
<result column="LowPrice" jdbcType="DOUBLE" property="lowprice" />
<result column="PresetPriceOne" jdbcType="DOUBLE" property="presetpriceone" />
<result column="PresetPriceTwo" jdbcType="DOUBLE" property="presetpricetwo" />
<result column="RetailPrice" jdbcType="DECIMAL" property="retailprice" />
<result column="LowPrice" jdbcType="DECIMAL" property="lowprice" />
<result column="PresetPriceOne" jdbcType="DECIMAL" property="presetpriceone" />
<result column="PresetPriceTwo" jdbcType="DECIMAL" property="presetpricetwo" />
<result column="UnitId" jdbcType="BIGINT" property="unitid" />
<result column="FirstOutUnit" jdbcType="VARCHAR" property="firstoutunit" />
<result column="FirstInUnit" jdbcType="VARCHAR" property="firstinunit" />
@@ -165,10 +165,10 @@
PriceStrategy, Enabled, OtherField1,
OtherField2, OtherField3)
values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
#{mfrs,jdbcType=VARCHAR}, #{packing,jdbcType=DOUBLE}, #{safetystock,jdbcType=DOUBLE},
#{mfrs,jdbcType=VARCHAR}, #{packing,jdbcType=DECIMAL}, #{safetystock,jdbcType=DECIMAL},
#{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR},
#{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{retailprice,jdbcType=DOUBLE},
#{lowprice,jdbcType=DOUBLE}, #{presetpriceone,jdbcType=DOUBLE}, #{presetpricetwo,jdbcType=DOUBLE},
#{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{retailprice,jdbcType=DECIMAL},
#{lowprice,jdbcType=DECIMAL}, #{presetpriceone,jdbcType=DECIMAL}, #{presetpricetwo,jdbcType=DECIMAL},
#{unitid,jdbcType=BIGINT}, #{firstoutunit,jdbcType=VARCHAR}, #{firstinunit,jdbcType=VARCHAR},
#{pricestrategy,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{otherfield1,jdbcType=VARCHAR},
#{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR})
@@ -264,10 +264,10 @@
#{mfrs,jdbcType=VARCHAR},
</if>
<if test="packing != null">
#{packing,jdbcType=DOUBLE},
#{packing,jdbcType=DECIMAL},
</if>
<if test="safetystock != null">
#{safetystock,jdbcType=DOUBLE},
#{safetystock,jdbcType=DECIMAL},
</if>
<if test="model != null">
#{model,jdbcType=VARCHAR},
@@ -285,16 +285,16 @@
#{remark,jdbcType=VARCHAR},
</if>
<if test="retailprice != null">
#{retailprice,jdbcType=DOUBLE},
#{retailprice,jdbcType=DECIMAL},
</if>
<if test="lowprice != null">
#{lowprice,jdbcType=DOUBLE},
#{lowprice,jdbcType=DECIMAL},
</if>
<if test="presetpriceone != null">
#{presetpriceone,jdbcType=DOUBLE},
#{presetpriceone,jdbcType=DECIMAL},
</if>
<if test="presetpricetwo != null">
#{presetpricetwo,jdbcType=DOUBLE},
#{presetpricetwo,jdbcType=DECIMAL},
</if>
<if test="unitid != null">
#{unitid,jdbcType=BIGINT},
@@ -352,10 +352,10 @@
Mfrs = #{record.mfrs,jdbcType=VARCHAR},
</if>
<if test="record.packing != null">
Packing = #{record.packing,jdbcType=DOUBLE},
Packing = #{record.packing,jdbcType=DECIMAL},
</if>
<if test="record.safetystock != null">
SafetyStock = #{record.safetystock,jdbcType=DOUBLE},
SafetyStock = #{record.safetystock,jdbcType=DECIMAL},
</if>
<if test="record.model != null">
Model = #{record.model,jdbcType=VARCHAR},
@@ -373,16 +373,16 @@
Remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.retailprice != null">
RetailPrice = #{record.retailprice,jdbcType=DOUBLE},
RetailPrice = #{record.retailprice,jdbcType=DECIMAL},
</if>
<if test="record.lowprice != null">
LowPrice = #{record.lowprice,jdbcType=DOUBLE},
LowPrice = #{record.lowprice,jdbcType=DECIMAL},
</if>
<if test="record.presetpriceone != null">
PresetPriceOne = #{record.presetpriceone,jdbcType=DOUBLE},
PresetPriceOne = #{record.presetpriceone,jdbcType=DECIMAL},
</if>
<if test="record.presetpricetwo != null">
PresetPriceTwo = #{record.presetpricetwo,jdbcType=DOUBLE},
PresetPriceTwo = #{record.presetpricetwo,jdbcType=DECIMAL},
</if>
<if test="record.unitid != null">
UnitId = #{record.unitid,jdbcType=BIGINT},
@@ -423,17 +423,17 @@
CategoryId = #{record.categoryid,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR},
Mfrs = #{record.mfrs,jdbcType=VARCHAR},
Packing = #{record.packing,jdbcType=DOUBLE},
SafetyStock = #{record.safetystock,jdbcType=DOUBLE},
Packing = #{record.packing,jdbcType=DECIMAL},
SafetyStock = #{record.safetystock,jdbcType=DECIMAL},
Model = #{record.model,jdbcType=VARCHAR},
Standard = #{record.standard,jdbcType=VARCHAR},
Color = #{record.color,jdbcType=VARCHAR},
Unit = #{record.unit,jdbcType=VARCHAR},
Remark = #{record.remark,jdbcType=VARCHAR},
RetailPrice = #{record.retailprice,jdbcType=DOUBLE},
LowPrice = #{record.lowprice,jdbcType=DOUBLE},
PresetPriceOne = #{record.presetpriceone,jdbcType=DOUBLE},
PresetPriceTwo = #{record.presetpricetwo,jdbcType=DOUBLE},
RetailPrice = #{record.retailprice,jdbcType=DECIMAL},
LowPrice = #{record.lowprice,jdbcType=DECIMAL},
PresetPriceOne = #{record.presetpriceone,jdbcType=DECIMAL},
PresetPriceTwo = #{record.presetpricetwo,jdbcType=DECIMAL},
UnitId = #{record.unitid,jdbcType=BIGINT},
FirstOutUnit = #{record.firstoutunit,jdbcType=VARCHAR},
FirstInUnit = #{record.firstinunit,jdbcType=VARCHAR},
@@ -463,10 +463,10 @@
Mfrs = #{mfrs,jdbcType=VARCHAR},
</if>
<if test="packing != null">
Packing = #{packing,jdbcType=DOUBLE},
Packing = #{packing,jdbcType=DECIMAL},
</if>
<if test="safetystock != null">
SafetyStock = #{safetystock,jdbcType=DOUBLE},
SafetyStock = #{safetystock,jdbcType=DECIMAL},
</if>
<if test="model != null">
Model = #{model,jdbcType=VARCHAR},
@@ -484,16 +484,16 @@
Remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="retailprice != null">
RetailPrice = #{retailprice,jdbcType=DOUBLE},
RetailPrice = #{retailprice,jdbcType=DECIMAL},
</if>
<if test="lowprice != null">
LowPrice = #{lowprice,jdbcType=DOUBLE},
LowPrice = #{lowprice,jdbcType=DECIMAL},
</if>
<if test="presetpriceone != null">
PresetPriceOne = #{presetpriceone,jdbcType=DOUBLE},
PresetPriceOne = #{presetpriceone,jdbcType=DECIMAL},
</if>
<if test="presetpricetwo != null">
PresetPriceTwo = #{presetpricetwo,jdbcType=DOUBLE},
PresetPriceTwo = #{presetpricetwo,jdbcType=DECIMAL},
</if>
<if test="unitid != null">
UnitId = #{unitid,jdbcType=BIGINT},
@@ -531,17 +531,17 @@
set CategoryId = #{categoryid,jdbcType=BIGINT},
Name = #{name,jdbcType=VARCHAR},
Mfrs = #{mfrs,jdbcType=VARCHAR},
Packing = #{packing,jdbcType=DOUBLE},
SafetyStock = #{safetystock,jdbcType=DOUBLE},
Packing = #{packing,jdbcType=DECIMAL},
SafetyStock = #{safetystock,jdbcType=DECIMAL},
Model = #{model,jdbcType=VARCHAR},
Standard = #{standard,jdbcType=VARCHAR},
Color = #{color,jdbcType=VARCHAR},
Unit = #{unit,jdbcType=VARCHAR},
Remark = #{remark,jdbcType=VARCHAR},
RetailPrice = #{retailprice,jdbcType=DOUBLE},
LowPrice = #{lowprice,jdbcType=DOUBLE},
PresetPriceOne = #{presetpriceone,jdbcType=DOUBLE},
PresetPriceTwo = #{presetpricetwo,jdbcType=DOUBLE},
RetailPrice = #{retailprice,jdbcType=DECIMAL},
LowPrice = #{lowprice,jdbcType=DECIMAL},
PresetPriceOne = #{presetpriceone,jdbcType=DECIMAL},
PresetPriceTwo = #{presetpricetwo,jdbcType=DECIMAL},
UnitId = #{unitid,jdbcType=BIGINT},
FirstOutUnit = #{firstoutunit,jdbcType=VARCHAR},
FirstInUnit = #{firstinunit,jdbcType=VARCHAR},

82
src/main/resources/mapper_xml/SupplierMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.SupplierMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Supplier">
<!--
@@ -15,18 +15,18 @@
<result column="isystem" jdbcType="TINYINT" property="isystem" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="AdvanceIn" jdbcType="DOUBLE" property="advancein" />
<result column="BeginNeedGet" jdbcType="DOUBLE" property="beginneedget" />
<result column="BeginNeedPay" jdbcType="DOUBLE" property="beginneedpay" />
<result column="AllNeedGet" jdbcType="DOUBLE" property="allneedget" />
<result column="AllNeedPay" jdbcType="DOUBLE" property="allneedpay" />
<result column="AdvanceIn" jdbcType="DECIMAL" property="advancein" />
<result column="BeginNeedGet" jdbcType="DECIMAL" property="beginneedget" />
<result column="BeginNeedPay" jdbcType="DECIMAL" property="beginneedpay" />
<result column="AllNeedGet" jdbcType="DECIMAL" property="allneedget" />
<result column="AllNeedPay" jdbcType="DECIMAL" property="allneedpay" />
<result column="fax" jdbcType="VARCHAR" property="fax" />
<result column="telephone" jdbcType="VARCHAR" property="telephone" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="taxNum" jdbcType="VARCHAR" property="taxnum" />
<result column="bankName" jdbcType="VARCHAR" property="bankname" />
<result column="accountNumber" jdbcType="VARCHAR" property="accountnumber" />
<result column="taxRate" jdbcType="DOUBLE" property="taxrate" />
<result column="taxRate" jdbcType="DECIMAL" property="taxrate" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
@@ -165,10 +165,10 @@
values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR},
#{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
#{advancein,jdbcType=DOUBLE}, #{beginneedget,jdbcType=DOUBLE}, #{beginneedpay,jdbcType=DOUBLE},
#{allneedget,jdbcType=DOUBLE}, #{allneedpay,jdbcType=DOUBLE}, #{fax,jdbcType=VARCHAR},
#{advancein,jdbcType=DECIMAL}, #{beginneedget,jdbcType=DECIMAL}, #{beginneedpay,jdbcType=DECIMAL},
#{allneedget,jdbcType=DECIMAL}, #{allneedpay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR},
#{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxnum,jdbcType=VARCHAR},
#{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DOUBLE}
#{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DECIMAL}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier">
@@ -271,19 +271,19 @@
#{enabled,jdbcType=BIT},
</if>
<if test="advancein != null">
#{advancein,jdbcType=DOUBLE},
#{advancein,jdbcType=DECIMAL},
</if>
<if test="beginneedget != null">
#{beginneedget,jdbcType=DOUBLE},
#{beginneedget,jdbcType=DECIMAL},
</if>
<if test="beginneedpay != null">
#{beginneedpay,jdbcType=DOUBLE},
#{beginneedpay,jdbcType=DECIMAL},
</if>
<if test="allneedget != null">
#{allneedget,jdbcType=DOUBLE},
#{allneedget,jdbcType=DECIMAL},
</if>
<if test="allneedpay != null">
#{allneedpay,jdbcType=DOUBLE},
#{allneedpay,jdbcType=DECIMAL},
</if>
<if test="fax != null">
#{fax,jdbcType=VARCHAR},
@@ -304,7 +304,7 @@
#{accountnumber,jdbcType=VARCHAR},
</if>
<if test="taxrate != null">
#{taxrate,jdbcType=DOUBLE},
#{taxrate,jdbcType=DECIMAL},
</if>
</trim>
</insert>
@@ -353,19 +353,19 @@
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if test="record.advancein != null">
AdvanceIn = #{record.advancein,jdbcType=DOUBLE},
AdvanceIn = #{record.advancein,jdbcType=DECIMAL},
</if>
<if test="record.beginneedget != null">
BeginNeedGet = #{record.beginneedget,jdbcType=DOUBLE},
BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL},
</if>
<if test="record.beginneedpay != null">
BeginNeedPay = #{record.beginneedpay,jdbcType=DOUBLE},
BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL},
</if>
<if test="record.allneedget != null">
AllNeedGet = #{record.allneedget,jdbcType=DOUBLE},
AllNeedGet = #{record.allneedget,jdbcType=DECIMAL},
</if>
<if test="record.allneedpay != null">
AllNeedPay = #{record.allneedpay,jdbcType=DOUBLE},
AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL},
</if>
<if test="record.fax != null">
fax = #{record.fax,jdbcType=VARCHAR},
@@ -386,7 +386,7 @@
accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
</if>
<if test="record.taxrate != null">
taxRate = #{record.taxrate,jdbcType=DOUBLE},
taxRate = #{record.taxrate,jdbcType=DECIMAL},
</if>
</set>
<if test="_parameter != null">
@@ -408,18 +408,18 @@
isystem = #{record.isystem,jdbcType=TINYINT},
type = #{record.type,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
AdvanceIn = #{record.advancein,jdbcType=DOUBLE},
BeginNeedGet = #{record.beginneedget,jdbcType=DOUBLE},
BeginNeedPay = #{record.beginneedpay,jdbcType=DOUBLE},
AllNeedGet = #{record.allneedget,jdbcType=DOUBLE},
AllNeedPay = #{record.allneedpay,jdbcType=DOUBLE},
AdvanceIn = #{record.advancein,jdbcType=DECIMAL},
BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL},
BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL},
AllNeedGet = #{record.allneedget,jdbcType=DECIMAL},
AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL},
fax = #{record.fax,jdbcType=VARCHAR},
telephone = #{record.telephone,jdbcType=VARCHAR},
address = #{record.address,jdbcType=VARCHAR},
taxNum = #{record.taxnum,jdbcType=VARCHAR},
bankName = #{record.bankname,jdbcType=VARCHAR},
accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
taxRate = #{record.taxrate,jdbcType=DOUBLE}
taxRate = #{record.taxrate,jdbcType=DECIMAL}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@@ -456,19 +456,19 @@
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="advancein != null">
AdvanceIn = #{advancein,jdbcType=DOUBLE},
AdvanceIn = #{advancein,jdbcType=DECIMAL},
</if>
<if test="beginneedget != null">
BeginNeedGet = #{beginneedget,jdbcType=DOUBLE},
BeginNeedGet = #{beginneedget,jdbcType=DECIMAL},
</if>
<if test="beginneedpay != null">
BeginNeedPay = #{beginneedpay,jdbcType=DOUBLE},
BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL},
</if>
<if test="allneedget != null">
AllNeedGet = #{allneedget,jdbcType=DOUBLE},
AllNeedGet = #{allneedget,jdbcType=DECIMAL},
</if>
<if test="allneedpay != null">
AllNeedPay = #{allneedpay,jdbcType=DOUBLE},
AllNeedPay = #{allneedpay,jdbcType=DECIMAL},
</if>
<if test="fax != null">
fax = #{fax,jdbcType=VARCHAR},
@@ -489,7 +489,7 @@
accountNumber = #{accountnumber,jdbcType=VARCHAR},
</if>
<if test="taxrate != null">
taxRate = #{taxrate,jdbcType=DOUBLE},
taxRate = #{taxrate,jdbcType=DECIMAL},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -508,18 +508,18 @@
isystem = #{isystem,jdbcType=TINYINT},
type = #{type,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
AdvanceIn = #{advancein,jdbcType=DOUBLE},
BeginNeedGet = #{beginneedget,jdbcType=DOUBLE},
BeginNeedPay = #{beginneedpay,jdbcType=DOUBLE},
AllNeedGet = #{allneedget,jdbcType=DOUBLE},
AllNeedPay = #{allneedpay,jdbcType=DOUBLE},
AdvanceIn = #{advancein,jdbcType=DECIMAL},
BeginNeedGet = #{beginneedget,jdbcType=DECIMAL},
BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL},
AllNeedGet = #{allneedget,jdbcType=DECIMAL},
AllNeedPay = #{allneedpay,jdbcType=DECIMAL},
fax = #{fax,jdbcType=VARCHAR},
telephone = #{telephone,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR},
taxNum = #{taxnum,jdbcType=VARCHAR},
bankName = #{bankname,jdbcType=VARCHAR},
accountNumber = #{accountnumber,jdbcType=VARCHAR},
taxRate = #{taxrate,jdbcType=DOUBLE}
taxRate = #{taxrate,jdbcType=DECIMAL}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>