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

74
sql/jsh_erp.sql
View File

@@ -1,3 +1,5 @@
-- noinspection SqlNoDataSourceInspectionForFile
/* /*
Navicat MySQL Data Transfer Navicat MySQL Data Transfer
@@ -69,8 +71,8 @@ CREATE TABLE `jsh_account` (
`Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`Name` varchar(50) DEFAULT NULL COMMENT '名称', `Name` varchar(50) DEFAULT NULL COMMENT '名称',
`SerialNo` varchar(50) DEFAULT NULL COMMENT '编号', `SerialNo` varchar(50) DEFAULT NULL COMMENT '编号',
`InitialAmount` double DEFAULT NULL COMMENT '期初金额', `InitialAmount` decimal(24, 6) DEFAULT NULL COMMENT '期初金额',
`CurrentAmount` double DEFAULT NULL COMMENT '当前余额', `CurrentAmount` decimal(24, 6) DEFAULT NULL COMMENT '当前余额',
`Remark` varchar(100) DEFAULT NULL COMMENT '备注', `Remark` varchar(100) DEFAULT NULL COMMENT '备注',
`IsDefault` bit(1) DEFAULT NULL COMMENT '是否默认', `IsDefault` bit(1) DEFAULT NULL COMMENT '是否默认',
PRIMARY KEY (`Id`) PRIMARY KEY (`Id`)
@@ -94,8 +96,8 @@ CREATE TABLE `jsh_accounthead` (
`Type` varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)', `Type` varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)',
`OrganId` bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)', `OrganId` bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)',
`HandsPersonId` bigint(20) DEFAULT NULL COMMENT '经手人Id', `HandsPersonId` bigint(20) DEFAULT NULL COMMENT '经手人Id',
`ChangeAmount` double DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)', `ChangeAmount` decimal(24, 6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)',
`TotalPrice` double DEFAULT NULL COMMENT '合计金额', `TotalPrice` decimal(24, 6) DEFAULT NULL COMMENT '合计金额',
`AccountId` bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)', `AccountId` bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)',
`BillNo` varchar(50) DEFAULT NULL COMMENT '单据编号', `BillNo` varchar(50) DEFAULT NULL COMMENT '单据编号',
`BillTime` datetime DEFAULT NULL COMMENT '单据日期', `BillTime` datetime DEFAULT NULL COMMENT '单据日期',
@@ -139,7 +141,7 @@ CREATE TABLE `jsh_accountitem` (
`HeaderId` bigint(20) NOT NULL COMMENT '表头Id', `HeaderId` bigint(20) NOT NULL COMMENT '表头Id',
`AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id', `AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id',
`InOutItemId` bigint(20) DEFAULT NULL COMMENT '收支项目Id', `InOutItemId` bigint(20) DEFAULT NULL COMMENT '收支项目Id',
`EachAmount` double DEFAULT NULL COMMENT '单项金额', `EachAmount` decimal(24, 6) DEFAULT NULL COMMENT '单项金额',
`Remark` varchar(100) DEFAULT NULL COMMENT '单据备注', `Remark` varchar(100) DEFAULT NULL COMMENT '单据备注',
PRIMARY KEY (`Id`), PRIMARY KEY (`Id`),
KEY `FK9F4CBAC0AAE50527` (`AccountId`), KEY `FK9F4CBAC0AAE50527` (`AccountId`),
@@ -218,7 +220,7 @@ CREATE TABLE `jsh_asset` (
`labels` varchar(255) DEFAULT NULL COMMENT '标签：以空格为分隔符', `labels` varchar(255) DEFAULT NULL COMMENT '标签：以空格为分隔符',
`status` smallint(6) DEFAULT NULL COMMENT '资产的状态：0==在库，1==在用，2==消费', `status` smallint(6) DEFAULT NULL COMMENT '资产的状态：0==在库，1==在用，2==消费',
`userID` bigint(20) DEFAULT NULL COMMENT '用户ID', `userID` bigint(20) DEFAULT NULL COMMENT '用户ID',
`price` double DEFAULT NULL COMMENT '购买价格', `price` decimal(24, 6) DEFAULT NULL COMMENT '购买价格',
`purchasedate` datetime DEFAULT NULL COMMENT '购买日期', `purchasedate` datetime DEFAULT NULL COMMENT '购买日期',
`periodofvalidity` datetime DEFAULT NULL COMMENT '有效日期', `periodofvalidity` datetime DEFAULT NULL COMMENT '有效日期',
`warrantydate` datetime DEFAULT NULL COMMENT '保修日期', `warrantydate` datetime DEFAULT NULL COMMENT '保修日期',
@@ -321,8 +323,8 @@ CREATE TABLE `jsh_depot` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`name` varchar(20) DEFAULT NULL COMMENT '仓库名称', `name` varchar(20) DEFAULT NULL COMMENT '仓库名称',
`address` varchar(50) DEFAULT NULL COMMENT '仓库地址', `address` varchar(50) DEFAULT NULL COMMENT '仓库地址',
`warehousing` double DEFAULT NULL COMMENT '仓储费', `warehousing` decimal(24, 6) DEFAULT NULL COMMENT '仓储费',
`truckage` double DEFAULT NULL COMMENT '搬运费', `truckage` decimal(24, 6) DEFAULT NULL COMMENT '搬运费',
`type` int(10) DEFAULT NULL COMMENT '类型', `type` int(10) DEFAULT NULL COMMENT '类型',
`sort` varchar(10) DEFAULT NULL COMMENT '排序', `sort` varchar(10) DEFAULT NULL COMMENT '排序',
`remark` varchar(100) DEFAULT NULL COMMENT '描述', `remark` varchar(100) DEFAULT NULL COMMENT '描述',
@@ -343,6 +345,8 @@ INSERT INTO `jsh_depot` VALUES ('6', '1269520625', null, null, null, '1', '2', '
-- Table structure for `jsh_depothead` -- Table structure for `jsh_depothead`
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `jsh_depothead`; DROP TABLE IF EXISTS `jsh_depothead`;
-- noinspection SqlNoDataSourceInspection
CREATE TABLE `jsh_depothead` ( CREATE TABLE `jsh_depothead` (
`Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`Type` varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)', `Type` varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)',
@@ -356,18 +360,18 @@ CREATE TABLE `jsh_depothead` (
`OrganId` bigint(20) DEFAULT NULL COMMENT '供应商Id', `OrganId` bigint(20) DEFAULT NULL COMMENT '供应商Id',
`HandsPersonId` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人Id', `HandsPersonId` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人Id',
`AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id', `AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id',
`ChangeAmount` double DEFAULT NULL COMMENT '变动金额(收款/付款)', `ChangeAmount` decimal(24, 6) DEFAULT NULL COMMENT '变动金额(收款/付款)',
`AllocationProjectId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方项目Id', `AllocationProjectId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方项目Id',
`TotalPrice` double DEFAULT NULL COMMENT '合计金额', `TotalPrice` decimal(24, 6) DEFAULT NULL COMMENT '合计金额',
`PayType` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)', `PayType` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)',
`Remark` varchar(1000) DEFAULT NULL COMMENT '备注', `Remark` varchar(1000) DEFAULT NULL COMMENT '备注',
`Salesman` varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）', `Salesman` varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）',
`AccountIdList` varchar(50) DEFAULT NULL COMMENT '多账户ID列表', `AccountIdList` varchar(50) DEFAULT NULL COMMENT '多账户ID列表',
`AccountMoneyList` varchar(200) DEFAULT '' COMMENT '多账户金额列表', `AccountMoneyList` varchar(200) DEFAULT '' COMMENT '多账户金额列表',
`Discount` double DEFAULT NULL COMMENT '优惠率', `Discount` decimal(24, 6) DEFAULT NULL COMMENT '优惠率',
`DiscountMoney` double DEFAULT NULL COMMENT '优惠金额', `DiscountMoney` decimal(24, 6) DEFAULT NULL COMMENT '优惠金额',
`DiscountLastMoney` double DEFAULT NULL COMMENT '优惠后金额', `DiscountLastMoney` decimal(24, 6) DEFAULT NULL COMMENT '优惠后金额',
`OtherMoney` double DEFAULT NULL COMMENT '销售或采购费用合计', `OtherMoney` decimal(24, 6) DEFAULT NULL COMMENT '销售或采购费用合计',
`OtherMoneyList` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）', `OtherMoneyList` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）',
`OtherMoneyItem` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）', `OtherMoneyItem` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）',
`AccountDay` int(10) DEFAULT NULL COMMENT '结算天数', `AccountDay` int(10) DEFAULT NULL COMMENT '结算天数',
@@ -484,19 +488,19 @@ CREATE TABLE `jsh_depotitem` (
`HeaderId` bigint(20) NOT NULL COMMENT '表头Id', `HeaderId` bigint(20) NOT NULL COMMENT '表头Id',
`MaterialId` bigint(20) NOT NULL COMMENT '材料Id', `MaterialId` bigint(20) NOT NULL COMMENT '材料Id',
`MUnit` varchar(20) DEFAULT NULL COMMENT '商品计量单位', `MUnit` varchar(20) DEFAULT NULL COMMENT '商品计量单位',
`OperNumber` double DEFAULT NULL COMMENT '数量', `OperNumber` decimal(24, 6) DEFAULT NULL COMMENT '数量',
`BasicNumber` double DEFAULT NULL COMMENT '基础数量，如kg、瓶', `BasicNumber` decimal(24, 6) DEFAULT NULL COMMENT '基础数量，如kg、瓶',
`UnitPrice` double DEFAULT NULL COMMENT '单价', `UnitPrice` decimal(24, 6) DEFAULT NULL COMMENT '单价',
`TaxUnitPrice` double DEFAULT NULL COMMENT '含税单价', `TaxUnitPrice` decimal(24, 6) DEFAULT NULL COMMENT '含税单价',
`AllPrice` double DEFAULT NULL COMMENT '金额', `AllPrice` decimal(24, 6) DEFAULT NULL COMMENT '金额',
`Remark` varchar(200) DEFAULT NULL COMMENT '描述', `Remark` varchar(200) DEFAULT NULL COMMENT '描述',
`Img` varchar(50) DEFAULT NULL COMMENT '图片', `Img` varchar(50) DEFAULT NULL COMMENT '图片',
`Incidentals` double DEFAULT NULL COMMENT '运杂费', `Incidentals` decimal(24, 6) DEFAULT NULL COMMENT '运杂费',
`DepotId` bigint(20) DEFAULT NULL COMMENT '仓库ID（库存是统计出来的）', `DepotId` bigint(20) DEFAULT NULL COMMENT '仓库ID（库存是统计出来的）',
`AnotherDepotId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id', `AnotherDepotId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id',
`TaxRate` double DEFAULT NULL COMMENT '税率', `TaxRate` decimal(24, 6) DEFAULT NULL COMMENT '税率',
`TaxMoney` double DEFAULT NULL COMMENT '税额', `TaxMoney` decimal(24, 6) DEFAULT NULL COMMENT '税额',
`TaxLastMoney` double DEFAULT NULL COMMENT '价税合计', `TaxLastMoney` decimal(24, 6) DEFAULT NULL COMMENT '价税合计',
`OtherField1` varchar(50) DEFAULT NULL COMMENT '自定义字段1-品名', `OtherField1` varchar(50) DEFAULT NULL COMMENT '自定义字段1-品名',
`OtherField2` varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号', `OtherField2` varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号',
`OtherField3` varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商', `OtherField3` varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商',
@@ -4885,17 +4889,17 @@ CREATE TABLE `jsh_material` (
`CategoryId` bigint(20) DEFAULT NULL COMMENT '产品类型', `CategoryId` bigint(20) DEFAULT NULL COMMENT '产品类型',
`Name` varchar(50) DEFAULT NULL COMMENT '名称', `Name` varchar(50) DEFAULT NULL COMMENT '名称',
`Mfrs` varchar(50) DEFAULT NULL COMMENT '制造商', `Mfrs` varchar(50) DEFAULT NULL COMMENT '制造商',
`Packing` double DEFAULT NULL COMMENT '包装（KG/包）', `Packing` decimal(24, 6) DEFAULT NULL COMMENT '包装（KG/包）',
`SafetyStock` double DEFAULT NULL COMMENT '安全存量（KG）', `SafetyStock` decimal(24, 6) DEFAULT NULL COMMENT '安全存量（KG）',
`Model` varchar(50) DEFAULT NULL COMMENT '型号', `Model` varchar(50) DEFAULT NULL COMMENT '型号',
`Standard` varchar(50) DEFAULT NULL COMMENT '规格', `Standard` varchar(50) DEFAULT NULL COMMENT '规格',
`Color` varchar(50) DEFAULT NULL COMMENT '颜色', `Color` varchar(50) DEFAULT NULL COMMENT '颜色',
`Unit` varchar(50) DEFAULT NULL COMMENT '单位-单个', `Unit` varchar(50) DEFAULT NULL COMMENT '单位-单个',
`Remark` varchar(100) DEFAULT NULL COMMENT '备注', `Remark` varchar(100) DEFAULT NULL COMMENT '备注',
`RetailPrice` double DEFAULT NULL COMMENT '零售价', `RetailPrice` decimal(24, 6) DEFAULT NULL COMMENT '零售价',
`LowPrice` double DEFAULT NULL COMMENT '最低售价', `LowPrice` decimal(24, 6) DEFAULT NULL COMMENT '最低售价',
`PresetPriceOne` double DEFAULT NULL COMMENT '预设售价一', `PresetPriceOne` decimal(24, 6) DEFAULT NULL COMMENT '预设售价一',
`PresetPriceTwo` double DEFAULT NULL COMMENT '预设售价二', `PresetPriceTwo` decimal(24, 6) DEFAULT NULL COMMENT '预设售价二',
`UnitId` bigint(20) DEFAULT NULL COMMENT '计量单位Id', `UnitId` bigint(20) DEFAULT NULL COMMENT '计量单位Id',
`FirstOutUnit` varchar(50) DEFAULT NULL COMMENT '首选出库单位', `FirstOutUnit` varchar(50) DEFAULT NULL COMMENT '首选出库单位',
`FirstInUnit` varchar(50) DEFAULT NULL COMMENT '首选入库单位', `FirstInUnit` varchar(50) DEFAULT NULL COMMENT '首选入库单位',
@@ -5028,18 +5032,18 @@ CREATE TABLE `jsh_supplier` (
`isystem` tinyint(4) DEFAULT NULL COMMENT '是否系统自带 0==系统 1==非系统', `isystem` tinyint(4) DEFAULT NULL COMMENT '是否系统自带 0==系统 1==非系统',
`type` varchar(20) DEFAULT NULL COMMENT '类型', `type` varchar(20) DEFAULT NULL COMMENT '类型',
`enabled` bit(1) DEFAULT NULL COMMENT '启用', `enabled` bit(1) DEFAULT NULL COMMENT '启用',
`AdvanceIn` double DEFAULT '0' COMMENT '预收款', `AdvanceIn` decimal(24, 6) DEFAULT '0' COMMENT '预收款',
`BeginNeedGet` double DEFAULT NULL COMMENT '期初应收', `BeginNeedGet` decimal(24, 6) DEFAULT NULL COMMENT '期初应收',
`BeginNeedPay` double DEFAULT NULL COMMENT '期初应付', `BeginNeedPay` decimal(24, 6) DEFAULT NULL COMMENT '期初应付',
`AllNeedGet` double DEFAULT NULL COMMENT '累计应收', `AllNeedGet` decimal(24, 6) DEFAULT NULL COMMENT '累计应收',
`AllNeedPay` double DEFAULT NULL COMMENT '累计应付', `AllNeedPay` decimal(24, 6) DEFAULT NULL COMMENT '累计应付',
`fax` varchar(30) DEFAULT NULL COMMENT '传真', `fax` varchar(30) DEFAULT NULL COMMENT '传真',
`telephone` varchar(30) DEFAULT NULL COMMENT '手机', `telephone` varchar(30) DEFAULT NULL COMMENT '手机',
`address` varchar(50) DEFAULT NULL COMMENT '地址', `address` varchar(50) DEFAULT NULL COMMENT '地址',
`taxNum` varchar(50) DEFAULT NULL COMMENT '纳税人识别号', `taxNum` varchar(50) DEFAULT NULL COMMENT '纳税人识别号',
`bankName` varchar(50) DEFAULT NULL COMMENT '开户行', `bankName` varchar(50) DEFAULT NULL COMMENT '开户行',
`accountNumber` varchar(50) DEFAULT NULL COMMENT '账号', `accountNumber` varchar(50) DEFAULT NULL COMMENT '账号',
`taxRate` double DEFAULT NULL COMMENT '税率', `taxRate` decimal(24, 6) DEFAULT NULL COMMENT '税率',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8 COMMENT='供应商/客户信息表'; ) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8 COMMENT='供应商/客户信息表';

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

Binary file not shown.

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -94,7 +95,7 @@ public class AccountController {
public BaseResponseInfo findAccountInOutList(@RequestParam("currentPage") Integer currentPage, public BaseResponseInfo findAccountInOutList(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize, @RequestParam("pageSize") Integer pageSize,
@RequestParam("accountId") Long accountId, @RequestParam("accountId") Long accountId,
@RequestParam("initialAmount") Double initialAmount, @RequestParam("initialAmount") BigDecimal initialAmount,
HttpServletRequest request) { HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
@@ -107,8 +108,8 @@ public class AccountController {
if (null != dataList) { if (null != dataList) {
for (AccountVo4InOutList aEx : dataList) { for (AccountVo4InOutList aEx : dataList) {
String timeStr = aEx.getOperTime().toString(); String timeStr = aEx.getOperTime().toString();
Double balance = accountService.getAccountSum(accountId, timeStr, "date") + accountService.getAccountSumByHead(accountId, timeStr, "date") BigDecimal balance = accountService.getAccountSum(accountId, timeStr, "date").add(accountService.getAccountSumByHead(accountId, timeStr, "date"))
+ accountService.getAccountSumByDetail(accountId, timeStr, "date") + accountService.getManyAccountSum(accountId, timeStr, "date") + initialAmount; .add(accountService.getAccountSumByDetail(accountId, timeStr, "date")).add(accountService.getManyAccountSum(accountId, timeStr, "date")).add(initialAmount);
aEx.setBalance(balance); aEx.setBalance(balance);
dataArray.add(aEx); dataArray.add(aEx);
} }

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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -69,7 +70,7 @@ public class AccountHeadController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
Double sum = 0.0; BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString(); String getS = supplierId.toString();
int i = 1; int i = 1;
if (supType.equals("customer")) { //客户 if (supType.equals("customer")) { //客户
@@ -78,10 +79,14 @@ public class AccountHeadController {
i = -1; 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.add((allMoney(getS, "付款", "合计",endTime).add(allMoney(getS, "付款", "实际",endTime))).multiply(new BigDecimal(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.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); outer.put("getAllMoney", sum);
map.put("rows", outer); map.put("rows", outer);
res.code = 200; res.code = 200;
@@ -128,11 +133,11 @@ public class AccountHeadController {
* @param endTime * @param endTime
* @return * @return
*/ */
public Double allMoney(String getS, String type, String mode, String endTime) { public BigDecimal allMoney(String getS, String type, String mode, String endTime) {
Double allMoney = 0.0; BigDecimal allMoney = BigDecimal.ZERO;
try { try {
Integer supplierId = Integer.valueOf(getS); Integer supplierId = Integer.valueOf(getS);
Double sum = accountHeadService.findAllMoney(supplierId, type, mode, endTime); BigDecimal sum = accountHeadService.findAllMoney(supplierId, type, mode, endTime);
if(sum != null) { if(sum != null) {
allMoney = sum; allMoney = sum;
} }
@@ -140,8 +145,8 @@ public class AccountHeadController {
e.printStackTrace(); e.printStackTrace();
} }
//返回正数，如果负数也转为正数 //返回正数，如果负数也转为正数
if (allMoney < 0) { if ((allMoney.compareTo(BigDecimal.ZERO))==-1) {
allMoney = -allMoney; allMoney = allMoney.abs();
} }
return allMoney; 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -86,8 +87,8 @@ public class AccountItemController {
item.put("AccountName", ai.getAccountName()); item.put("AccountName", ai.getAccountName());
item.put("InOutItemId", ai.getInoutitemid()); item.put("InOutItemId", ai.getInoutitemid());
item.put("InOutItemName", ai.getInOutItemName()); item.put("InOutItemName", ai.getInOutItemName());
Double eachAmount = ai.getEachamount(); BigDecimal eachAmount = ai.getEachamount();
item.put("EachAmount", eachAmount < 0 ? 0 - eachAmount : eachAmount); item.put("EachAmount", (eachAmount.compareTo(BigDecimal.ZERO))==-1 ? BigDecimal.ZERO.subtract(eachAmount): eachAmount);
item.put("Remark", ai.getRemark()); item.put("Remark", ai.getRemark());
dataArray.add(item); dataArray.add(item);
} }

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

@@ -17,7 +17,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.sql.Date; import java.sql.Date;
import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -312,41 +314,42 @@ public class DepotHeadController {
dha.setNumber(dha.getNumber()); //单据编号 dha.setNumber(dha.getNumber()); //单据编号
dha.setType(dha.getType()); //类型 dha.setType(dha.getType()); //类型
String type = dha.getType(); String type = dha.getType();
Double p1 = 0.0; BigDecimal p1 = BigDecimal.ZERO ;
Double p2 = 0.0; BigDecimal p2 = BigDecimal.ZERO;
if (dha.getDiscountLastMoney() != null) { if (dha.getDiscountLastMoney() != null) {
p1 = dha.getDiscountLastMoney(); p1 = dha.getDiscountLastMoney();
} }
if (dha.getChangeAmount() != null) { if (dha.getChangeAmount() != null) {
p2 = dha.getChangeAmount(); p2 = dha.getChangeAmount();
} }
Double allPrice = 0.0; BigDecimal allPrice = BigDecimal.ZERO;
if (p1 < 0) { if ((p1.compareTo(BigDecimal.ZERO))==-1) {
p1 = -p1; p1 = p1.abs();
} }
if (p2 < 0) { if ((p2 .compareTo(BigDecimal.ZERO))==-1) {
p2 = -p2; p2 = p2.abs();
} }
if (type.equals("采购入库")) { if (type.equals("采购入库")) {
allPrice = -(p1 - p2); allPrice = p2 .subtract(p1);
} else if (type.equals("销售退货入库")) { } else if (type.equals("销售退货入库")) {
allPrice = -(p1 - p2); allPrice = p2 .subtract(p1);
} else if (type.equals("销售出库")) { } else if (type.equals("销售出库")) {
allPrice = p1 - p2; allPrice = p1 .subtract(p2);
} else if (type.equals("采购退货出库")) { } else if (type.equals("采购退货出库")) {
allPrice = p1 - p2; allPrice = p1 .subtract(p2);
} else if (type.equals("付款")) { } else if (type.equals("付款")) {
allPrice = p1 + p2; allPrice = p1.add(p2);
} else if (type.equals("收款")) { } else if (type.equals("收款")) {
allPrice = -(p1 + p2); allPrice = BigDecimal.ZERO.subtract(p1.add(p2));
} else if (type.equals("收入")) { } else if (type.equals("收入")) {
allPrice = p1 - p2; allPrice = p1 .subtract(p2);
} else if (type.equals("支出")) { } else if (type.equals("支出")) {
allPrice = -(p1 - p2); allPrice = p2 .subtract(p1);
} }
dha.setDiscountLastMoney(p1); //金额 dha.setDiscountLastMoney(p1); //金额
dha.setChangeAmount(p2); //金额 dha.setChangeAmount(p2); //金额
dha.setAllPrice(Double.parseDouble(String.format("%.2f", allPrice * j))); //计算后的金额 DecimalFormat df = new DecimalFormat(".##");
dha.setAllPrice(new BigDecimal(df.format(allPrice .multiply(new BigDecimal(j))))); //计算后的金额
dha.setSupplierName(dha.getSupplierName()); //供应商 dha.setSupplierName(dha.getSupplierName()); //供应商
dha.setoTime(dha.getoTime()); //入库出库日期 dha.setoTime(dha.getoTime()); //入库出库日期
resList.add(dha); resList.add(dha);
@@ -380,7 +383,7 @@ public class DepotHeadController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
Double sum = 0.0; BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString(); String getS = supplierId.toString();
int i = 1; int i = 1;
if (supType.equals("customer")) { //客户 if (supType.equals("customer")) { //客户
@@ -389,10 +392,14 @@ public class DepotHeadController {
i = -1; 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.subtract((allMoney(getS, "入库", "采购", "合计",endTime).subtract(allMoney(getS, "入库", "采购", "实际",endTime))).multiply(new BigDecimal(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.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); outer.put("getAllMoney", sum);
map.put("rows", outer); map.put("rows", outer);
res.code = 200; res.code = 200;
@@ -440,11 +447,11 @@ public class DepotHeadController {
* @param mode 合计或者金额 * @param mode 合计或者金额
* @return * @return
*/ */
public Double allMoney(String getS, String type, String subType, String mode, String endTime) { public BigDecimal allMoney(String getS, String type, String subType, String mode, String endTime) {
Double allMoney = 0.0; BigDecimal allMoney = BigDecimal.ZERO;
try { try {
Integer supplierId = Integer.valueOf(getS); Integer supplierId = Integer.valueOf(getS);
Double sum = depotHeadService.findAllMoney(supplierId, type, subType, mode, endTime); BigDecimal sum = depotHeadService.findAllMoney(supplierId, type, subType, mode, endTime);
if(sum != null) { if(sum != null) {
allMoney = sum; allMoney = sum;
} }
@@ -452,8 +459,8 @@ public class DepotHeadController {
e.printStackTrace(); e.printStackTrace();
} }
//返回正数，如果负数也转为正数 //返回正数，如果负数也转为正数
if (allMoney < 0) { if ((allMoney.compareTo(BigDecimal.ZERO))==-1) {
allMoney = -allMoney; allMoney = allMoney.abs();
} }
return allMoney; 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.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -152,13 +153,13 @@ public class DepotItemController {
if (null != list) { if (null != list) {
for (DepotItemVo4Material di : list) { for (DepotItemVo4Material di : list) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
double prevSum = sumNumber("入库", pid, materialId, monthTime, true) - sumNumber("出库", pid, materialId, monthTime, true); BigDecimal prevSum = sumNumber("入库", pid, materialId, monthTime, true).subtract(sumNumber("出库", pid, materialId, monthTime, true));
double InSum = sumNumber("入库", pid, materialId, monthTime, false); BigDecimal InSum = sumNumber("入库", pid, materialId, monthTime, false);
double OutSum = sumNumber("出库", pid, materialId, monthTime, false); BigDecimal OutSum = sumNumber("出库", pid, materialId, monthTime, false);
item.put("MaterialId", di.getMaterialid() == null ? "" : di.getMaterialid()); item.put("MaterialId", di.getMaterialid() == null ? "" : di.getMaterialid());
item.put("MaterialName", di.getMname()); item.put("MaterialName", di.getMname());
item.put("MaterialModel", di.getMmodel()); item.put("MaterialModel", di.getMmodel());
item.put("thisSum", prevSum + InSum - OutSum); item.put("thisSum", prevSum.add(InSum).subtract(OutSum));
dataArray.add(item); dataArray.add(item);
} }
} }
@@ -425,12 +426,12 @@ public class DepotItemController {
if (null != dataList) { if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
Double prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true) - sumNumber("出库", pid, diEx.getMId(), monthTime, true); BigDecimal prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true).subtract(sumNumber("出库", pid, diEx.getMId(), monthTime, true));
Double InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false); BigDecimal InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false);
Double OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false); BigDecimal OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false);
Double prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true) - sumPrice("出库", pid, diEx.getMId(), monthTime, true); BigDecimal prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true).subtract(sumPrice("出库", pid, diEx.getMId(), monthTime, true));
Double InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false); BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false);
Double OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false); BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false);
item.put("MaterialName", diEx.getMName()); item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMColor()); item.put("MaterialModel", diEx.getMColor());
//扩展信息 //扩展信息
@@ -438,21 +439,21 @@ public class DepotItemController {
item.put("MaterialOther", materialOther); item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor()); item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit()); item.put("MaterialUnit", diEx.getMaterialUnit());
Double unitPrice = 0.0; BigDecimal unitPrice = BigDecimal.ZERO;
if (prevSum + InSum - OutSum != 0.0) { if ((prevSum .add(InSum).subtract(OutSum)).compareTo(BigDecimal.ZERO)!= 0) {
unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum); unitPrice = (prevPrice.add(InPrice).subtract(OutPrice)).divide(prevSum.add(InSum).subtract(OutSum),2, BigDecimal.ROUND_HALF_UP);
/** /**
* 2019-01-15通过除法算出金额后，保留两位小数 * 2019-01-15通过除法算出金额后，保留两位小数
* */ * */
DecimalFormat df = new DecimalFormat("#.00"); DecimalFormat df = new DecimalFormat("#.00");
unitPrice= Double.parseDouble(df.format(unitPrice)); unitPrice= new BigDecimal(df.format(unitPrice));
} }
item.put("UnitPrice", unitPrice); item.put("UnitPrice", unitPrice);
item.put("prevSum", prevSum); item.put("prevSum", prevSum);
item.put("InSum", InSum); item.put("InSum", InSum);
item.put("OutSum", OutSum); item.put("OutSum", OutSum);
item.put("thisSum", prevSum + InSum - OutSum); item.put("thisSum", prevSum.add(InSum).subtract(OutSum));
item.put("thisAllPrice", prevPrice + InPrice - OutPrice); item.put("thisAllPrice", prevPrice.add(InPrice).subtract(OutPrice));
dataArray.add(item); dataArray.add(item);
} }
} }
@@ -486,13 +487,13 @@ public class DepotItemController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, null, null); List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, null, null);
Double thisAllPrice = 0.0; BigDecimal thisAllPrice = BigDecimal.ZERO;
if (null != dataList) { if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) {
Double prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true) - sumPrice("出库", pid, diEx.getMId(), monthTime, true); BigDecimal prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true).subtract(sumPrice("出库", pid, diEx.getMId(), monthTime, true));
Double InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false); BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false);
Double OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false); BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false);
thisAllPrice = thisAllPrice + (prevPrice + InPrice - OutPrice); thisAllPrice = thisAllPrice .add(prevPrice.add(InPrice).subtract(OutPrice));
} }
} }
map.put("totalCount", thisAllPrice); map.put("totalCount", thisAllPrice);
@@ -537,10 +538,10 @@ public class DepotItemController {
if (null != dataList) { if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
Double InSum = sumNumberBuyOrSale("入库", "采购", diEx.getMId(), monthTime); BigDecimal InSum = sumNumberBuyOrSale("入库", "采购", diEx.getMId(), monthTime);
Double OutSum = sumNumberBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime); BigDecimal OutSum = sumNumberBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime);
Double InSumPrice = sumPriceBuyOrSale("入库", "采购", diEx.getMId(), monthTime); BigDecimal InSumPrice = sumPriceBuyOrSale("入库", "采购", diEx.getMId(), monthTime);
Double OutSumPrice = sumPriceBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime); BigDecimal OutSumPrice = sumPriceBuyOrSale("出库", "采购退货", diEx.getMId(), monthTime);
item.put("MaterialName", diEx.getMName()); item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMModel()); item.put("MaterialModel", diEx.getMModel());
//扩展信息 //扩展信息
@@ -597,14 +598,14 @@ public class DepotItemController {
if (null != dataList) { if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
Double OutSumRetail = sumNumberBuyOrSale("出库", "零售", diEx.getMId(), monthTime); BigDecimal OutSumRetail = sumNumberBuyOrSale("出库", "零售", diEx.getMId(), monthTime);
Double OutSum = sumNumberBuyOrSale("出库", "销售", diEx.getMId(), monthTime); BigDecimal OutSum = sumNumberBuyOrSale("出库", "销售", diEx.getMId(), monthTime);
Double InSumRetail = sumNumberBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime); BigDecimal InSumRetail = sumNumberBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime);
Double InSum = sumNumberBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime); BigDecimal InSum = sumNumberBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime);
Double OutSumRetailPrice = sumPriceBuyOrSale("出库", "零售", diEx.getMId(), monthTime); BigDecimal OutSumRetailPrice = sumPriceBuyOrSale("出库", "零售", diEx.getMId(), monthTime);
Double OutSumPrice = sumPriceBuyOrSale("出库", "销售", diEx.getMId(), monthTime); BigDecimal OutSumPrice = sumPriceBuyOrSale("出库", "销售", diEx.getMId(), monthTime);
Double InSumRetailPrice = sumPriceBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime); BigDecimal InSumRetailPrice = sumPriceBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime);
Double InSumPrice = sumPriceBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime); BigDecimal InSumPrice = sumPriceBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime);
item.put("MaterialName", diEx.getMName()); item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMModel()); item.put("MaterialModel", diEx.getMModel());
//扩展信息 //扩展信息
@@ -612,10 +613,10 @@ public class DepotItemController {
item.put("MaterialOther", materialOther); item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor()); item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit()); item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("OutSum", OutSumRetail + OutSum); item.put("OutSum", OutSumRetail.add(OutSum));
item.put("InSum", InSumRetail + InSum); item.put("InSum", InSumRetail.add(InSum));
item.put("OutSumPrice", OutSumRetailPrice + OutSumPrice); item.put("OutSumPrice", OutSumRetailPrice.add(OutSumPrice));
item.put("InSumPrice", InSumRetailPrice + InSumPrice); item.put("InSumPrice", InSumRetailPrice.add(InSumPrice));
dataArray.add(item); dataArray.add(item);
} }
} }
@@ -661,8 +662,8 @@ public class DepotItemController {
if (null != dataList) { if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
Double InSum = sumNumberGift("礼品充值", pid, diEx.getMId(), "in"); BigDecimal InSum = sumNumberGift("礼品充值", pid, diEx.getMId(), "in");
Double OutSum = sumNumberGift("礼品销售", pid, diEx.getMId(), "out"); BigDecimal OutSum = sumNumberGift("礼品销售", pid, diEx.getMId(), "out");
item.put("MaterialName", diEx.getMName()); item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMModel()); item.put("MaterialModel", diEx.getMModel());
//扩展信息 //扩展信息
@@ -670,7 +671,7 @@ public class DepotItemController {
item.put("MaterialOther", materialOther); item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor()); item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit()); item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("thisSum", InSum - OutSum); item.put("thisSum", InSum.subtract(OutSum));
dataArray.add(item); dataArray.add(item);
} }
} }
@@ -718,23 +719,23 @@ public class DepotItemController {
if (null != dataList) { if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) {
String[] objs = new String[9]; String[] objs = new String[9];
Double prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true) - sumNumber("出库", pid, diEx.getMId(), monthTime, true); BigDecimal prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true).subtract(sumNumber("出库", pid, diEx.getMId(), monthTime, true));
Double InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false); BigDecimal InSum = sumNumber("入库", pid, diEx.getMId(), monthTime, false);
Double OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false); BigDecimal OutSum = sumNumber("出库", pid, diEx.getMId(), monthTime, false);
Double prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true) - sumPrice("出库", pid, diEx.getMId(), monthTime, true); BigDecimal prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true).subtract(sumPrice("出库", pid, diEx.getMId(), monthTime, true));
Double InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false); BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false);
Double OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false); BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false);
Double unitPrice = 0.0; BigDecimal unitPrice = BigDecimal.ZERO;
if (prevSum + InSum - OutSum != 0.0) { if ((prevSum.add(InSum).subtract(OutSum)).compareTo(BigDecimal.ZERO) != 0) {
unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum); unitPrice = (prevPrice.add(InPrice).subtract(OutPrice)).divide(prevSum.add(InSum).subtract(OutSum),2, BigDecimal.ROUND_HALF_UP);
/** /**
* 2019-01-15通过除法算出金额后，保留两位小数 * 2019-01-15通过除法算出金额后，保留两位小数
* */ * */
DecimalFormat df = new DecimalFormat("#.00"); DecimalFormat df = new DecimalFormat("#.00");
unitPrice= Double.parseDouble(df.format(unitPrice)); unitPrice= new BigDecimal(df.format(unitPrice));
} }
Double thisSum = prevSum + InSum - OutSum; BigDecimal thisSum = prevSum.add(InSum).subtract(OutSum);
Double thisAllPrice = prevPrice + InPrice - OutPrice; BigDecimal thisAllPrice = prevPrice.add(InPrice).subtract(OutPrice);
objs[0] = diEx.getMName().toString(); objs[0] = diEx.getMName().toString();
objs[1] = diEx.getMModel().toString(); objs[1] = diEx.getMModel().toString();
objs[2] = diEx.getMaterialUnit().toString(); objs[2] = diEx.getMaterialUnit().toString();
@@ -770,10 +771,10 @@ public class DepotItemController {
* @param isPrev * @param isPrev
* @return * @return
*/ */
public Double sumNumber(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) { public BigDecimal sumNumber(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
Double sumNumber = 0.0; BigDecimal sumNumber = BigDecimal.ZERO;
try { try {
Double sum = depotItemService.findByType(type, ProjectId, MId, MonthTime, isPrev); BigDecimal sum = depotItemService.findByType(type, ProjectId, MId, MonthTime, isPrev);
if(sum != null) { if(sum != null) {
sumNumber = sum; sumNumber = sum;
} }
@@ -792,10 +793,10 @@ public class DepotItemController {
* @param isPrev * @param isPrev
* @return * @return
*/ */
public Double sumPrice(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) { public BigDecimal sumPrice(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
Double sumPrice = 0.0; BigDecimal sumPrice = BigDecimal.ZERO;
try { try {
Double sum = depotItemService.findPriceByType(type, ProjectId, MId, MonthTime, isPrev); BigDecimal sum = depotItemService.findPriceByType(type, ProjectId, MId, MonthTime, isPrev);
if(sum != null) { if(sum != null) {
sumPrice = sum; sumPrice = sum;
} }
@@ -805,11 +806,11 @@ public class DepotItemController {
return sumPrice; return sumPrice;
} }
public Double sumNumberBuyOrSale(String type, String subType, Long MId, String MonthTime) { public BigDecimal sumNumberBuyOrSale(String type, String subType, Long MId, String MonthTime) {
Double sumNumber = 0.0; BigDecimal sumNumber = BigDecimal.ZERO;
String sumType = "Number"; String sumType = "Number";
try { try {
Double sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType); BigDecimal sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
if(sum != null) { if(sum != null) {
sumNumber = sum; sumNumber = sum;
} }
@@ -819,11 +820,11 @@ public class DepotItemController {
return sumNumber; return sumNumber;
} }
public Double sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) { public BigDecimal sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) {
Double sumPrice = 0.0; BigDecimal sumPrice = BigDecimal.ZERO;
String sumType = "Price"; String sumType = "Price";
try { try {
Double sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType); BigDecimal sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
if(sum != null) { if(sum != null) {
sumPrice = sum; sumPrice = sum;
} }
@@ -841,12 +842,12 @@ public class DepotItemController {
* @param type * @param type
* @return * @return
*/ */
public Double sumNumberGift(String subType, Integer ProjectId, Long MId, String type) { public BigDecimal sumNumberGift(String subType, Integer ProjectId, Long MId, String type) {
Double sumNumber = 0.0; BigDecimal sumNumber = BigDecimal.ZERO;
String allNumber = ""; String allNumber = "";
try { try {
if (ProjectId != null) { if (ProjectId != null) {
Double sum = depotItemService.findGiftByType(subType, ProjectId, MId, type); BigDecimal sum = depotItemService.findGiftByType(subType, ProjectId, MId, type);
if(sum != null) { if(sum != null) {
sumNumber = sum; 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.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -270,19 +271,19 @@ public class MaterialController {
for (int i = 1; i < src.getRows(); i++) { for (int i = 1; i < src.getRows(); i++) {
Material m = new Material(); Material m = new Material();
m.setName(ExcelUtils.getContent(src, i, 0)); m.setName(ExcelUtils.getContent(src, i, 0));
m.setCategoryid(1l); //根目录 m.setCategoryid(1L); //根目录
m.setModel(ExcelUtils.getContent(src, i, 2)); m.setModel(ExcelUtils.getContent(src, i, 2));
String safetyStock = ExcelUtils.getContent(src, i, 3); String safetyStock = ExcelUtils.getContent(src, i, 3);
m.setSafetystock(parseDoubleEx(safetyStock)); m.setSafetystock(parseBigDecimalEx(safetyStock));
m.setUnit(ExcelUtils.getContent(src, i, 4)); m.setUnit(ExcelUtils.getContent(src, i, 4));
String retailprice = ExcelUtils.getContent(src, i, 5); String retailprice = ExcelUtils.getContent(src, i, 5);
m.setRetailprice(parseDoubleEx(retailprice)); m.setRetailprice(parseBigDecimalEx(retailprice));
String lowPrice = ExcelUtils.getContent(src, i, 6); String lowPrice = ExcelUtils.getContent(src, i, 6);
m.setLowprice(parseDoubleEx(lowPrice)); m.setLowprice(parseBigDecimalEx(lowPrice));
String presetpriceone = ExcelUtils.getContent(src, i, 7); String presetpriceone = ExcelUtils.getContent(src, i, 7);
m.setPresetpriceone(parseDoubleEx(presetpriceone)); m.setPresetpriceone(parseBigDecimalEx(presetpriceone));
String presetpricetwo = ExcelUtils.getContent(src, i, 8); String presetpricetwo = ExcelUtils.getContent(src, i, 8);
m.setPresetpricetwo(parseDoubleEx(presetpricetwo)); m.setPresetpricetwo(parseBigDecimalEx(presetpricetwo));
m.setRemark(ExcelUtils.getContent(src, i, 9)); m.setRemark(ExcelUtils.getContent(src, i, 9));
String enabled = ExcelUtils.getContent(src, i, 10); String enabled = ExcelUtils.getContent(src, i, 10);
m.setEnabled(enabled.equals("启用")? true: false); m.setEnabled(enabled.equals("启用")? true: false);
@@ -299,9 +300,9 @@ public class MaterialController {
response.sendRedirect("../pages/materials/material.html"); response.sendRedirect("../pages/materials/material.html");
} }
public Double parseDoubleEx(String str){ public BigDecimal parseBigDecimalEx(String str){
if(!StringUtil.isEmpty(str)) { if(!StringUtil.isEmpty(str)) {
return Double.parseDouble(str); return new BigDecimal(str);
} else { } else {
return null; 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.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -48,7 +49,7 @@ public class SupplierController {
*/ */
@PostMapping(value = "/updateAdvanceIn") @PostMapping(value = "/updateAdvanceIn")
public String updateAdvanceIn(@RequestParam("supplierId") Long supplierId, public String updateAdvanceIn(@RequestParam("supplierId") Long supplierId,
@RequestParam("advanceIn") Double advanceIn, @RequestParam("advanceIn") BigDecimal advanceIn,
HttpServletRequest request) { HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>(); Map<String, Object> objectMap = new HashMap<String, Object>();
int res = supplierService.updateAdvanceIn(supplierId, advanceIn); int res = supplierService.updateAdvanceIn(supplierId, advanceIn);
@@ -396,9 +397,9 @@ public class SupplierController {
s.setContacts(ExcelUtils.getContent(src, i, 2)); s.setContacts(ExcelUtils.getContent(src, i, 2));
s.setPhonenum(ExcelUtils.getContent(src, i, 3)); s.setPhonenum(ExcelUtils.getContent(src, i, 3));
s.setEmail(ExcelUtils.getContent(src, i, 4)); s.setEmail(ExcelUtils.getContent(src, i, 4));
s.setAdvancein(parseDoubleEx(ExcelUtils.getContent(src, i, 5))); s.setAdvancein(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
s.setBeginneedget(parseDoubleEx(ExcelUtils.getContent(src, i, 6))); s.setBeginneedget(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
s.setBeginneedpay(parseDoubleEx(ExcelUtils.getContent(src, i, 7))); s.setBeginneedpay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
s.setDescription(ExcelUtils.getContent(src, i, 8)); s.setDescription(ExcelUtils.getContent(src, i, 8));
s.setFax(ExcelUtils.getContent(src, i, 9)); s.setFax(ExcelUtils.getContent(src, i, 9));
s.setTelephone(ExcelUtils.getContent(src, i, 10)); s.setTelephone(ExcelUtils.getContent(src, i, 10));
@@ -406,7 +407,7 @@ public class SupplierController {
s.setTaxnum(ExcelUtils.getContent(src, i, 12)); s.setTaxnum(ExcelUtils.getContent(src, i, 12));
s.setBankname(ExcelUtils.getContent(src, i, 13)); s.setBankname(ExcelUtils.getContent(src, i, 13));
s.setAccountnumber(ExcelUtils.getContent(src, i, 14)); 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); String enabled = ExcelUtils.getContent(src, i, 16);
s.setEnabled(enabled.equals("启用")? true: false); s.setEnabled(enabled.equals("启用")? true: false);
s.setIsystem(Byte.parseByte("1")); s.setIsystem(Byte.parseByte("1"));
@@ -423,9 +424,9 @@ public class SupplierController {
return null; return null;
} }
public Double parseDoubleEx(String str){ public BigDecimal parseBigDecimalEx(String str){
if(!StringUtil.isEmpty(str)) { if(!StringUtil.isEmpty(str)) {
return Double.parseDouble(str); return new BigDecimal(str);
} else { } else {
return null; return null;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Account { public class Account {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -31,7 +33,7 @@ public class Account {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double initialamount; private BigDecimal initialamount;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -39,7 +41,7 @@ public class Account {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double currentamount; private BigDecimal currentamount;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -137,7 +139,7 @@ public class Account {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getInitialamount() { public BigDecimal getInitialamount() {
return initialamount; return initialamount;
} }
@@ -149,7 +151,7 @@ public class Account {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setInitialamount(Double initialamount) { public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount; this.initialamount = initialamount;
} }
@@ -161,7 +163,7 @@ public class Account {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getCurrentamount() { public BigDecimal getCurrentamount() {
return currentamount; return currentamount;
} }
@@ -173,7 +175,7 @@ public class Account {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setCurrentamount(Double currentamount) { public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount; this.currentamount = currentamount;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -404,52 +405,52 @@ public class AccountExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountEqualTo(Double value) { public Criteria andInitialamountEqualTo(BigDecimal value) {
addCriterion("InitialAmount =", value, "initialamount"); addCriterion("InitialAmount =", value, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountNotEqualTo(Double value) { public Criteria andInitialamountNotEqualTo(BigDecimal value) {
addCriterion("InitialAmount <>", value, "initialamount"); addCriterion("InitialAmount <>", value, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountGreaterThan(Double value) { public Criteria andInitialamountGreaterThan(BigDecimal value) {
addCriterion("InitialAmount >", value, "initialamount"); addCriterion("InitialAmount >", value, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountGreaterThanOrEqualTo(Double value) { public Criteria andInitialamountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("InitialAmount >=", value, "initialamount"); addCriterion("InitialAmount >=", value, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountLessThan(Double value) { public Criteria andInitialamountLessThan(BigDecimal value) {
addCriterion("InitialAmount <", value, "initialamount"); addCriterion("InitialAmount <", value, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountLessThanOrEqualTo(Double value) { public Criteria andInitialamountLessThanOrEqualTo(BigDecimal value) {
addCriterion("InitialAmount <=", value, "initialamount"); addCriterion("InitialAmount <=", value, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountIn(List<Double> values) { public Criteria andInitialamountIn(List<BigDecimal> values) {
addCriterion("InitialAmount in", values, "initialamount"); addCriterion("InitialAmount in", values, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountNotIn(List<Double> values) { public Criteria andInitialamountNotIn(List<BigDecimal> values) {
addCriterion("InitialAmount not in", values, "initialamount"); addCriterion("InitialAmount not in", values, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountBetween(Double value1, Double value2) { public Criteria andInitialamountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("InitialAmount between", value1, value2, "initialamount"); addCriterion("InitialAmount between", value1, value2, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountNotBetween(Double value1, Double value2) { public Criteria andInitialamountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("InitialAmount not between", value1, value2, "initialamount"); addCriterion("InitialAmount not between", value1, value2, "initialamount");
return (Criteria) this; return (Criteria) this;
} }
@@ -464,52 +465,52 @@ public class AccountExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountEqualTo(Double value) { public Criteria andCurrentamountEqualTo(BigDecimal value) {
addCriterion("CurrentAmount =", value, "currentamount"); addCriterion("CurrentAmount =", value, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountNotEqualTo(Double value) { public Criteria andCurrentamountNotEqualTo(BigDecimal value) {
addCriterion("CurrentAmount <>", value, "currentamount"); addCriterion("CurrentAmount <>", value, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountGreaterThan(Double value) { public Criteria andCurrentamountGreaterThan(BigDecimal value) {
addCriterion("CurrentAmount >", value, "currentamount"); addCriterion("CurrentAmount >", value, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountGreaterThanOrEqualTo(Double value) { public Criteria andCurrentamountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("CurrentAmount >=", value, "currentamount"); addCriterion("CurrentAmount >=", value, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountLessThan(Double value) { public Criteria andCurrentamountLessThan(BigDecimal value) {
addCriterion("CurrentAmount <", value, "currentamount"); addCriterion("CurrentAmount <", value, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountLessThanOrEqualTo(Double value) { public Criteria andCurrentamountLessThanOrEqualTo(BigDecimal value) {
addCriterion("CurrentAmount <=", value, "currentamount"); addCriterion("CurrentAmount <=", value, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountIn(List<Double> values) { public Criteria andCurrentamountIn(List<BigDecimal> values) {
addCriterion("CurrentAmount in", values, "currentamount"); addCriterion("CurrentAmount in", values, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountNotIn(List<Double> values) { public Criteria andCurrentamountNotIn(List<BigDecimal> values) {
addCriterion("CurrentAmount not in", values, "currentamount"); addCriterion("CurrentAmount not in", values, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountBetween(Double value1, Double value2) { public Criteria andCurrentamountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("CurrentAmount between", value1, value2, "currentamount"); addCriterion("CurrentAmount between", value1, value2, "currentamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountNotBetween(Double value1, Double value2) { public Criteria andCurrentamountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("CurrentAmount not between", value1, value2, "currentamount"); addCriterion("CurrentAmount not between", value1, value2, "currentamount");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
public class AccountHead { public class AccountHead {
@@ -41,7 +42,7 @@ public class AccountHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double changeamount; private BigDecimal changeamount;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -49,7 +50,7 @@ public class AccountHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double totalprice; private BigDecimal totalprice;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -187,7 +188,7 @@ public class AccountHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getChangeamount() { public BigDecimal getChangeamount() {
return changeamount; return changeamount;
} }
@@ -199,7 +200,7 @@ public class AccountHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setChangeamount(Double changeamount) { public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount; this.changeamount = changeamount;
} }
@@ -211,7 +212,7 @@ public class AccountHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTotalprice() { public BigDecimal getTotalprice() {
return totalprice; return totalprice;
} }
@@ -223,7 +224,7 @@ public class AccountHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTotalprice(Double totalprice) { public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice; this.totalprice = totalprice;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -455,52 +456,52 @@ public class AccountHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountEqualTo(Double value) { public Criteria andChangeamountEqualTo(BigDecimal value) {
addCriterion("ChangeAmount =", value, "changeamount"); addCriterion("ChangeAmount =", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountNotEqualTo(Double value) { public Criteria andChangeamountNotEqualTo(BigDecimal value) {
addCriterion("ChangeAmount <>", value, "changeamount"); addCriterion("ChangeAmount <>", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountGreaterThan(Double value) { public Criteria andChangeamountGreaterThan(BigDecimal value) {
addCriterion("ChangeAmount >", value, "changeamount"); addCriterion("ChangeAmount >", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountGreaterThanOrEqualTo(Double value) { public Criteria andChangeamountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ChangeAmount >=", value, "changeamount"); addCriterion("ChangeAmount >=", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountLessThan(Double value) { public Criteria andChangeamountLessThan(BigDecimal value) {
addCriterion("ChangeAmount <", value, "changeamount"); addCriterion("ChangeAmount <", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountLessThanOrEqualTo(Double value) { public Criteria andChangeamountLessThanOrEqualTo(BigDecimal value) {
addCriterion("ChangeAmount <=", value, "changeamount"); addCriterion("ChangeAmount <=", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountIn(List<Double> values) { public Criteria andChangeamountIn(List<BigDecimal> values) {
addCriterion("ChangeAmount in", values, "changeamount"); addCriterion("ChangeAmount in", values, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountNotIn(List<Double> values) { public Criteria andChangeamountNotIn(List<BigDecimal> values) {
addCriterion("ChangeAmount not in", values, "changeamount"); addCriterion("ChangeAmount not in", values, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountBetween(Double value1, Double value2) { public Criteria andChangeamountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ChangeAmount between", value1, value2, "changeamount"); addCriterion("ChangeAmount between", value1, value2, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountNotBetween(Double value1, Double value2) { public Criteria andChangeamountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ChangeAmount not between", value1, value2, "changeamount"); addCriterion("ChangeAmount not between", value1, value2, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
@@ -515,52 +516,52 @@ public class AccountHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceEqualTo(Double value) { public Criteria andTotalpriceEqualTo(BigDecimal value) {
addCriterion("TotalPrice =", value, "totalprice"); addCriterion("TotalPrice =", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceNotEqualTo(Double value) { public Criteria andTotalpriceNotEqualTo(BigDecimal value) {
addCriterion("TotalPrice <>", value, "totalprice"); addCriterion("TotalPrice <>", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceGreaterThan(Double value) { public Criteria andTotalpriceGreaterThan(BigDecimal value) {
addCriterion("TotalPrice >", value, "totalprice"); addCriterion("TotalPrice >", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceGreaterThanOrEqualTo(Double value) { public Criteria andTotalpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("TotalPrice >=", value, "totalprice"); addCriterion("TotalPrice >=", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceLessThan(Double value) { public Criteria andTotalpriceLessThan(BigDecimal value) {
addCriterion("TotalPrice <", value, "totalprice"); addCriterion("TotalPrice <", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceLessThanOrEqualTo(Double value) { public Criteria andTotalpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("TotalPrice <=", value, "totalprice"); addCriterion("TotalPrice <=", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceIn(List<Double> values) { public Criteria andTotalpriceIn(List<BigDecimal> values) {
addCriterion("TotalPrice in", values, "totalprice"); addCriterion("TotalPrice in", values, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceNotIn(List<Double> values) { public Criteria andTotalpriceNotIn(List<BigDecimal> values) {
addCriterion("TotalPrice not in", values, "totalprice"); addCriterion("TotalPrice not in", values, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceBetween(Double value1, Double value2) { public Criteria andTotalpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TotalPrice between", value1, value2, "totalprice"); addCriterion("TotalPrice between", value1, value2, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceNotBetween(Double value1, Double value2) { public Criteria andTotalpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TotalPrice not between", value1, value2, "totalprice"); addCriterion("TotalPrice not between", value1, value2, "totalprice");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
public class AccountHeadVo4ListEx { public class AccountHeadVo4ListEx {
@@ -12,9 +13,9 @@ public class AccountHeadVo4ListEx {
private Long handspersonid; private Long handspersonid;
private Double changeamount; private BigDecimal changeamount;
private Double totalprice; private BigDecimal totalprice;
private Long accountid; private Long accountid;
@@ -62,19 +63,19 @@ public class AccountHeadVo4ListEx {
this.handspersonid = handspersonid; this.handspersonid = handspersonid;
} }
public Double getChangeamount() { public BigDecimal getChangeamount() {
return changeamount; return changeamount;
} }
public void setChangeamount(Double changeamount) { public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount; this.changeamount = changeamount;
} }
public Double getTotalprice() { public BigDecimal getTotalprice() {
return totalprice; return totalprice;
} }
public void setTotalprice(Double totalprice) { public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice; this.totalprice = totalprice;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class AccountItem { public class AccountItem {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -39,7 +41,7 @@ public class AccountItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double eachamount; private BigDecimal eachamount;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -153,7 +155,7 @@ public class AccountItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getEachamount() { public BigDecimal getEachamount() {
return eachamount; return eachamount;
} }
@@ -165,7 +167,7 @@ public class AccountItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setEachamount(Double eachamount) { public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount; this.eachamount = eachamount;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -444,52 +445,52 @@ public class AccountItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountEqualTo(Double value) { public Criteria andEachamountEqualTo(BigDecimal value) {
addCriterion("EachAmount =", value, "eachamount"); addCriterion("EachAmount =", value, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountNotEqualTo(Double value) { public Criteria andEachamountNotEqualTo(BigDecimal value) {
addCriterion("EachAmount <>", value, "eachamount"); addCriterion("EachAmount <>", value, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountGreaterThan(Double value) { public Criteria andEachamountGreaterThan(BigDecimal value) {
addCriterion("EachAmount >", value, "eachamount"); addCriterion("EachAmount >", value, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountGreaterThanOrEqualTo(Double value) { public Criteria andEachamountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("EachAmount >=", value, "eachamount"); addCriterion("EachAmount >=", value, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountLessThan(Double value) { public Criteria andEachamountLessThan(BigDecimal value) {
addCriterion("EachAmount <", value, "eachamount"); addCriterion("EachAmount <", value, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountLessThanOrEqualTo(Double value) { public Criteria andEachamountLessThanOrEqualTo(BigDecimal value) {
addCriterion("EachAmount <=", value, "eachamount"); addCriterion("EachAmount <=", value, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountIn(List<Double> values) { public Criteria andEachamountIn(List<BigDecimal> values) {
addCriterion("EachAmount in", values, "eachamount"); addCriterion("EachAmount in", values, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountNotIn(List<Double> values) { public Criteria andEachamountNotIn(List<BigDecimal> values) {
addCriterion("EachAmount not in", values, "eachamount"); addCriterion("EachAmount not in", values, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountBetween(Double value1, Double value2) { public Criteria andEachamountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("EachAmount between", value1, value2, "eachamount"); addCriterion("EachAmount between", value1, value2, "eachamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andEachamountNotBetween(Double value1, Double value2) { public Criteria andEachamountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("EachAmount not between", value1, value2, "eachamount"); addCriterion("EachAmount not between", value1, value2, "eachamount");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
public class Asset { public class Asset {
@@ -57,7 +58,7 @@ public class Asset {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double price; private BigDecimal price;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -307,7 +308,7 @@ public class Asset {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getPrice() { public BigDecimal getPrice() {
return price; return price;
} }
@@ -319,7 +320,7 @@ public class Asset {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setPrice(Double price) { public void setPrice(BigDecimal price) {
this.price = price; this.price = price;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -585,52 +586,52 @@ public class AssetExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceEqualTo(Double value) { public Criteria andPriceEqualTo(BigDecimal value) {
addCriterion("price =", value, "price"); addCriterion("price =", value, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceNotEqualTo(Double value) { public Criteria andPriceNotEqualTo(BigDecimal value) {
addCriterion("price <>", value, "price"); addCriterion("price <>", value, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceGreaterThan(Double value) { public Criteria andPriceGreaterThan(BigDecimal value) {
addCriterion("price >", value, "price"); addCriterion("price >", value, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceGreaterThanOrEqualTo(Double value) { public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("price >=", value, "price"); addCriterion("price >=", value, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceLessThan(Double value) { public Criteria andPriceLessThan(BigDecimal value) {
addCriterion("price <", value, "price"); addCriterion("price <", value, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceLessThanOrEqualTo(Double value) { public Criteria andPriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("price <=", value, "price"); addCriterion("price <=", value, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceIn(List<Double> values) { public Criteria andPriceIn(List<BigDecimal> values) {
addCriterion("price in", values, "price"); addCriterion("price in", values, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceNotIn(List<Double> values) { public Criteria andPriceNotIn(List<BigDecimal> values) {
addCriterion("price not in", values, "price"); addCriterion("price not in", values, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceBetween(Double value1, Double value2) { public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("price between", value1, value2, "price"); addCriterion("price between", value1, value2, "price");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPriceNotBetween(Double value1, Double value2) { public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("price not between", value1, value2, "price"); addCriterion("price not between", value1, value2, "price");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Depot { public class Depot {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -31,7 +33,7 @@ public class Depot {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double warehousing; private BigDecimal warehousing;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -39,7 +41,7 @@ public class Depot {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double truckage; private BigDecimal truckage;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -145,7 +147,7 @@ public class Depot {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getWarehousing() { public BigDecimal getWarehousing() {
return warehousing; return warehousing;
} }
@@ -157,7 +159,7 @@ public class Depot {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setWarehousing(Double warehousing) { public void setWarehousing(BigDecimal warehousing) {
this.warehousing = warehousing; this.warehousing = warehousing;
} }
@@ -169,7 +171,7 @@ public class Depot {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTruckage() { public BigDecimal getTruckage() {
return truckage; return truckage;
} }
@@ -181,7 +183,7 @@ public class Depot {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTruckage(Double truckage) { public void setTruckage(BigDecimal truckage) {
this.truckage = truckage; this.truckage = truckage;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -404,52 +405,52 @@ public class DepotExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingEqualTo(Double value) { public Criteria andWarehousingEqualTo(BigDecimal value) {
addCriterion("warehousing =", value, "warehousing"); addCriterion("warehousing =", value, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingNotEqualTo(Double value) { public Criteria andWarehousingNotEqualTo(BigDecimal value) {
addCriterion("warehousing <>", value, "warehousing"); addCriterion("warehousing <>", value, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingGreaterThan(Double value) { public Criteria andWarehousingGreaterThan(BigDecimal value) {
addCriterion("warehousing >", value, "warehousing"); addCriterion("warehousing >", value, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingGreaterThanOrEqualTo(Double value) { public Criteria andWarehousingGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("warehousing >=", value, "warehousing"); addCriterion("warehousing >=", value, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingLessThan(Double value) { public Criteria andWarehousingLessThan(BigDecimal value) {
addCriterion("warehousing <", value, "warehousing"); addCriterion("warehousing <", value, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingLessThanOrEqualTo(Double value) { public Criteria andWarehousingLessThanOrEqualTo(BigDecimal value) {
addCriterion("warehousing <=", value, "warehousing"); addCriterion("warehousing <=", value, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingIn(List<Double> values) { public Criteria andWarehousingIn(List<BigDecimal> values) {
addCriterion("warehousing in", values, "warehousing"); addCriterion("warehousing in", values, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingNotIn(List<Double> values) { public Criteria andWarehousingNotIn(List<BigDecimal> values) {
addCriterion("warehousing not in", values, "warehousing"); addCriterion("warehousing not in", values, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingBetween(Double value1, Double value2) { public Criteria andWarehousingBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("warehousing between", value1, value2, "warehousing"); addCriterion("warehousing between", value1, value2, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWarehousingNotBetween(Double value1, Double value2) { public Criteria andWarehousingNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("warehousing not between", value1, value2, "warehousing"); addCriterion("warehousing not between", value1, value2, "warehousing");
return (Criteria) this; return (Criteria) this;
} }
@@ -464,52 +465,52 @@ public class DepotExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageEqualTo(Double value) { public Criteria andTruckageEqualTo(BigDecimal value) {
addCriterion("truckage =", value, "truckage"); addCriterion("truckage =", value, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageNotEqualTo(Double value) { public Criteria andTruckageNotEqualTo(BigDecimal value) {
addCriterion("truckage <>", value, "truckage"); addCriterion("truckage <>", value, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageGreaterThan(Double value) { public Criteria andTruckageGreaterThan(BigDecimal value) {
addCriterion("truckage >", value, "truckage"); addCriterion("truckage >", value, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageGreaterThanOrEqualTo(Double value) { public Criteria andTruckageGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("truckage >=", value, "truckage"); addCriterion("truckage >=", value, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageLessThan(Double value) { public Criteria andTruckageLessThan(BigDecimal value) {
addCriterion("truckage <", value, "truckage"); addCriterion("truckage <", value, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageLessThanOrEqualTo(Double value) { public Criteria andTruckageLessThanOrEqualTo(BigDecimal value) {
addCriterion("truckage <=", value, "truckage"); addCriterion("truckage <=", value, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageIn(List<Double> values) { public Criteria andTruckageIn(List<BigDecimal> values) {
addCriterion("truckage in", values, "truckage"); addCriterion("truckage in", values, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageNotIn(List<Double> values) { public Criteria andTruckageNotIn(List<BigDecimal> values) {
addCriterion("truckage not in", values, "truckage"); addCriterion("truckage not in", values, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageBetween(Double value1, Double value2) { public Criteria andTruckageBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("truckage between", value1, value2, "truckage"); addCriterion("truckage between", value1, value2, "truckage");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTruckageNotBetween(Double value1, Double value2) { public Criteria andTruckageNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("truckage not between", value1, value2, "truckage"); addCriterion("truckage not between", value1, value2, "truckage");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
public class DepotHead { public class DepotHead {
@@ -105,7 +106,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double changeamount; private BigDecimal changeamount;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -121,7 +122,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double totalprice; private BigDecimal totalprice;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -169,7 +170,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double discount; private BigDecimal discount;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -177,7 +178,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double discountmoney; private BigDecimal discountmoney;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -185,7 +186,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double discountlastmoney; private BigDecimal discountlastmoney;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -193,7 +194,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double othermoney; private BigDecimal othermoney;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -523,7 +524,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getChangeamount() { public BigDecimal getChangeamount() {
return changeamount; return changeamount;
} }
@@ -535,7 +536,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setChangeamount(Double changeamount) { public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount; this.changeamount = changeamount;
} }
@@ -571,7 +572,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTotalprice() { public BigDecimal getTotalprice() {
return totalprice; return totalprice;
} }
@@ -583,7 +584,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTotalprice(Double totalprice) { public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice; this.totalprice = totalprice;
} }
@@ -715,7 +716,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getDiscount() { public BigDecimal getDiscount() {
return discount; return discount;
} }
@@ -727,7 +728,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setDiscount(Double discount) { public void setDiscount(BigDecimal discount) {
this.discount = discount; this.discount = discount;
} }
@@ -739,7 +740,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getDiscountmoney() { public BigDecimal getDiscountmoney() {
return discountmoney; return discountmoney;
} }
@@ -751,7 +752,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setDiscountmoney(Double discountmoney) { public void setDiscountmoney(BigDecimal discountmoney) {
this.discountmoney = discountmoney; this.discountmoney = discountmoney;
} }
@@ -763,7 +764,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getDiscountlastmoney() { public BigDecimal getDiscountlastmoney() {
return discountlastmoney; return discountlastmoney;
} }
@@ -775,7 +776,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setDiscountlastmoney(Double discountlastmoney) { public void setDiscountlastmoney(BigDecimal discountlastmoney) {
this.discountlastmoney = discountlastmoney; this.discountlastmoney = discountlastmoney;
} }
@@ -787,7 +788,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getOthermoney() { public BigDecimal getOthermoney() {
return othermoney; return othermoney;
} }
@@ -799,7 +800,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setOthermoney(Double othermoney) { public void setOthermoney(BigDecimal othermoney) {
this.othermoney = othermoney; this.othermoney = othermoney;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -975,52 +976,52 @@ public class DepotHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountEqualTo(Double value) { public Criteria andChangeamountEqualTo(BigDecimal value) {
addCriterion("ChangeAmount =", value, "changeamount"); addCriterion("ChangeAmount =", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountNotEqualTo(Double value) { public Criteria andChangeamountNotEqualTo(BigDecimal value) {
addCriterion("ChangeAmount <>", value, "changeamount"); addCriterion("ChangeAmount <>", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountGreaterThan(Double value) { public Criteria andChangeamountGreaterThan(BigDecimal value) {
addCriterion("ChangeAmount >", value, "changeamount"); addCriterion("ChangeAmount >", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountGreaterThanOrEqualTo(Double value) { public Criteria andChangeamountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ChangeAmount >=", value, "changeamount"); addCriterion("ChangeAmount >=", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountLessThan(Double value) { public Criteria andChangeamountLessThan(BigDecimal value) {
addCriterion("ChangeAmount <", value, "changeamount"); addCriterion("ChangeAmount <", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountLessThanOrEqualTo(Double value) { public Criteria andChangeamountLessThanOrEqualTo(BigDecimal value) {
addCriterion("ChangeAmount <=", value, "changeamount"); addCriterion("ChangeAmount <=", value, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountIn(List<Double> values) { public Criteria andChangeamountIn(List<BigDecimal> values) {
addCriterion("ChangeAmount in", values, "changeamount"); addCriterion("ChangeAmount in", values, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountNotIn(List<Double> values) { public Criteria andChangeamountNotIn(List<BigDecimal> values) {
addCriterion("ChangeAmount not in", values, "changeamount"); addCriterion("ChangeAmount not in", values, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountBetween(Double value1, Double value2) { public Criteria andChangeamountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ChangeAmount between", value1, value2, "changeamount"); addCriterion("ChangeAmount between", value1, value2, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andChangeamountNotBetween(Double value1, Double value2) { public Criteria andChangeamountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ChangeAmount not between", value1, value2, "changeamount"); addCriterion("ChangeAmount not between", value1, value2, "changeamount");
return (Criteria) this; return (Criteria) this;
} }
@@ -1095,52 +1096,52 @@ public class DepotHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceEqualTo(Double value) { public Criteria andTotalpriceEqualTo(BigDecimal value) {
addCriterion("TotalPrice =", value, "totalprice"); addCriterion("TotalPrice =", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceNotEqualTo(Double value) { public Criteria andTotalpriceNotEqualTo(BigDecimal value) {
addCriterion("TotalPrice <>", value, "totalprice"); addCriterion("TotalPrice <>", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceGreaterThan(Double value) { public Criteria andTotalpriceGreaterThan(BigDecimal value) {
addCriterion("TotalPrice >", value, "totalprice"); addCriterion("TotalPrice >", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceGreaterThanOrEqualTo(Double value) { public Criteria andTotalpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("TotalPrice >=", value, "totalprice"); addCriterion("TotalPrice >=", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceLessThan(Double value) { public Criteria andTotalpriceLessThan(BigDecimal value) {
addCriterion("TotalPrice <", value, "totalprice"); addCriterion("TotalPrice <", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceLessThanOrEqualTo(Double value) { public Criteria andTotalpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("TotalPrice <=", value, "totalprice"); addCriterion("TotalPrice <=", value, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceIn(List<Double> values) { public Criteria andTotalpriceIn(List<BigDecimal> values) {
addCriterion("TotalPrice in", values, "totalprice"); addCriterion("TotalPrice in", values, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceNotIn(List<Double> values) { public Criteria andTotalpriceNotIn(List<BigDecimal> values) {
addCriterion("TotalPrice not in", values, "totalprice"); addCriterion("TotalPrice not in", values, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceBetween(Double value1, Double value2) { public Criteria andTotalpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TotalPrice between", value1, value2, "totalprice"); addCriterion("TotalPrice between", value1, value2, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTotalpriceNotBetween(Double value1, Double value2) { public Criteria andTotalpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TotalPrice not between", value1, value2, "totalprice"); addCriterion("TotalPrice not between", value1, value2, "totalprice");
return (Criteria) this; return (Criteria) this;
} }
@@ -1505,52 +1506,52 @@ public class DepotHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountEqualTo(Double value) { public Criteria andDiscountEqualTo(BigDecimal value) {
addCriterion("Discount =", value, "discount"); addCriterion("Discount =", value, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountNotEqualTo(Double value) { public Criteria andDiscountNotEqualTo(BigDecimal value) {
addCriterion("Discount <>", value, "discount"); addCriterion("Discount <>", value, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountGreaterThan(Double value) { public Criteria andDiscountGreaterThan(BigDecimal value) {
addCriterion("Discount >", value, "discount"); addCriterion("Discount >", value, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountGreaterThanOrEqualTo(Double value) { public Criteria andDiscountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("Discount >=", value, "discount"); addCriterion("Discount >=", value, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountLessThan(Double value) { public Criteria andDiscountLessThan(BigDecimal value) {
addCriterion("Discount <", value, "discount"); addCriterion("Discount <", value, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountLessThanOrEqualTo(Double value) { public Criteria andDiscountLessThanOrEqualTo(BigDecimal value) {
addCriterion("Discount <=", value, "discount"); addCriterion("Discount <=", value, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountIn(List<Double> values) { public Criteria andDiscountIn(List<BigDecimal> values) {
addCriterion("Discount in", values, "discount"); addCriterion("Discount in", values, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountNotIn(List<Double> values) { public Criteria andDiscountNotIn(List<BigDecimal> values) {
addCriterion("Discount not in", values, "discount"); addCriterion("Discount not in", values, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountBetween(Double value1, Double value2) { public Criteria andDiscountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Discount between", value1, value2, "discount"); addCriterion("Discount between", value1, value2, "discount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountNotBetween(Double value1, Double value2) { public Criteria andDiscountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Discount not between", value1, value2, "discount"); addCriterion("Discount not between", value1, value2, "discount");
return (Criteria) this; return (Criteria) this;
} }
@@ -1565,52 +1566,52 @@ public class DepotHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyEqualTo(Double value) { public Criteria andDiscountmoneyEqualTo(BigDecimal value) {
addCriterion("DiscountMoney =", value, "discountmoney"); addCriterion("DiscountMoney =", value, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyNotEqualTo(Double value) { public Criteria andDiscountmoneyNotEqualTo(BigDecimal value) {
addCriterion("DiscountMoney <>", value, "discountmoney"); addCriterion("DiscountMoney <>", value, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyGreaterThan(Double value) { public Criteria andDiscountmoneyGreaterThan(BigDecimal value) {
addCriterion("DiscountMoney >", value, "discountmoney"); addCriterion("DiscountMoney >", value, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyGreaterThanOrEqualTo(Double value) { public Criteria andDiscountmoneyGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("DiscountMoney >=", value, "discountmoney"); addCriterion("DiscountMoney >=", value, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyLessThan(Double value) { public Criteria andDiscountmoneyLessThan(BigDecimal value) {
addCriterion("DiscountMoney <", value, "discountmoney"); addCriterion("DiscountMoney <", value, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyLessThanOrEqualTo(Double value) { public Criteria andDiscountmoneyLessThanOrEqualTo(BigDecimal value) {
addCriterion("DiscountMoney <=", value, "discountmoney"); addCriterion("DiscountMoney <=", value, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyIn(List<Double> values) { public Criteria andDiscountmoneyIn(List<BigDecimal> values) {
addCriterion("DiscountMoney in", values, "discountmoney"); addCriterion("DiscountMoney in", values, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyNotIn(List<Double> values) { public Criteria andDiscountmoneyNotIn(List<BigDecimal> values) {
addCriterion("DiscountMoney not in", values, "discountmoney"); addCriterion("DiscountMoney not in", values, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyBetween(Double value1, Double value2) { public Criteria andDiscountmoneyBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("DiscountMoney between", value1, value2, "discountmoney"); addCriterion("DiscountMoney between", value1, value2, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountmoneyNotBetween(Double value1, Double value2) { public Criteria andDiscountmoneyNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("DiscountMoney not between", value1, value2, "discountmoney"); addCriterion("DiscountMoney not between", value1, value2, "discountmoney");
return (Criteria) this; return (Criteria) this;
} }
@@ -1625,52 +1626,52 @@ public class DepotHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyEqualTo(Double value) { public Criteria andDiscountlastmoneyEqualTo(BigDecimal value) {
addCriterion("DiscountLastMoney =", value, "discountlastmoney"); addCriterion("DiscountLastMoney =", value, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyNotEqualTo(Double value) { public Criteria andDiscountlastmoneyNotEqualTo(BigDecimal value) {
addCriterion("DiscountLastMoney <>", value, "discountlastmoney"); addCriterion("DiscountLastMoney <>", value, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyGreaterThan(Double value) { public Criteria andDiscountlastmoneyGreaterThan(BigDecimal value) {
addCriterion("DiscountLastMoney >", value, "discountlastmoney"); addCriterion("DiscountLastMoney >", value, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyGreaterThanOrEqualTo(Double value) { public Criteria andDiscountlastmoneyGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("DiscountLastMoney >=", value, "discountlastmoney"); addCriterion("DiscountLastMoney >=", value, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyLessThan(Double value) { public Criteria andDiscountlastmoneyLessThan(BigDecimal value) {
addCriterion("DiscountLastMoney <", value, "discountlastmoney"); addCriterion("DiscountLastMoney <", value, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyLessThanOrEqualTo(Double value) { public Criteria andDiscountlastmoneyLessThanOrEqualTo(BigDecimal value) {
addCriterion("DiscountLastMoney <=", value, "discountlastmoney"); addCriterion("DiscountLastMoney <=", value, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyIn(List<Double> values) { public Criteria andDiscountlastmoneyIn(List<BigDecimal> values) {
addCriterion("DiscountLastMoney in", values, "discountlastmoney"); addCriterion("DiscountLastMoney in", values, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyNotIn(List<Double> values) { public Criteria andDiscountlastmoneyNotIn(List<BigDecimal> values) {
addCriterion("DiscountLastMoney not in", values, "discountlastmoney"); addCriterion("DiscountLastMoney not in", values, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyBetween(Double value1, Double value2) { public Criteria andDiscountlastmoneyBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("DiscountLastMoney between", value1, value2, "discountlastmoney"); addCriterion("DiscountLastMoney between", value1, value2, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDiscountlastmoneyNotBetween(Double value1, Double value2) { public Criteria andDiscountlastmoneyNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("DiscountLastMoney not between", value1, value2, "discountlastmoney"); addCriterion("DiscountLastMoney not between", value1, value2, "discountlastmoney");
return (Criteria) this; return (Criteria) this;
} }
@@ -1685,52 +1686,52 @@ public class DepotHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyEqualTo(Double value) { public Criteria andOthermoneyEqualTo(BigDecimal value) {
addCriterion("OtherMoney =", value, "othermoney"); addCriterion("OtherMoney =", value, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyNotEqualTo(Double value) { public Criteria andOthermoneyNotEqualTo(BigDecimal value) {
addCriterion("OtherMoney <>", value, "othermoney"); addCriterion("OtherMoney <>", value, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyGreaterThan(Double value) { public Criteria andOthermoneyGreaterThan(BigDecimal value) {
addCriterion("OtherMoney >", value, "othermoney"); addCriterion("OtherMoney >", value, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyGreaterThanOrEqualTo(Double value) { public Criteria andOthermoneyGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("OtherMoney >=", value, "othermoney"); addCriterion("OtherMoney >=", value, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyLessThan(Double value) { public Criteria andOthermoneyLessThan(BigDecimal value) {
addCriterion("OtherMoney <", value, "othermoney"); addCriterion("OtherMoney <", value, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyLessThanOrEqualTo(Double value) { public Criteria andOthermoneyLessThanOrEqualTo(BigDecimal value) {
addCriterion("OtherMoney <=", value, "othermoney"); addCriterion("OtherMoney <=", value, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyIn(List<Double> values) { public Criteria andOthermoneyIn(List<BigDecimal> values) {
addCriterion("OtherMoney in", values, "othermoney"); addCriterion("OtherMoney in", values, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyNotIn(List<Double> values) { public Criteria andOthermoneyNotIn(List<BigDecimal> values) {
addCriterion("OtherMoney not in", values, "othermoney"); addCriterion("OtherMoney not in", values, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyBetween(Double value1, Double value2) { public Criteria andOthermoneyBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("OtherMoney between", value1, value2, "othermoney"); addCriterion("OtherMoney between", value1, value2, "othermoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOthermoneyNotBetween(Double value1, Double value2) { public Criteria andOthermoneyNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("OtherMoney not between", value1, value2, "othermoney"); addCriterion("OtherMoney not between", value1, value2, "othermoney");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class DepotItem { public class DepotItem {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -39,7 +41,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double opernumber; private BigDecimal opernumber;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -47,7 +49,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double basicnumber; private BigDecimal basicnumber;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -55,7 +57,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double unitprice; private BigDecimal unitprice;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -63,7 +65,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double taxunitprice; private BigDecimal taxunitprice;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -71,7 +73,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double allprice; private BigDecimal allprice;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -95,7 +97,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double incidentals; private BigDecimal incidentals;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -119,7 +121,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double taxrate; private BigDecimal taxrate;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -127,7 +129,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double taxmoney; private BigDecimal taxmoney;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -135,7 +137,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double taxlastmoney; private BigDecimal taxlastmoney;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -289,7 +291,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getOpernumber() { public BigDecimal getOpernumber() {
return opernumber; return opernumber;
} }
@@ -301,7 +303,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setOpernumber(Double opernumber) { public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber; this.opernumber = opernumber;
} }
@@ -313,7 +315,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getBasicnumber() { public BigDecimal getBasicnumber() {
return basicnumber; return basicnumber;
} }
@@ -325,7 +327,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setBasicnumber(Double basicnumber) { public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber; this.basicnumber = basicnumber;
} }
@@ -337,7 +339,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getUnitprice() { public BigDecimal getUnitprice() {
return unitprice; return unitprice;
} }
@@ -349,7 +351,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setUnitprice(Double unitprice) { public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice; this.unitprice = unitprice;
} }
@@ -361,7 +363,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTaxunitprice() { public BigDecimal getTaxunitprice() {
return taxunitprice; return taxunitprice;
} }
@@ -373,7 +375,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTaxunitprice(Double taxunitprice) { public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice; this.taxunitprice = taxunitprice;
} }
@@ -385,7 +387,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getAllprice() { public BigDecimal getAllprice() {
return allprice; return allprice;
} }
@@ -397,7 +399,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setAllprice(Double allprice) { public void setAllprice(BigDecimal allprice) {
this.allprice = allprice; this.allprice = allprice;
} }
@@ -457,7 +459,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getIncidentals() { public BigDecimal getIncidentals() {
return incidentals; return incidentals;
} }
@@ -469,7 +471,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setIncidentals(Double incidentals) { public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals; this.incidentals = incidentals;
} }
@@ -529,7 +531,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTaxrate() { public BigDecimal getTaxrate() {
return taxrate; return taxrate;
} }
@@ -541,7 +543,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTaxrate(Double taxrate) { public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate; this.taxrate = taxrate;
} }
@@ -553,7 +555,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTaxmoney() { public BigDecimal getTaxmoney() {
return taxmoney; return taxmoney;
} }
@@ -565,7 +567,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTaxmoney(Double taxmoney) { public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney; this.taxmoney = taxmoney;
} }
@@ -577,7 +579,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTaxlastmoney() { public BigDecimal getTaxlastmoney() {
return taxlastmoney; return taxlastmoney;
} }
@@ -589,7 +591,7 @@ public class DepotItem {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTaxlastmoney(Double taxlastmoney) { public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney; this.taxlastmoney = taxlastmoney;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -454,52 +455,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberEqualTo(Double value) { public Criteria andOpernumberEqualTo(BigDecimal value) {
addCriterion("OperNumber =", value, "opernumber"); addCriterion("OperNumber =", value, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberNotEqualTo(Double value) { public Criteria andOpernumberNotEqualTo(BigDecimal value) {
addCriterion("OperNumber <>", value, "opernumber"); addCriterion("OperNumber <>", value, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberGreaterThan(Double value) { public Criteria andOpernumberGreaterThan(BigDecimal value) {
addCriterion("OperNumber >", value, "opernumber"); addCriterion("OperNumber >", value, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberGreaterThanOrEqualTo(Double value) { public Criteria andOpernumberGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("OperNumber >=", value, "opernumber"); addCriterion("OperNumber >=", value, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberLessThan(Double value) { public Criteria andOpernumberLessThan(BigDecimal value) {
addCriterion("OperNumber <", value, "opernumber"); addCriterion("OperNumber <", value, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberLessThanOrEqualTo(Double value) { public Criteria andOpernumberLessThanOrEqualTo(BigDecimal value) {
addCriterion("OperNumber <=", value, "opernumber"); addCriterion("OperNumber <=", value, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberIn(List<Double> values) { public Criteria andOpernumberIn(List<BigDecimal> values) {
addCriterion("OperNumber in", values, "opernumber"); addCriterion("OperNumber in", values, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberNotIn(List<Double> values) { public Criteria andOpernumberNotIn(List<BigDecimal> values) {
addCriterion("OperNumber not in", values, "opernumber"); addCriterion("OperNumber not in", values, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberBetween(Double value1, Double value2) { public Criteria andOpernumberBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("OperNumber between", value1, value2, "opernumber"); addCriterion("OperNumber between", value1, value2, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOpernumberNotBetween(Double value1, Double value2) { public Criteria andOpernumberNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("OperNumber not between", value1, value2, "opernumber"); addCriterion("OperNumber not between", value1, value2, "opernumber");
return (Criteria) this; return (Criteria) this;
} }
@@ -514,52 +515,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberEqualTo(Double value) { public Criteria andBasicnumberEqualTo(BigDecimal value) {
addCriterion("BasicNumber =", value, "basicnumber"); addCriterion("BasicNumber =", value, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberNotEqualTo(Double value) { public Criteria andBasicnumberNotEqualTo(BigDecimal value) {
addCriterion("BasicNumber <>", value, "basicnumber"); addCriterion("BasicNumber <>", value, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberGreaterThan(Double value) { public Criteria andBasicnumberGreaterThan(BigDecimal value) {
addCriterion("BasicNumber >", value, "basicnumber"); addCriterion("BasicNumber >", value, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberGreaterThanOrEqualTo(Double value) { public Criteria andBasicnumberGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("BasicNumber >=", value, "basicnumber"); addCriterion("BasicNumber >=", value, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberLessThan(Double value) { public Criteria andBasicnumberLessThan(BigDecimal value) {
addCriterion("BasicNumber <", value, "basicnumber"); addCriterion("BasicNumber <", value, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberLessThanOrEqualTo(Double value) { public Criteria andBasicnumberLessThanOrEqualTo(BigDecimal value) {
addCriterion("BasicNumber <=", value, "basicnumber"); addCriterion("BasicNumber <=", value, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberIn(List<Double> values) { public Criteria andBasicnumberIn(List<BigDecimal> values) {
addCriterion("BasicNumber in", values, "basicnumber"); addCriterion("BasicNumber in", values, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberNotIn(List<Double> values) { public Criteria andBasicnumberNotIn(List<BigDecimal> values) {
addCriterion("BasicNumber not in", values, "basicnumber"); addCriterion("BasicNumber not in", values, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberBetween(Double value1, Double value2) { public Criteria andBasicnumberBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("BasicNumber between", value1, value2, "basicnumber"); addCriterion("BasicNumber between", value1, value2, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBasicnumberNotBetween(Double value1, Double value2) { public Criteria andBasicnumberNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("BasicNumber not between", value1, value2, "basicnumber"); addCriterion("BasicNumber not between", value1, value2, "basicnumber");
return (Criteria) this; return (Criteria) this;
} }
@@ -574,52 +575,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceEqualTo(Double value) { public Criteria andUnitpriceEqualTo(BigDecimal value) {
addCriterion("UnitPrice =", value, "unitprice"); addCriterion("UnitPrice =", value, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceNotEqualTo(Double value) { public Criteria andUnitpriceNotEqualTo(BigDecimal value) {
addCriterion("UnitPrice <>", value, "unitprice"); addCriterion("UnitPrice <>", value, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceGreaterThan(Double value) { public Criteria andUnitpriceGreaterThan(BigDecimal value) {
addCriterion("UnitPrice >", value, "unitprice"); addCriterion("UnitPrice >", value, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceGreaterThanOrEqualTo(Double value) { public Criteria andUnitpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("UnitPrice >=", value, "unitprice"); addCriterion("UnitPrice >=", value, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceLessThan(Double value) { public Criteria andUnitpriceLessThan(BigDecimal value) {
addCriterion("UnitPrice <", value, "unitprice"); addCriterion("UnitPrice <", value, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceLessThanOrEqualTo(Double value) { public Criteria andUnitpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("UnitPrice <=", value, "unitprice"); addCriterion("UnitPrice <=", value, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceIn(List<Double> values) { public Criteria andUnitpriceIn(List<BigDecimal> values) {
addCriterion("UnitPrice in", values, "unitprice"); addCriterion("UnitPrice in", values, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceNotIn(List<Double> values) { public Criteria andUnitpriceNotIn(List<BigDecimal> values) {
addCriterion("UnitPrice not in", values, "unitprice"); addCriterion("UnitPrice not in", values, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceBetween(Double value1, Double value2) { public Criteria andUnitpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("UnitPrice between", value1, value2, "unitprice"); addCriterion("UnitPrice between", value1, value2, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnitpriceNotBetween(Double value1, Double value2) { public Criteria andUnitpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("UnitPrice not between", value1, value2, "unitprice"); addCriterion("UnitPrice not between", value1, value2, "unitprice");
return (Criteria) this; return (Criteria) this;
} }
@@ -634,52 +635,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceEqualTo(Double value) { public Criteria andTaxunitpriceEqualTo(BigDecimal value) {
addCriterion("TaxUnitPrice =", value, "taxunitprice"); addCriterion("TaxUnitPrice =", value, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceNotEqualTo(Double value) { public Criteria andTaxunitpriceNotEqualTo(BigDecimal value) {
addCriterion("TaxUnitPrice <>", value, "taxunitprice"); addCriterion("TaxUnitPrice <>", value, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceGreaterThan(Double value) { public Criteria andTaxunitpriceGreaterThan(BigDecimal value) {
addCriterion("TaxUnitPrice >", value, "taxunitprice"); addCriterion("TaxUnitPrice >", value, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceGreaterThanOrEqualTo(Double value) { public Criteria andTaxunitpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("TaxUnitPrice >=", value, "taxunitprice"); addCriterion("TaxUnitPrice >=", value, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceLessThan(Double value) { public Criteria andTaxunitpriceLessThan(BigDecimal value) {
addCriterion("TaxUnitPrice <", value, "taxunitprice"); addCriterion("TaxUnitPrice <", value, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceLessThanOrEqualTo(Double value) { public Criteria andTaxunitpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("TaxUnitPrice <=", value, "taxunitprice"); addCriterion("TaxUnitPrice <=", value, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceIn(List<Double> values) { public Criteria andTaxunitpriceIn(List<BigDecimal> values) {
addCriterion("TaxUnitPrice in", values, "taxunitprice"); addCriterion("TaxUnitPrice in", values, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceNotIn(List<Double> values) { public Criteria andTaxunitpriceNotIn(List<BigDecimal> values) {
addCriterion("TaxUnitPrice not in", values, "taxunitprice"); addCriterion("TaxUnitPrice not in", values, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceBetween(Double value1, Double value2) { public Criteria andTaxunitpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxUnitPrice between", value1, value2, "taxunitprice"); addCriterion("TaxUnitPrice between", value1, value2, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxunitpriceNotBetween(Double value1, Double value2) { public Criteria andTaxunitpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxUnitPrice not between", value1, value2, "taxunitprice"); addCriterion("TaxUnitPrice not between", value1, value2, "taxunitprice");
return (Criteria) this; return (Criteria) this;
} }
@@ -694,52 +695,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceEqualTo(Double value) { public Criteria andAllpriceEqualTo(BigDecimal value) {
addCriterion("AllPrice =", value, "allprice"); addCriterion("AllPrice =", value, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceNotEqualTo(Double value) { public Criteria andAllpriceNotEqualTo(BigDecimal value) {
addCriterion("AllPrice <>", value, "allprice"); addCriterion("AllPrice <>", value, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceGreaterThan(Double value) { public Criteria andAllpriceGreaterThan(BigDecimal value) {
addCriterion("AllPrice >", value, "allprice"); addCriterion("AllPrice >", value, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceGreaterThanOrEqualTo(Double value) { public Criteria andAllpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("AllPrice >=", value, "allprice"); addCriterion("AllPrice >=", value, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceLessThan(Double value) { public Criteria andAllpriceLessThan(BigDecimal value) {
addCriterion("AllPrice <", value, "allprice"); addCriterion("AllPrice <", value, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceLessThanOrEqualTo(Double value) { public Criteria andAllpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("AllPrice <=", value, "allprice"); addCriterion("AllPrice <=", value, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceIn(List<Double> values) { public Criteria andAllpriceIn(List<BigDecimal> values) {
addCriterion("AllPrice in", values, "allprice"); addCriterion("AllPrice in", values, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceNotIn(List<Double> values) { public Criteria andAllpriceNotIn(List<BigDecimal> values) {
addCriterion("AllPrice not in", values, "allprice"); addCriterion("AllPrice not in", values, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceBetween(Double value1, Double value2) { public Criteria andAllpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AllPrice between", value1, value2, "allprice"); addCriterion("AllPrice between", value1, value2, "allprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllpriceNotBetween(Double value1, Double value2) { public Criteria andAllpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AllPrice not between", value1, value2, "allprice"); addCriterion("AllPrice not between", value1, value2, "allprice");
return (Criteria) this; return (Criteria) this;
} }
@@ -894,52 +895,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsEqualTo(Double value) { public Criteria andIncidentalsEqualTo(BigDecimal value) {
addCriterion("Incidentals =", value, "incidentals"); addCriterion("Incidentals =", value, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsNotEqualTo(Double value) { public Criteria andIncidentalsNotEqualTo(BigDecimal value) {
addCriterion("Incidentals <>", value, "incidentals"); addCriterion("Incidentals <>", value, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsGreaterThan(Double value) { public Criteria andIncidentalsGreaterThan(BigDecimal value) {
addCriterion("Incidentals >", value, "incidentals"); addCriterion("Incidentals >", value, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsGreaterThanOrEqualTo(Double value) { public Criteria andIncidentalsGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("Incidentals >=", value, "incidentals"); addCriterion("Incidentals >=", value, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsLessThan(Double value) { public Criteria andIncidentalsLessThan(BigDecimal value) {
addCriterion("Incidentals <", value, "incidentals"); addCriterion("Incidentals <", value, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsLessThanOrEqualTo(Double value) { public Criteria andIncidentalsLessThanOrEqualTo(BigDecimal value) {
addCriterion("Incidentals <=", value, "incidentals"); addCriterion("Incidentals <=", value, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsIn(List<Double> values) { public Criteria andIncidentalsIn(List<BigDecimal> values) {
addCriterion("Incidentals in", values, "incidentals"); addCriterion("Incidentals in", values, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsNotIn(List<Double> values) { public Criteria andIncidentalsNotIn(List<BigDecimal> values) {
addCriterion("Incidentals not in", values, "incidentals"); addCriterion("Incidentals not in", values, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsBetween(Double value1, Double value2) { public Criteria andIncidentalsBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Incidentals between", value1, value2, "incidentals"); addCriterion("Incidentals between", value1, value2, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIncidentalsNotBetween(Double value1, Double value2) { public Criteria andIncidentalsNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Incidentals not between", value1, value2, "incidentals"); addCriterion("Incidentals not between", value1, value2, "incidentals");
return (Criteria) this; return (Criteria) this;
} }
@@ -1074,52 +1075,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateEqualTo(Double value) { public Criteria andTaxrateEqualTo(BigDecimal value) {
addCriterion("TaxRate =", value, "taxrate"); addCriterion("TaxRate =", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateNotEqualTo(Double value) { public Criteria andTaxrateNotEqualTo(BigDecimal value) {
addCriterion("TaxRate <>", value, "taxrate"); addCriterion("TaxRate <>", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateGreaterThan(Double value) { public Criteria andTaxrateGreaterThan(BigDecimal value) {
addCriterion("TaxRate >", value, "taxrate"); addCriterion("TaxRate >", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateGreaterThanOrEqualTo(Double value) { public Criteria andTaxrateGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("TaxRate >=", value, "taxrate"); addCriterion("TaxRate >=", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateLessThan(Double value) { public Criteria andTaxrateLessThan(BigDecimal value) {
addCriterion("TaxRate <", value, "taxrate"); addCriterion("TaxRate <", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateLessThanOrEqualTo(Double value) { public Criteria andTaxrateLessThanOrEqualTo(BigDecimal value) {
addCriterion("TaxRate <=", value, "taxrate"); addCriterion("TaxRate <=", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateIn(List<Double> values) { public Criteria andTaxrateIn(List<BigDecimal> values) {
addCriterion("TaxRate in", values, "taxrate"); addCriterion("TaxRate in", values, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateNotIn(List<Double> values) { public Criteria andTaxrateNotIn(List<BigDecimal> values) {
addCriterion("TaxRate not in", values, "taxrate"); addCriterion("TaxRate not in", values, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateBetween(Double value1, Double value2) { public Criteria andTaxrateBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxRate between", value1, value2, "taxrate"); addCriterion("TaxRate between", value1, value2, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateNotBetween(Double value1, Double value2) { public Criteria andTaxrateNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxRate not between", value1, value2, "taxrate"); addCriterion("TaxRate not between", value1, value2, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
@@ -1134,52 +1135,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyEqualTo(Double value) { public Criteria andTaxmoneyEqualTo(BigDecimal value) {
addCriterion("TaxMoney =", value, "taxmoney"); addCriterion("TaxMoney =", value, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyNotEqualTo(Double value) { public Criteria andTaxmoneyNotEqualTo(BigDecimal value) {
addCriterion("TaxMoney <>", value, "taxmoney"); addCriterion("TaxMoney <>", value, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyGreaterThan(Double value) { public Criteria andTaxmoneyGreaterThan(BigDecimal value) {
addCriterion("TaxMoney >", value, "taxmoney"); addCriterion("TaxMoney >", value, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyGreaterThanOrEqualTo(Double value) { public Criteria andTaxmoneyGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("TaxMoney >=", value, "taxmoney"); addCriterion("TaxMoney >=", value, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyLessThan(Double value) { public Criteria andTaxmoneyLessThan(BigDecimal value) {
addCriterion("TaxMoney <", value, "taxmoney"); addCriterion("TaxMoney <", value, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyLessThanOrEqualTo(Double value) { public Criteria andTaxmoneyLessThanOrEqualTo(BigDecimal value) {
addCriterion("TaxMoney <=", value, "taxmoney"); addCriterion("TaxMoney <=", value, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyIn(List<Double> values) { public Criteria andTaxmoneyIn(List<BigDecimal> values) {
addCriterion("TaxMoney in", values, "taxmoney"); addCriterion("TaxMoney in", values, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyNotIn(List<Double> values) { public Criteria andTaxmoneyNotIn(List<BigDecimal> values) {
addCriterion("TaxMoney not in", values, "taxmoney"); addCriterion("TaxMoney not in", values, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyBetween(Double value1, Double value2) { public Criteria andTaxmoneyBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxMoney between", value1, value2, "taxmoney"); addCriterion("TaxMoney between", value1, value2, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxmoneyNotBetween(Double value1, Double value2) { public Criteria andTaxmoneyNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxMoney not between", value1, value2, "taxmoney"); addCriterion("TaxMoney not between", value1, value2, "taxmoney");
return (Criteria) this; return (Criteria) this;
} }
@@ -1194,52 +1195,52 @@ public class DepotItemExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyEqualTo(Double value) { public Criteria andTaxlastmoneyEqualTo(BigDecimal value) {
addCriterion("TaxLastMoney =", value, "taxlastmoney"); addCriterion("TaxLastMoney =", value, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyNotEqualTo(Double value) { public Criteria andTaxlastmoneyNotEqualTo(BigDecimal value) {
addCriterion("TaxLastMoney <>", value, "taxlastmoney"); addCriterion("TaxLastMoney <>", value, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyGreaterThan(Double value) { public Criteria andTaxlastmoneyGreaterThan(BigDecimal value) {
addCriterion("TaxLastMoney >", value, "taxlastmoney"); addCriterion("TaxLastMoney >", value, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyGreaterThanOrEqualTo(Double value) { public Criteria andTaxlastmoneyGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("TaxLastMoney >=", value, "taxlastmoney"); addCriterion("TaxLastMoney >=", value, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyLessThan(Double value) { public Criteria andTaxlastmoneyLessThan(BigDecimal value) {
addCriterion("TaxLastMoney <", value, "taxlastmoney"); addCriterion("TaxLastMoney <", value, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyLessThanOrEqualTo(Double value) { public Criteria andTaxlastmoneyLessThanOrEqualTo(BigDecimal value) {
addCriterion("TaxLastMoney <=", value, "taxlastmoney"); addCriterion("TaxLastMoney <=", value, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyIn(List<Double> values) { public Criteria andTaxlastmoneyIn(List<BigDecimal> values) {
addCriterion("TaxLastMoney in", values, "taxlastmoney"); addCriterion("TaxLastMoney in", values, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyNotIn(List<Double> values) { public Criteria andTaxlastmoneyNotIn(List<BigDecimal> values) {
addCriterion("TaxLastMoney not in", values, "taxlastmoney"); addCriterion("TaxLastMoney not in", values, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyBetween(Double value1, Double value2) { public Criteria andTaxlastmoneyBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxLastMoney between", value1, value2, "taxlastmoney"); addCriterion("TaxLastMoney between", value1, value2, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxlastmoneyNotBetween(Double value1, Double value2) { public Criteria andTaxlastmoneyNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxLastMoney not between", value1, value2, "taxlastmoney"); addCriterion("TaxLastMoney not between", value1, value2, "taxlastmoney");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
public class DepotItemVo4Material { public class DepotItemVo4Material {
@@ -12,31 +13,31 @@ public class DepotItemVo4Material {
private String munit; 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 remark;
private String img; private String img;
private Double incidentals; private BigDecimal incidentals;
private Long depotid; private Long depotid;
private Long anotherdepotid; private Long anotherdepotid;
private Double taxrate; private BigDecimal taxrate;
private Double taxmoney; private BigDecimal taxmoney;
private Double taxlastmoney; private BigDecimal taxlastmoney;
private String otherfield1; private String otherfield1;
@@ -86,43 +87,43 @@ public class DepotItemVo4Material {
this.munit = munit; this.munit = munit;
} }
public Double getOpernumber() { public BigDecimal getOpernumber() {
return opernumber; return opernumber;
} }
public void setOpernumber(Double opernumber) { public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber; this.opernumber = opernumber;
} }
public Double getBasicnumber() { public BigDecimal getBasicnumber() {
return basicnumber; return basicnumber;
} }
public void setBasicnumber(Double basicnumber) { public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber; this.basicnumber = basicnumber;
} }
public Double getUnitprice() { public BigDecimal getUnitprice() {
return unitprice; return unitprice;
} }
public void setUnitprice(Double unitprice) { public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice; this.unitprice = unitprice;
} }
public Double getTaxunitprice() { public BigDecimal getTaxunitprice() {
return taxunitprice; return taxunitprice;
} }
public void setTaxunitprice(Double taxunitprice) { public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice; this.taxunitprice = taxunitprice;
} }
public Double getAllprice() { public BigDecimal getAllprice() {
return allprice; return allprice;
} }
public void setAllprice(Double allprice) { public void setAllprice(BigDecimal allprice) {
this.allprice = allprice; this.allprice = allprice;
} }
@@ -142,11 +143,11 @@ public class DepotItemVo4Material {
this.img = img; this.img = img;
} }
public Double getIncidentals() { public BigDecimal getIncidentals() {
return incidentals; return incidentals;
} }
public void setIncidentals(Double incidentals) { public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals; this.incidentals = incidentals;
} }
@@ -166,27 +167,27 @@ public class DepotItemVo4Material {
this.anotherdepotid = anotherdepotid; this.anotherdepotid = anotherdepotid;
} }
public Double getTaxrate() { public BigDecimal getTaxrate() {
return taxrate; return taxrate;
} }
public void setTaxrate(Double taxrate) { public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate; this.taxrate = taxrate;
} }
public Double getTaxmoney() { public BigDecimal getTaxmoney() {
return taxmoney; return taxmoney;
} }
public void setTaxmoney(Double taxmoney) { public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney; this.taxmoney = taxmoney;
} }
public Double getTaxlastmoney() { public BigDecimal getTaxlastmoney() {
return taxlastmoney; return taxlastmoney;
} }
public void setTaxlastmoney(Double taxlastmoney) { public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney; this.taxlastmoney = taxlastmoney;
} }

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

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

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Material { public class Material {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -39,7 +41,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double packing; private BigDecimal packing;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -47,7 +49,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double safetystock; private BigDecimal safetystock;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -95,7 +97,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double retailprice; private BigDecimal retailprice;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -103,7 +105,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double lowprice; private BigDecimal lowprice;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -111,7 +113,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double presetpriceone; private BigDecimal presetpriceone;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -119,7 +121,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double presetpricetwo; private BigDecimal presetpricetwo;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -289,7 +291,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getPacking() { public BigDecimal getPacking() {
return packing; return packing;
} }
@@ -301,7 +303,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setPacking(Double packing) { public void setPacking(BigDecimal packing) {
this.packing = packing; this.packing = packing;
} }
@@ -313,7 +315,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getSafetystock() { public BigDecimal getSafetystock() {
return safetystock; return safetystock;
} }
@@ -325,7 +327,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setSafetystock(Double safetystock) { public void setSafetystock(BigDecimal safetystock) {
this.safetystock = safetystock; this.safetystock = safetystock;
} }
@@ -457,7 +459,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getRetailprice() { public BigDecimal getRetailprice() {
return retailprice; return retailprice;
} }
@@ -469,7 +471,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setRetailprice(Double retailprice) { public void setRetailprice(BigDecimal retailprice) {
this.retailprice = retailprice; this.retailprice = retailprice;
} }
@@ -481,7 +483,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getLowprice() { public BigDecimal getLowprice() {
return lowprice; return lowprice;
} }
@@ -493,7 +495,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setLowprice(Double lowprice) { public void setLowprice(BigDecimal lowprice) {
this.lowprice = lowprice; this.lowprice = lowprice;
} }
@@ -505,7 +507,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getPresetpriceone() { public BigDecimal getPresetpriceone() {
return presetpriceone; return presetpriceone;
} }
@@ -517,7 +519,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setPresetpriceone(Double presetpriceone) { public void setPresetpriceone(BigDecimal presetpriceone) {
this.presetpriceone = presetpriceone; this.presetpriceone = presetpriceone;
} }
@@ -529,7 +531,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getPresetpricetwo() { public BigDecimal getPresetpricetwo() {
return presetpricetwo; return presetpricetwo;
} }
@@ -541,7 +543,7 @@ public class Material {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setPresetpricetwo(Double presetpricetwo) { public void setPresetpricetwo(BigDecimal presetpricetwo) {
this.presetpricetwo = presetpricetwo; this.presetpricetwo = presetpricetwo;
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -464,52 +465,52 @@ public class MaterialExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingEqualTo(Double value) { public Criteria andPackingEqualTo(BigDecimal value) {
addCriterion("Packing =", value, "packing"); addCriterion("Packing =", value, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingNotEqualTo(Double value) { public Criteria andPackingNotEqualTo(BigDecimal value) {
addCriterion("Packing <>", value, "packing"); addCriterion("Packing <>", value, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingGreaterThan(Double value) { public Criteria andPackingGreaterThan(BigDecimal value) {
addCriterion("Packing >", value, "packing"); addCriterion("Packing >", value, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingGreaterThanOrEqualTo(Double value) { public Criteria andPackingGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("Packing >=", value, "packing"); addCriterion("Packing >=", value, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingLessThan(Double value) { public Criteria andPackingLessThan(BigDecimal value) {
addCriterion("Packing <", value, "packing"); addCriterion("Packing <", value, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingLessThanOrEqualTo(Double value) { public Criteria andPackingLessThanOrEqualTo(BigDecimal value) {
addCriterion("Packing <=", value, "packing"); addCriterion("Packing <=", value, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingIn(List<Double> values) { public Criteria andPackingIn(List<BigDecimal> values) {
addCriterion("Packing in", values, "packing"); addCriterion("Packing in", values, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingNotIn(List<Double> values) { public Criteria andPackingNotIn(List<BigDecimal> values) {
addCriterion("Packing not in", values, "packing"); addCriterion("Packing not in", values, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingBetween(Double value1, Double value2) { public Criteria andPackingBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Packing between", value1, value2, "packing"); addCriterion("Packing between", value1, value2, "packing");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPackingNotBetween(Double value1, Double value2) { public Criteria andPackingNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Packing not between", value1, value2, "packing"); addCriterion("Packing not between", value1, value2, "packing");
return (Criteria) this; return (Criteria) this;
} }
@@ -524,52 +525,52 @@ public class MaterialExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockEqualTo(Double value) { public Criteria andSafetystockEqualTo(BigDecimal value) {
addCriterion("SafetyStock =", value, "safetystock"); addCriterion("SafetyStock =", value, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockNotEqualTo(Double value) { public Criteria andSafetystockNotEqualTo(BigDecimal value) {
addCriterion("SafetyStock <>", value, "safetystock"); addCriterion("SafetyStock <>", value, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockGreaterThan(Double value) { public Criteria andSafetystockGreaterThan(BigDecimal value) {
addCriterion("SafetyStock >", value, "safetystock"); addCriterion("SafetyStock >", value, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockGreaterThanOrEqualTo(Double value) { public Criteria andSafetystockGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("SafetyStock >=", value, "safetystock"); addCriterion("SafetyStock >=", value, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockLessThan(Double value) { public Criteria andSafetystockLessThan(BigDecimal value) {
addCriterion("SafetyStock <", value, "safetystock"); addCriterion("SafetyStock <", value, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockLessThanOrEqualTo(Double value) { public Criteria andSafetystockLessThanOrEqualTo(BigDecimal value) {
addCriterion("SafetyStock <=", value, "safetystock"); addCriterion("SafetyStock <=", value, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockIn(List<Double> values) { public Criteria andSafetystockIn(List<BigDecimal> values) {
addCriterion("SafetyStock in", values, "safetystock"); addCriterion("SafetyStock in", values, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockNotIn(List<Double> values) { public Criteria andSafetystockNotIn(List<BigDecimal> values) {
addCriterion("SafetyStock not in", values, "safetystock"); addCriterion("SafetyStock not in", values, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockBetween(Double value1, Double value2) { public Criteria andSafetystockBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("SafetyStock between", value1, value2, "safetystock"); addCriterion("SafetyStock between", value1, value2, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSafetystockNotBetween(Double value1, Double value2) { public Criteria andSafetystockNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("SafetyStock not between", value1, value2, "safetystock"); addCriterion("SafetyStock not between", value1, value2, "safetystock");
return (Criteria) this; return (Criteria) this;
} }
@@ -934,52 +935,52 @@ public class MaterialExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceEqualTo(Double value) { public Criteria andRetailpriceEqualTo(BigDecimal value) {
addCriterion("RetailPrice =", value, "retailprice"); addCriterion("RetailPrice =", value, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceNotEqualTo(Double value) { public Criteria andRetailpriceNotEqualTo(BigDecimal value) {
addCriterion("RetailPrice <>", value, "retailprice"); addCriterion("RetailPrice <>", value, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceGreaterThan(Double value) { public Criteria andRetailpriceGreaterThan(BigDecimal value) {
addCriterion("RetailPrice >", value, "retailprice"); addCriterion("RetailPrice >", value, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceGreaterThanOrEqualTo(Double value) { public Criteria andRetailpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("RetailPrice >=", value, "retailprice"); addCriterion("RetailPrice >=", value, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceLessThan(Double value) { public Criteria andRetailpriceLessThan(BigDecimal value) {
addCriterion("RetailPrice <", value, "retailprice"); addCriterion("RetailPrice <", value, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceLessThanOrEqualTo(Double value) { public Criteria andRetailpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("RetailPrice <=", value, "retailprice"); addCriterion("RetailPrice <=", value, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceIn(List<Double> values) { public Criteria andRetailpriceIn(List<BigDecimal> values) {
addCriterion("RetailPrice in", values, "retailprice"); addCriterion("RetailPrice in", values, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceNotIn(List<Double> values) { public Criteria andRetailpriceNotIn(List<BigDecimal> values) {
addCriterion("RetailPrice not in", values, "retailprice"); addCriterion("RetailPrice not in", values, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceBetween(Double value1, Double value2) { public Criteria andRetailpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("RetailPrice between", value1, value2, "retailprice"); addCriterion("RetailPrice between", value1, value2, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRetailpriceNotBetween(Double value1, Double value2) { public Criteria andRetailpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("RetailPrice not between", value1, value2, "retailprice"); addCriterion("RetailPrice not between", value1, value2, "retailprice");
return (Criteria) this; return (Criteria) this;
} }
@@ -994,52 +995,52 @@ public class MaterialExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceEqualTo(Double value) { public Criteria andLowpriceEqualTo(BigDecimal value) {
addCriterion("LowPrice =", value, "lowprice"); addCriterion("LowPrice =", value, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceNotEqualTo(Double value) { public Criteria andLowpriceNotEqualTo(BigDecimal value) {
addCriterion("LowPrice <>", value, "lowprice"); addCriterion("LowPrice <>", value, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceGreaterThan(Double value) { public Criteria andLowpriceGreaterThan(BigDecimal value) {
addCriterion("LowPrice >", value, "lowprice"); addCriterion("LowPrice >", value, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceGreaterThanOrEqualTo(Double value) { public Criteria andLowpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("LowPrice >=", value, "lowprice"); addCriterion("LowPrice >=", value, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceLessThan(Double value) { public Criteria andLowpriceLessThan(BigDecimal value) {
addCriterion("LowPrice <", value, "lowprice"); addCriterion("LowPrice <", value, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceLessThanOrEqualTo(Double value) { public Criteria andLowpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("LowPrice <=", value, "lowprice"); addCriterion("LowPrice <=", value, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceIn(List<Double> values) { public Criteria andLowpriceIn(List<BigDecimal> values) {
addCriterion("LowPrice in", values, "lowprice"); addCriterion("LowPrice in", values, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceNotIn(List<Double> values) { public Criteria andLowpriceNotIn(List<BigDecimal> values) {
addCriterion("LowPrice not in", values, "lowprice"); addCriterion("LowPrice not in", values, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceBetween(Double value1, Double value2) { public Criteria andLowpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("LowPrice between", value1, value2, "lowprice"); addCriterion("LowPrice between", value1, value2, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLowpriceNotBetween(Double value1, Double value2) { public Criteria andLowpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("LowPrice not between", value1, value2, "lowprice"); addCriterion("LowPrice not between", value1, value2, "lowprice");
return (Criteria) this; return (Criteria) this;
} }
@@ -1054,52 +1055,52 @@ public class MaterialExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneEqualTo(Double value) { public Criteria andPresetpriceoneEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne =", value, "presetpriceone"); addCriterion("PresetPriceOne =", value, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneNotEqualTo(Double value) { public Criteria andPresetpriceoneNotEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne <>", value, "presetpriceone"); addCriterion("PresetPriceOne <>", value, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneGreaterThan(Double value) { public Criteria andPresetpriceoneGreaterThan(BigDecimal value) {
addCriterion("PresetPriceOne >", value, "presetpriceone"); addCriterion("PresetPriceOne >", value, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneGreaterThanOrEqualTo(Double value) { public Criteria andPresetpriceoneGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne >=", value, "presetpriceone"); addCriterion("PresetPriceOne >=", value, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneLessThan(Double value) { public Criteria andPresetpriceoneLessThan(BigDecimal value) {
addCriterion("PresetPriceOne <", value, "presetpriceone"); addCriterion("PresetPriceOne <", value, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneLessThanOrEqualTo(Double value) { public Criteria andPresetpriceoneLessThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne <=", value, "presetpriceone"); addCriterion("PresetPriceOne <=", value, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneIn(List<Double> values) { public Criteria andPresetpriceoneIn(List<BigDecimal> values) {
addCriterion("PresetPriceOne in", values, "presetpriceone"); addCriterion("PresetPriceOne in", values, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneNotIn(List<Double> values) { public Criteria andPresetpriceoneNotIn(List<BigDecimal> values) {
addCriterion("PresetPriceOne not in", values, "presetpriceone"); addCriterion("PresetPriceOne not in", values, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneBetween(Double value1, Double value2) { public Criteria andPresetpriceoneBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceOne between", value1, value2, "presetpriceone"); addCriterion("PresetPriceOne between", value1, value2, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpriceoneNotBetween(Double value1, Double value2) { public Criteria andPresetpriceoneNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceOne not between", value1, value2, "presetpriceone"); addCriterion("PresetPriceOne not between", value1, value2, "presetpriceone");
return (Criteria) this; return (Criteria) this;
} }
@@ -1114,52 +1115,52 @@ public class MaterialExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoEqualTo(Double value) { public Criteria andPresetpricetwoEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo =", value, "presetpricetwo"); addCriterion("PresetPriceTwo =", value, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoNotEqualTo(Double value) { public Criteria andPresetpricetwoNotEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo <>", value, "presetpricetwo"); addCriterion("PresetPriceTwo <>", value, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoGreaterThan(Double value) { public Criteria andPresetpricetwoGreaterThan(BigDecimal value) {
addCriterion("PresetPriceTwo >", value, "presetpricetwo"); addCriterion("PresetPriceTwo >", value, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoGreaterThanOrEqualTo(Double value) { public Criteria andPresetpricetwoGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo >=", value, "presetpricetwo"); addCriterion("PresetPriceTwo >=", value, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoLessThan(Double value) { public Criteria andPresetpricetwoLessThan(BigDecimal value) {
addCriterion("PresetPriceTwo <", value, "presetpricetwo"); addCriterion("PresetPriceTwo <", value, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoLessThanOrEqualTo(Double value) { public Criteria andPresetpricetwoLessThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo <=", value, "presetpricetwo"); addCriterion("PresetPriceTwo <=", value, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoIn(List<Double> values) { public Criteria andPresetpricetwoIn(List<BigDecimal> values) {
addCriterion("PresetPriceTwo in", values, "presetpricetwo"); addCriterion("PresetPriceTwo in", values, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoNotIn(List<Double> values) { public Criteria andPresetpricetwoNotIn(List<BigDecimal> values) {
addCriterion("PresetPriceTwo not in", values, "presetpricetwo"); addCriterion("PresetPriceTwo not in", values, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoBetween(Double value1, Double value2) { public Criteria andPresetpricetwoBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceTwo between", value1, value2, "presetpricetwo"); addCriterion("PresetPriceTwo between", value1, value2, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPresetpricetwoNotBetween(Double value1, Double value2) { public Criteria andPresetpricetwoNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceTwo not between", value1, value2, "presetpricetwo"); addCriterion("PresetPriceTwo not between", value1, value2, "presetpricetwo");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class MaterialVo4Unit { public class MaterialVo4Unit {
private Long id; private Long id;
@@ -10,9 +12,9 @@ public class MaterialVo4Unit {
private String mfrs; private String mfrs;
private Double packing; private BigDecimal packing;
private Double safetystock; private BigDecimal safetystock;
private String model; private String model;
@@ -24,13 +26,13 @@ public class MaterialVo4Unit {
private String remark; private String remark;
private Double retailprice; private BigDecimal retailprice;
private Double lowprice; private BigDecimal lowprice;
private Double presetpriceone; private BigDecimal presetpriceone;
private Double presetpricetwo; private BigDecimal presetpricetwo;
private Long unitid; private Long unitid;
@@ -86,19 +88,19 @@ public class MaterialVo4Unit {
this.mfrs = mfrs; this.mfrs = mfrs;
} }
public Double getPacking() { public BigDecimal getPacking() {
return packing; return packing;
} }
public void setPacking(Double packing) { public void setPacking(BigDecimal packing) {
this.packing = packing; this.packing = packing;
} }
public Double getSafetystock() { public BigDecimal getSafetystock() {
return safetystock; return safetystock;
} }
public void setSafetystock(Double safetystock) { public void setSafetystock(BigDecimal safetystock) {
this.safetystock = safetystock; this.safetystock = safetystock;
} }
@@ -142,35 +144,35 @@ public class MaterialVo4Unit {
this.remark = remark; this.remark = remark;
} }
public Double getRetailprice() { public BigDecimal getRetailprice() {
return retailprice; return retailprice;
} }
public void setRetailprice(Double retailprice) { public void setRetailprice(BigDecimal retailprice) {
this.retailprice = retailprice; this.retailprice = retailprice;
} }
public Double getLowprice() { public BigDecimal getLowprice() {
return lowprice; return lowprice;
} }
public void setLowprice(Double lowprice) { public void setLowprice(BigDecimal lowprice) {
this.lowprice = lowprice; this.lowprice = lowprice;
} }
public Double getPresetpriceone() { public BigDecimal getPresetpriceone() {
return presetpriceone; return presetpriceone;
} }
public void setPresetpriceone(Double presetpriceone) { public void setPresetpriceone(BigDecimal presetpriceone) {
this.presetpriceone = presetpriceone; this.presetpriceone = presetpriceone;
} }
public Double getPresetpricetwo() { public BigDecimal getPresetpricetwo() {
return presetpricetwo; return presetpricetwo;
} }
public void setPresetpricetwo(Double presetpricetwo) { public void setPresetpricetwo(BigDecimal presetpricetwo) {
this.presetpricetwo = presetpricetwo; this.presetpricetwo = presetpricetwo;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Supplier { public class Supplier {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -79,7 +81,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double advancein; private BigDecimal advancein;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -87,7 +89,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double beginneedget; private BigDecimal beginneedget;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -95,7 +97,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double beginneedpay; private BigDecimal beginneedpay;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -103,7 +105,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double allneedget; private BigDecimal allneedget;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -111,7 +113,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double allneedpay; private BigDecimal allneedpay;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
@@ -167,7 +169,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
private Double taxrate; private BigDecimal taxrate;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
@@ -393,7 +395,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getAdvancein() { public BigDecimal getAdvancein() {
return advancein; return advancein;
} }
@@ -405,7 +407,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setAdvancein(Double advancein) { public void setAdvancein(BigDecimal advancein) {
this.advancein = advancein; this.advancein = advancein;
} }
@@ -417,7 +419,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getBeginneedget() { public BigDecimal getBeginneedget() {
return beginneedget; return beginneedget;
} }
@@ -429,7 +431,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setBeginneedget(Double beginneedget) { public void setBeginneedget(BigDecimal beginneedget) {
this.beginneedget = beginneedget; this.beginneedget = beginneedget;
} }
@@ -441,7 +443,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getBeginneedpay() { public BigDecimal getBeginneedpay() {
return beginneedpay; return beginneedpay;
} }
@@ -453,7 +455,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setBeginneedpay(Double beginneedpay) { public void setBeginneedpay(BigDecimal beginneedpay) {
this.beginneedpay = beginneedpay; this.beginneedpay = beginneedpay;
} }
@@ -465,7 +467,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getAllneedget() { public BigDecimal getAllneedget() {
return allneedget; return allneedget;
} }
@@ -477,7 +479,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setAllneedget(Double allneedget) { public void setAllneedget(BigDecimal allneedget) {
this.allneedget = allneedget; this.allneedget = allneedget;
} }
@@ -489,7 +491,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getAllneedpay() { public BigDecimal getAllneedpay() {
return allneedpay; return allneedpay;
} }
@@ -501,7 +503,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setAllneedpay(Double allneedpay) { public void setAllneedpay(BigDecimal allneedpay) {
this.allneedpay = allneedpay; this.allneedpay = allneedpay;
} }
@@ -657,7 +659,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public Double getTaxrate() { public BigDecimal getTaxrate() {
return taxrate; return taxrate;
} }
@@ -669,7 +671,7 @@ public class Supplier {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setTaxrate(Double taxrate) { public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate; this.taxrate = taxrate;
} }
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -804,52 +805,52 @@ public class SupplierExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinEqualTo(Double value) { public Criteria andAdvanceinEqualTo(BigDecimal value) {
addCriterion("AdvanceIn =", value, "advancein"); addCriterion("AdvanceIn =", value, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinNotEqualTo(Double value) { public Criteria andAdvanceinNotEqualTo(BigDecimal value) {
addCriterion("AdvanceIn <>", value, "advancein"); addCriterion("AdvanceIn <>", value, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinGreaterThan(Double value) { public Criteria andAdvanceinGreaterThan(BigDecimal value) {
addCriterion("AdvanceIn >", value, "advancein"); addCriterion("AdvanceIn >", value, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinGreaterThanOrEqualTo(Double value) { public Criteria andAdvanceinGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("AdvanceIn >=", value, "advancein"); addCriterion("AdvanceIn >=", value, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinLessThan(Double value) { public Criteria andAdvanceinLessThan(BigDecimal value) {
addCriterion("AdvanceIn <", value, "advancein"); addCriterion("AdvanceIn <", value, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinLessThanOrEqualTo(Double value) { public Criteria andAdvanceinLessThanOrEqualTo(BigDecimal value) {
addCriterion("AdvanceIn <=", value, "advancein"); addCriterion("AdvanceIn <=", value, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinIn(List<Double> values) { public Criteria andAdvanceinIn(List<BigDecimal> values) {
addCriterion("AdvanceIn in", values, "advancein"); addCriterion("AdvanceIn in", values, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinNotIn(List<Double> values) { public Criteria andAdvanceinNotIn(List<BigDecimal> values) {
addCriterion("AdvanceIn not in", values, "advancein"); addCriterion("AdvanceIn not in", values, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinBetween(Double value1, Double value2) { public Criteria andAdvanceinBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AdvanceIn between", value1, value2, "advancein"); addCriterion("AdvanceIn between", value1, value2, "advancein");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAdvanceinNotBetween(Double value1, Double value2) { public Criteria andAdvanceinNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AdvanceIn not between", value1, value2, "advancein"); addCriterion("AdvanceIn not between", value1, value2, "advancein");
return (Criteria) this; return (Criteria) this;
} }
@@ -864,52 +865,52 @@ public class SupplierExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetEqualTo(Double value) { public Criteria andBeginneedgetEqualTo(BigDecimal value) {
addCriterion("BeginNeedGet =", value, "beginneedget"); addCriterion("BeginNeedGet =", value, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetNotEqualTo(Double value) { public Criteria andBeginneedgetNotEqualTo(BigDecimal value) {
addCriterion("BeginNeedGet <>", value, "beginneedget"); addCriterion("BeginNeedGet <>", value, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetGreaterThan(Double value) { public Criteria andBeginneedgetGreaterThan(BigDecimal value) {
addCriterion("BeginNeedGet >", value, "beginneedget"); addCriterion("BeginNeedGet >", value, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetGreaterThanOrEqualTo(Double value) { public Criteria andBeginneedgetGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("BeginNeedGet >=", value, "beginneedget"); addCriterion("BeginNeedGet >=", value, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetLessThan(Double value) { public Criteria andBeginneedgetLessThan(BigDecimal value) {
addCriterion("BeginNeedGet <", value, "beginneedget"); addCriterion("BeginNeedGet <", value, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetLessThanOrEqualTo(Double value) { public Criteria andBeginneedgetLessThanOrEqualTo(BigDecimal value) {
addCriterion("BeginNeedGet <=", value, "beginneedget"); addCriterion("BeginNeedGet <=", value, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetIn(List<Double> values) { public Criteria andBeginneedgetIn(List<BigDecimal> values) {
addCriterion("BeginNeedGet in", values, "beginneedget"); addCriterion("BeginNeedGet in", values, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetNotIn(List<Double> values) { public Criteria andBeginneedgetNotIn(List<BigDecimal> values) {
addCriterion("BeginNeedGet not in", values, "beginneedget"); addCriterion("BeginNeedGet not in", values, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetBetween(Double value1, Double value2) { public Criteria andBeginneedgetBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("BeginNeedGet between", value1, value2, "beginneedget"); addCriterion("BeginNeedGet between", value1, value2, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedgetNotBetween(Double value1, Double value2) { public Criteria andBeginneedgetNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("BeginNeedGet not between", value1, value2, "beginneedget"); addCriterion("BeginNeedGet not between", value1, value2, "beginneedget");
return (Criteria) this; return (Criteria) this;
} }
@@ -924,52 +925,52 @@ public class SupplierExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayEqualTo(Double value) { public Criteria andBeginneedpayEqualTo(BigDecimal value) {
addCriterion("BeginNeedPay =", value, "beginneedpay"); addCriterion("BeginNeedPay =", value, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayNotEqualTo(Double value) { public Criteria andBeginneedpayNotEqualTo(BigDecimal value) {
addCriterion("BeginNeedPay <>", value, "beginneedpay"); addCriterion("BeginNeedPay <>", value, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayGreaterThan(Double value) { public Criteria andBeginneedpayGreaterThan(BigDecimal value) {
addCriterion("BeginNeedPay >", value, "beginneedpay"); addCriterion("BeginNeedPay >", value, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayGreaterThanOrEqualTo(Double value) { public Criteria andBeginneedpayGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("BeginNeedPay >=", value, "beginneedpay"); addCriterion("BeginNeedPay >=", value, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayLessThan(Double value) { public Criteria andBeginneedpayLessThan(BigDecimal value) {
addCriterion("BeginNeedPay <", value, "beginneedpay"); addCriterion("BeginNeedPay <", value, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayLessThanOrEqualTo(Double value) { public Criteria andBeginneedpayLessThanOrEqualTo(BigDecimal value) {
addCriterion("BeginNeedPay <=", value, "beginneedpay"); addCriterion("BeginNeedPay <=", value, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayIn(List<Double> values) { public Criteria andBeginneedpayIn(List<BigDecimal> values) {
addCriterion("BeginNeedPay in", values, "beginneedpay"); addCriterion("BeginNeedPay in", values, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayNotIn(List<Double> values) { public Criteria andBeginneedpayNotIn(List<BigDecimal> values) {
addCriterion("BeginNeedPay not in", values, "beginneedpay"); addCriterion("BeginNeedPay not in", values, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayBetween(Double value1, Double value2) { public Criteria andBeginneedpayBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("BeginNeedPay between", value1, value2, "beginneedpay"); addCriterion("BeginNeedPay between", value1, value2, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBeginneedpayNotBetween(Double value1, Double value2) { public Criteria andBeginneedpayNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("BeginNeedPay not between", value1, value2, "beginneedpay"); addCriterion("BeginNeedPay not between", value1, value2, "beginneedpay");
return (Criteria) this; return (Criteria) this;
} }
@@ -984,52 +985,52 @@ public class SupplierExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetEqualTo(Double value) { public Criteria andAllneedgetEqualTo(BigDecimal value) {
addCriterion("AllNeedGet =", value, "allneedget"); addCriterion("AllNeedGet =", value, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetNotEqualTo(Double value) { public Criteria andAllneedgetNotEqualTo(BigDecimal value) {
addCriterion("AllNeedGet <>", value, "allneedget"); addCriterion("AllNeedGet <>", value, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetGreaterThan(Double value) { public Criteria andAllneedgetGreaterThan(BigDecimal value) {
addCriterion("AllNeedGet >", value, "allneedget"); addCriterion("AllNeedGet >", value, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetGreaterThanOrEqualTo(Double value) { public Criteria andAllneedgetGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("AllNeedGet >=", value, "allneedget"); addCriterion("AllNeedGet >=", value, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetLessThan(Double value) { public Criteria andAllneedgetLessThan(BigDecimal value) {
addCriterion("AllNeedGet <", value, "allneedget"); addCriterion("AllNeedGet <", value, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetLessThanOrEqualTo(Double value) { public Criteria andAllneedgetLessThanOrEqualTo(BigDecimal value) {
addCriterion("AllNeedGet <=", value, "allneedget"); addCriterion("AllNeedGet <=", value, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetIn(List<Double> values) { public Criteria andAllneedgetIn(List<BigDecimal> values) {
addCriterion("AllNeedGet in", values, "allneedget"); addCriterion("AllNeedGet in", values, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetNotIn(List<Double> values) { public Criteria andAllneedgetNotIn(List<BigDecimal> values) {
addCriterion("AllNeedGet not in", values, "allneedget"); addCriterion("AllNeedGet not in", values, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetBetween(Double value1, Double value2) { public Criteria andAllneedgetBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AllNeedGet between", value1, value2, "allneedget"); addCriterion("AllNeedGet between", value1, value2, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedgetNotBetween(Double value1, Double value2) { public Criteria andAllneedgetNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AllNeedGet not between", value1, value2, "allneedget"); addCriterion("AllNeedGet not between", value1, value2, "allneedget");
return (Criteria) this; return (Criteria) this;
} }
@@ -1044,52 +1045,52 @@ public class SupplierExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayEqualTo(Double value) { public Criteria andAllneedpayEqualTo(BigDecimal value) {
addCriterion("AllNeedPay =", value, "allneedpay"); addCriterion("AllNeedPay =", value, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayNotEqualTo(Double value) { public Criteria andAllneedpayNotEqualTo(BigDecimal value) {
addCriterion("AllNeedPay <>", value, "allneedpay"); addCriterion("AllNeedPay <>", value, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayGreaterThan(Double value) { public Criteria andAllneedpayGreaterThan(BigDecimal value) {
addCriterion("AllNeedPay >", value, "allneedpay"); addCriterion("AllNeedPay >", value, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayGreaterThanOrEqualTo(Double value) { public Criteria andAllneedpayGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("AllNeedPay >=", value, "allneedpay"); addCriterion("AllNeedPay >=", value, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayLessThan(Double value) { public Criteria andAllneedpayLessThan(BigDecimal value) {
addCriterion("AllNeedPay <", value, "allneedpay"); addCriterion("AllNeedPay <", value, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayLessThanOrEqualTo(Double value) { public Criteria andAllneedpayLessThanOrEqualTo(BigDecimal value) {
addCriterion("AllNeedPay <=", value, "allneedpay"); addCriterion("AllNeedPay <=", value, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayIn(List<Double> values) { public Criteria andAllneedpayIn(List<BigDecimal> values) {
addCriterion("AllNeedPay in", values, "allneedpay"); addCriterion("AllNeedPay in", values, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayNotIn(List<Double> values) { public Criteria andAllneedpayNotIn(List<BigDecimal> values) {
addCriterion("AllNeedPay not in", values, "allneedpay"); addCriterion("AllNeedPay not in", values, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayBetween(Double value1, Double value2) { public Criteria andAllneedpayBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AllNeedPay between", value1, value2, "allneedpay"); addCriterion("AllNeedPay between", value1, value2, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAllneedpayNotBetween(Double value1, Double value2) { public Criteria andAllneedpayNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("AllNeedPay not between", value1, value2, "allneedpay"); addCriterion("AllNeedPay not between", value1, value2, "allneedpay");
return (Criteria) this; return (Criteria) this;
} }
@@ -1524,52 +1525,52 @@ public class SupplierExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateEqualTo(Double value) { public Criteria andTaxrateEqualTo(BigDecimal value) {
addCriterion("taxRate =", value, "taxrate"); addCriterion("taxRate =", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateNotEqualTo(Double value) { public Criteria andTaxrateNotEqualTo(BigDecimal value) {
addCriterion("taxRate <>", value, "taxrate"); addCriterion("taxRate <>", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateGreaterThan(Double value) { public Criteria andTaxrateGreaterThan(BigDecimal value) {
addCriterion("taxRate >", value, "taxrate"); addCriterion("taxRate >", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateGreaterThanOrEqualTo(Double value) { public Criteria andTaxrateGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("taxRate >=", value, "taxrate"); addCriterion("taxRate >=", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateLessThan(Double value) { public Criteria andTaxrateLessThan(BigDecimal value) {
addCriterion("taxRate <", value, "taxrate"); addCriterion("taxRate <", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateLessThanOrEqualTo(Double value) { public Criteria andTaxrateLessThanOrEqualTo(BigDecimal value) {
addCriterion("taxRate <=", value, "taxrate"); addCriterion("taxRate <=", value, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateIn(List<Double> values) { public Criteria andTaxrateIn(List<BigDecimal> values) {
addCriterion("taxRate in", values, "taxrate"); addCriterion("taxRate in", values, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateNotIn(List<Double> values) { public Criteria andTaxrateNotIn(List<BigDecimal> values) {
addCriterion("taxRate not in", values, "taxrate"); addCriterion("taxRate not in", values, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateBetween(Double value1, Double value2) { public Criteria andTaxrateBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("taxRate between", value1, value2, "taxrate"); addCriterion("taxRate between", value1, value2, "taxrate");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxrateNotBetween(Double value1, Double value2) { public Criteria andTaxrateNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("taxRate not between", value1, value2, "taxrate"); addCriterion("taxRate not between", value1, value2, "taxrate");
return (Criteria) this; return (Criteria) this;
} }

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

@@ -2,6 +2,8 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.AccountHead; import com.jsh.erp.datasource.entities.AccountHead;
import com.jsh.erp.datasource.entities.AccountHeadExample; import com.jsh.erp.datasource.entities.AccountHeadExample;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx; import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
@@ -112,7 +114,7 @@ public interface AccountHeadMapper {
Long getMaxId(); Long getMaxId();
Double findAllMoney( BigDecimal findAllMoney(
@Param("supplierId") Integer supplierId, @Param("supplierId") Integer supplierId,
@Param("type") String type, @Param("type") String type,
@Param("modeName") String modeName, @Param("modeName") String modeName,

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

@@ -2,6 +2,8 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead; import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample; import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail; import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
@@ -172,7 +174,7 @@ public interface DepotHeadMapper {
@Param("organId") Integer organId, @Param("organId") Integer organId,
@Param("supType") String supType); @Param("supType") String supType);
Double findAllMoney( BigDecimal findAllMoney(
@Param("supplierId") Integer supplierId, @Param("supplierId") Integer supplierId,
@Param("type") String type, @Param("type") String type,
@Param("subType") String subType, @Param("subType") String subType,

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

@@ -2,6 +2,7 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.entities.*;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -148,68 +149,68 @@ public interface DepotItemMapper {
@Param("headIds") String headIds, @Param("headIds") String headIds,
@Param("materialIds") String materialIds); @Param("materialIds") String materialIds);
Double findByTypeInIsPrev( BigDecimal findByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double findByTypeInIsNotPrev( BigDecimal findByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double findByTypeOutIsPrev( BigDecimal findByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double findByTypeOutIsNotPrev( BigDecimal findByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double findPriceByTypeInIsPrev( BigDecimal findPriceByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double findPriceByTypeInIsNotPrev( BigDecimal findPriceByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double findPriceByTypeOutIsPrev( BigDecimal findPriceByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double findPriceByTypeOutIsNotPrev( BigDecimal findPriceByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime); @Param("MonthTime") String MonthTime);
Double buyOrSaleNumber( BigDecimal buyOrSaleNumber(
@Param("type") String type, @Param("type") String type,
@Param("subType") String subType, @Param("subType") String subType,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime, @Param("MonthTime") String MonthTime,
@Param("sumType") String sumType); @Param("sumType") String sumType);
Double buyOrSalePrice( BigDecimal buyOrSalePrice(
@Param("type") String type, @Param("type") String type,
@Param("subType") String subType, @Param("subType") String subType,
@Param("MId") Long MId, @Param("MId") Long MId,
@Param("MonthTime") String MonthTime, @Param("MonthTime") String MonthTime,
@Param("sumType") String sumType); @Param("sumType") String sumType);
Double findGiftByTypeIn( BigDecimal findGiftByTypeIn(
@Param("subType") String subType, @Param("subType") String subType,
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId); @Param("MId") Long MId);
Double findGiftByTypeOut( BigDecimal findGiftByTypeOut(
@Param("subType") String subType, @Param("subType") String subType,
@Param("ProjectId") Integer ProjectId, @Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId); @Param("MId") Long MId);

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.vo; package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class AccountItemVo4List { public class AccountItemVo4List {
private Long id; private Long id;
@@ -10,7 +12,7 @@ public class AccountItemVo4List {
private Long inoutitemid; private Long inoutitemid;
private Double eachamount; private BigDecimal eachamount;
private String remark; private String remark;
@@ -50,11 +52,11 @@ public class AccountItemVo4List {
this.inoutitemid = inoutitemid; this.inoutitemid = inoutitemid;
} }
public Double getEachamount() { public BigDecimal getEachamount() {
return eachamount; return eachamount;
} }
public void setEachamount(Double eachamount) { public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount; this.eachamount = eachamount;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.vo; package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class AccountVo4InOutList { public class AccountVo4InOutList {
private String number; private String number;
@@ -8,9 +10,9 @@ public class AccountVo4InOutList {
private String supplierName; private String supplierName;
private Double changeAmount; private BigDecimal changeAmount;
private Double balance; private BigDecimal balance;
private String operTime; private String operTime;
@@ -42,19 +44,19 @@ public class AccountVo4InOutList {
this.supplierName = supplierName; this.supplierName = supplierName;
} }
public Double getChangeAmount() { public BigDecimal getChangeAmount() {
return changeAmount; return changeAmount;
} }
public void setChangeAmount(Double changeAmount) { public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount; this.changeAmount = changeAmount;
} }
public Double getBalance() { public BigDecimal getBalance() {
return balance; return balance;
} }
public void setBalance(Double balance) { public void setBalance(BigDecimal balance) {
this.balance = balance; this.balance = balance;
} }

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

@@ -1,5 +1,7 @@
package com.jsh.erp.datasource.vo; package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class AccountVo4List { public class AccountVo4List {
private Long id; private Long id;
@@ -8,9 +10,9 @@ public class AccountVo4List {
private String serialno; private String serialno;
private Double initialamount; private BigDecimal initialamount;
private Double currentamount; private BigDecimal currentamount;
private String remark; private String remark;
@@ -42,19 +44,19 @@ public class AccountVo4List {
this.serialno = serialno; this.serialno = serialno;
} }
public Double getInitialamount() { public BigDecimal getInitialamount() {
return initialamount; return initialamount;
} }
public void setInitialamount(Double initialamount) { public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount; this.initialamount = initialamount;
} }
public Double getCurrentamount() { public BigDecimal getCurrentamount() {
return currentamount; return currentamount;
} }
public void setCurrentamount(Double currentamount) { public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount; this.currentamount = currentamount;
} }

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

@@ -1,6 +1,7 @@
package com.jsh.erp.datasource.vo; package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
public class DepotHeadVo4InDetail { public class DepotHeadVo4InDetail {
@@ -11,11 +12,11 @@ public class DepotHeadVo4InDetail {
private String Model; private String Model;
private Double UnitPrice; private BigDecimal UnitPrice;
private Double OperNumber; private BigDecimal OperNumber;
private Double AllPrice; private BigDecimal AllPrice;
private String SName; private String SName;
@@ -49,27 +50,27 @@ public class DepotHeadVo4InDetail {
Model = model; Model = model;
} }
public Double getUnitPrice() { public BigDecimal getUnitPrice() {
return UnitPrice; return UnitPrice;
} }
public void setUnitPrice(Double unitPrice) { public void setUnitPrice(BigDecimal unitPrice) {
UnitPrice = unitPrice; UnitPrice = unitPrice;
} }
public Double getOperNumber() { public BigDecimal getOperNumber() {
return OperNumber; return OperNumber;
} }
public void setOperNumber(Double operNumber) { public void setOperNumber(BigDecimal operNumber) {
OperNumber = operNumber; OperNumber = operNumber;
} }
public Double getAllPrice() { public BigDecimal getAllPrice() {
return AllPrice; return AllPrice;
} }
public void setAllPrice(Double allPrice) { public void setAllPrice(BigDecimal allPrice) {
AllPrice = allPrice; AllPrice = allPrice;
} }

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

@@ -1,6 +1,8 @@
package com.jsh.erp.datasource.vo; package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class DepotHeadVo4InOutMCount { public class DepotHeadVo4InOutMCount {
private Long MaterialId; private Long MaterialId;
@@ -11,9 +13,9 @@ public class DepotHeadVo4InOutMCount {
private String categoryName; private String categoryName;
private Double numSum; private BigDecimal numSum;
private Double priceSum; private BigDecimal priceSum;
public Long getMaterialId() { public Long getMaterialId() {
return MaterialId; return MaterialId;
@@ -47,19 +49,19 @@ public class DepotHeadVo4InOutMCount {
this.categoryName = categoryName; this.categoryName = categoryName;
} }
public Double getNumSum() { public BigDecimal getNumSum() {
return numSum; return numSum;
} }
public void setNumSum(Double numSum) { public void setNumSum(BigDecimal numSum) {
this.numSum = numSum; this.numSum = numSum;
} }
public Double getPriceSum() { public BigDecimal getPriceSum() {
return priceSum; return priceSum;
} }
public void setPriceSum(Double priceSum) { public void setPriceSum(BigDecimal priceSum) {
this.priceSum = priceSum; this.priceSum = priceSum;
} }
} }

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

@@ -1,5 +1,6 @@
package com.jsh.erp.datasource.vo; package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
public class DepotHeadVo4List { public class DepotHeadVo4List {
@@ -28,11 +29,11 @@ public class DepotHeadVo4List {
private Long accountid; private Long accountid;
private Double changeamount; private BigDecimal changeamount;
private Long allocationprojectid; private Long allocationprojectid;
private Double totalprice; private BigDecimal totalprice;
private String paytype; private String paytype;
@@ -44,13 +45,13 @@ public class DepotHeadVo4List {
private String accountmoneylist; private String accountmoneylist;
private Double discount; private BigDecimal discount;
private Double discountmoney; private BigDecimal discountmoney;
private Double discountlastmoney; private BigDecimal discountlastmoney;
private Double othermoney; private BigDecimal othermoney;
private String othermoneylist; private String othermoneylist;
@@ -168,11 +169,11 @@ public class DepotHeadVo4List {
this.accountid = accountid; this.accountid = accountid;
} }
public Double getChangeamount() { public BigDecimal getChangeamount() {
return changeamount; return changeamount;
} }
public void setChangeamount(Double changeamount) { public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount; this.changeamount = changeamount;
} }
@@ -184,11 +185,11 @@ public class DepotHeadVo4List {
this.allocationprojectid = allocationprojectid; this.allocationprojectid = allocationprojectid;
} }
public Double getTotalprice() { public BigDecimal getTotalprice() {
return totalprice; return totalprice;
} }
public void setTotalprice(Double totalprice) { public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice; this.totalprice = totalprice;
} }
@@ -232,35 +233,35 @@ public class DepotHeadVo4List {
this.accountmoneylist = accountmoneylist; this.accountmoneylist = accountmoneylist;
} }
public Double getDiscount() { public BigDecimal getDiscount() {
return discount; return discount;
} }
public void setDiscount(Double discount) { public void setDiscount(BigDecimal discount) {
this.discount = discount; this.discount = discount;
} }
public Double getDiscountmoney() { public BigDecimal getDiscountmoney() {
return discountmoney; return discountmoney;
} }
public void setDiscountmoney(Double discountmoney) { public void setDiscountmoney(BigDecimal discountmoney) {
this.discountmoney = discountmoney; this.discountmoney = discountmoney;
} }
public Double getDiscountlastmoney() { public BigDecimal getDiscountlastmoney() {
return discountlastmoney; return discountlastmoney;
} }
public void setDiscountlastmoney(Double discountlastmoney) { public void setDiscountlastmoney(BigDecimal discountlastmoney) {
this.discountlastmoney = discountlastmoney; this.discountlastmoney = discountlastmoney;
} }
public Double getOthermoney() { public BigDecimal getOthermoney() {
return othermoney; return othermoney;
} }
public void setOthermoney(Double othermoney) { public void setOthermoney(BigDecimal othermoney) {
this.othermoney = othermoney; this.othermoney = othermoney;
} }

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

@@ -1,17 +1,19 @@
package com.jsh.erp.datasource.vo; package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
public class DepotHeadVo4StatementAccount { public class DepotHeadVo4StatementAccount {
private String number; private String number;
private String type; private String type;
private Double discountLastMoney; private BigDecimal discountLastMoney;
private Double changeAmount; private BigDecimal changeAmount;
private Double allPrice; private BigDecimal allPrice;
private String supplierName; private String supplierName;
@@ -33,27 +35,27 @@ public class DepotHeadVo4StatementAccount {
this.type = type; this.type = type;
} }
public Double getDiscountLastMoney() { public BigDecimal getDiscountLastMoney() {
return discountLastMoney; return discountLastMoney;
} }
public void setDiscountLastMoney(Double discountLastMoney) { public void setDiscountLastMoney(BigDecimal discountLastMoney) {
this.discountLastMoney = discountLastMoney; this.discountLastMoney = discountLastMoney;
} }
public Double getChangeAmount() { public BigDecimal getChangeAmount() {
return changeAmount; return changeAmount;
} }
public void setChangeAmount(Double changeAmount) { public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount; this.changeAmount = changeAmount;
} }
public Double getAllPrice() { public BigDecimal getAllPrice() {
return allPrice; return allPrice;
} }
public void setAllPrice(Double allPrice) { public void setAllPrice(BigDecimal allPrice) {
this.allPrice = allPrice; this.allPrice = allPrice;
} }

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

@@ -1,6 +1,5 @@
package com.jsh.erp.service.account; package com.jsh.erp.service.account;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.datasource.mappers.AccountHeadMapper; import com.jsh.erp.datasource.mappers.AccountHeadMapper;
@@ -19,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -56,13 +56,13 @@ public class AccountService {
if (null != list && null !=timeStr) { if (null != list && null !=timeStr) {
for (AccountVo4List al : list) { for (AccountVo4List al : list) {
DecimalFormat df = new DecimalFormat(".##"); 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"; String thisMonthAmountFmt = "0";
if (thisMonthAmount != 0) { if ((thisMonthAmount.compareTo(BigDecimal.ZERO))!=0) {
thisMonthAmountFmt = df.format(thisMonthAmount); thisMonthAmountFmt = df.format(thisMonthAmount);
} }
al.setThismonthamount(thisMonthAmountFmt); //本月发生额 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); al.setCurrentamount(currentAmount);
resList.add(al); resList.add(al);
} }
@@ -78,7 +78,7 @@ public class AccountService {
public int insertAccount(String beanJson, HttpServletRequest request) { public int insertAccount(String beanJson, HttpServletRequest request) {
Account account = JSONObject.parseObject(beanJson, Account.class); Account account = JSONObject.parseObject(beanJson, Account.class);
if(account.getInitialamount() == null) { if(account.getInitialamount() == null) {
account.setInitialamount(0d); account.setInitialamount(BigDecimal.ZERO);
} }
account.setIsdefault(false); account.setIsdefault(false);
return accountMapper.insertSelective(account); return accountMapper.insertSelective(account);
@@ -123,8 +123,8 @@ public class AccountService {
* @param id * @param id
* @return * @return
*/ */
public Double getAccountSum(Long id, String timeStr, String type) { public BigDecimal getAccountSum(Long id, String timeStr, String type) {
Double accountSum = 0.0; BigDecimal accountSum = BigDecimal.ZERO;
try { try {
DepotHeadExample example = new DepotHeadExample(); DepotHeadExample example = new DepotHeadExample();
if (!timeStr.equals("")) { if (!timeStr.equals("")) {
@@ -145,7 +145,7 @@ public class AccountService {
if (dataList != null) { if (dataList != null) {
for (DepotHead depotHead : dataList) { for (DepotHead depotHead : dataList) {
if(depotHead.getChangeamount()!=null) { if(depotHead.getChangeamount()!=null) {
accountSum = accountSum + depotHead.getChangeamount(); accountSum = accountSum .add(depotHead.getChangeamount()) ;
} }
} }
} }
@@ -161,8 +161,8 @@ public class AccountService {
* @param id * @param id
* @return * @return
*/ */
public Double getAccountSumByHead(Long id, String timeStr, String type) { public BigDecimal getAccountSumByHead(Long id, String timeStr, String type) {
Double accountSum = 0.0; BigDecimal accountSum = BigDecimal.ZERO;
try { try {
AccountHeadExample example = new AccountHeadExample(); AccountHeadExample example = new AccountHeadExample();
if (!timeStr.equals("")) { if (!timeStr.equals("")) {
@@ -183,7 +183,7 @@ public class AccountService {
if (dataList != null) { if (dataList != null) {
for (AccountHead accountHead : dataList) { for (AccountHead accountHead : dataList) {
if(accountHead.getChangeamount()!=null) { if(accountHead.getChangeamount()!=null) {
accountSum = accountSum + accountHead.getChangeamount(); accountSum = accountSum.add(accountHead.getChangeamount());
} }
} }
} }
@@ -199,8 +199,8 @@ public class AccountService {
* @param id * @param id
* @return * @return
*/ */
public Double getAccountSumByDetail(Long id, String timeStr, String type) { public BigDecimal getAccountSumByDetail(Long id, String timeStr, String type) {
Double accountSum = 0.0; BigDecimal accountSum =BigDecimal.ZERO ;
try { try {
AccountHeadExample example = new AccountHeadExample(); AccountHeadExample example = new AccountHeadExample();
if (!timeStr.equals("")) { if (!timeStr.equals("")) {
@@ -234,7 +234,7 @@ public class AccountService {
if (dataListOne != null) { if (dataListOne != null) {
for (AccountItem accountItem : dataListOne) { for (AccountItem accountItem : dataListOne) {
if(accountItem.getEachamount()!=null) { if(accountItem.getEachamount()!=null) {
accountSum = accountSum + accountItem.getEachamount(); accountSum = accountSum.add(accountItem.getEachamount());
} }
} }
} }
@@ -253,8 +253,8 @@ public class AccountService {
* @param id * @param id
* @return * @return
*/ */
public Double getManyAccountSum(Long id, String timeStr, String type) { public BigDecimal getManyAccountSum(Long id, String timeStr, String type) {
Double accountSum = 0.0; BigDecimal accountSum = BigDecimal.ZERO;
try { try {
DepotHeadExample example = new DepotHeadExample(); DepotHeadExample example = new DepotHeadExample();
if (!timeStr.equals("")) { if (!timeStr.equals("")) {
@@ -282,7 +282,7 @@ public class AccountService {
String[] amList = accountMoneyList.split(","); String[] amList = accountMoneyList.split(",");
for (int i = 0; i < aList.length; i++) { for (int i = 0; i < aList.length; i++) {
if (aList[i].toString().equals(id.toString())) { 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -39,10 +40,10 @@ public class AccountHeadService {
if (null != list) { if (null != list) {
for (AccountHeadVo4ListEx ah : list) { for (AccountHeadVo4ListEx ah : list) {
if(ah.getChangeamount() != null) { if(ah.getChangeamount() != null) {
ah.setChangeamount(Math.abs(ah.getChangeamount())); ah.setChangeamount(ah.getChangeamount().abs());
} }
if(ah.getTotalprice() != null) { if(ah.getTotalprice() != null) {
ah.setTotalprice(Math.abs(ah.getTotalprice())); ah.setTotalprice(ah.getTotalprice().abs());
} }
resList.add(ah); resList.add(ah);
} }
@@ -91,7 +92,7 @@ public class AccountHeadService {
return accountHeadMapper.getMaxId(); 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 = ""; String modeName = "";
if (mode.equals("实际")) { if (mode.equals("实际")) {
modeName = "ChangeAmount"; modeName = "ChangeAmount";
@@ -107,10 +108,10 @@ public class AccountHeadService {
if (null != list) { if (null != list) {
for (AccountHeadVo4ListEx ah : list) { for (AccountHeadVo4ListEx ah : list) {
if(ah.getChangeamount() != null) { if(ah.getChangeamount() != null) {
ah.setChangeamount(Math.abs(ah.getChangeamount())); ah.setChangeamount(ah.getChangeamount().abs());
} }
if(ah.getTotalprice() != null) { if(ah.getTotalprice() != null) {
ah.setTotalprice(Math.abs(ah.getTotalprice())); ah.setTotalprice(ah.getTotalprice().abs());
} }
resList.add(ah); 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
@@ -108,13 +109,13 @@ public class AccountItemService {
accountItem.setInoutitemid(tempInsertedJson.getLong("InOutItemId")); accountItem.setInoutitemid(tempInsertedJson.getLong("InOutItemId"));
} }
if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) { if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) {
Double eachAmount = tempInsertedJson.getDouble("EachAmount"); BigDecimal eachAmount = tempInsertedJson.getBigDecimal("EachAmount");
if (listType.equals("付款")) { if (listType.equals("付款")) {
eachAmount = 0 - eachAmount; eachAmount = BigDecimal.ZERO.subtract(eachAmount);
} }
accountItem.setEachamount(eachAmount); accountItem.setEachamount(eachAmount);
} else { } else {
accountItem.setEachamount(0.0); accountItem.setEachamount(BigDecimal.ZERO);
} }
accountItem.setRemark(tempInsertedJson.getString("Remark")); accountItem.setRemark(tempInsertedJson.getString("Remark"));
this.insertAccountItemWithObj(accountItem); this.insertAccountItemWithObj(accountItem);
@@ -139,13 +140,13 @@ public class AccountItemService {
accountItem.setInoutitemid(tempUpdatedJson.getLong("InOutItemId")); accountItem.setInoutitemid(tempUpdatedJson.getLong("InOutItemId"));
} }
if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) { if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) {
Double eachAmount = tempUpdatedJson.getDouble("EachAmount"); BigDecimal eachAmount = tempUpdatedJson.getBigDecimal("EachAmount");
if (listType.equals("付款")) { if (listType.equals("付款")) {
eachAmount = 0 - eachAmount; eachAmount = BigDecimal.ZERO.subtract(eachAmount);
} }
accountItem.setEachamount(eachAmount); accountItem.setEachamount(eachAmount);
} else { } else {
accountItem.setEachamount(0.0); accountItem.setEachamount(BigDecimal.ZERO);
} }
accountItem.setRemark(tempUpdatedJson.getString("Remark")); accountItem.setRemark(tempUpdatedJson.getString("Remark"));
this.updateAccountItemWithObj(accountItem); 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -54,10 +55,10 @@ public class DepotHeadService {
dh.setOthermoneyitem(otherMoneyItemStr); dh.setOthermoneyitem(otherMoneyItemStr);
} }
if(dh.getChangeamount() != null) { if(dh.getChangeamount() != null) {
dh.setChangeamount(Math.abs(dh.getChangeamount())); dh.setChangeamount(dh.getChangeamount().abs());
} }
if(dh.getTotalprice() != null) { if(dh.getTotalprice() != null) {
dh.setTotalprice(Math.abs(dh.getTotalprice())); dh.setTotalprice(dh.getTotalprice().abs());
} }
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh); resList.add(dh);
@@ -213,7 +214,7 @@ public class DepotHeadService {
return depotHeadMapper.findStatementAccountCount(beginTime, endTime, organId, supType); 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 = ""; String modeName = "";
if (mode.equals("实际")) { if (mode.equals("实际")) {
modeName = "ChangeAmount"; modeName = "ChangeAmount";
@@ -237,10 +238,10 @@ public class DepotHeadService {
dh.setOthermoneyitem(otherMoneyItemStr); dh.setOthermoneyitem(otherMoneyItemStr);
} }
if(dh.getChangeamount() != null) { if(dh.getChangeamount() != null) {
dh.setChangeamount(Math.abs(dh.getChangeamount())); dh.setChangeamount(dh.getChangeamount().abs());
} }
if(dh.getTotalprice() != null) { if(dh.getTotalprice() != null) {
dh.setTotalprice(Math.abs(dh.getTotalprice())); dh.setTotalprice(dh.getTotalprice().abs());
} }
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh); 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -157,7 +158,7 @@ public class DepotItemService {
return depotItemMapper.findByAllCount(headIds, materialIds); 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 (TYPE.equals(type)) {
if (isPrev) { if (isPrev) {
return depotItemMapper.findByTypeInIsPrev(ProjectId, MId, MonthTime); 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 (TYPE.equals(type)) {
if (isPrev) { if (isPrev) {
return depotItemMapper.findPriceByTypeInIsPrev(ProjectId, MId, MonthTime); 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)) { if (SUM_TYPE.equals(sumType)) {
return depotItemMapper.buyOrSaleNumber(type, subType, MId, MonthTime, sumType); return depotItemMapper.buyOrSaleNumber(type, subType, MId, MonthTime, sumType);
} else { } 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)) { if (IN.equals(type)) {
return depotItemMapper.findGiftByTypeIn(subType, ProjectId, MId); return depotItemMapper.findGiftByTypeIn(subType, ProjectId, MId);
} else { } else {
@@ -219,10 +220,10 @@ public class DepotItemService {
depotItem.setMaterialid(tempInsertedJson.getLong("MaterialId")); depotItem.setMaterialid(tempInsertedJson.getLong("MaterialId"));
depotItem.setMunit(tempInsertedJson.getString("Unit")); depotItem.setMunit(tempInsertedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) { if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempInsertedJson.getDouble("OperNumber")); depotItem.setOpernumber(tempInsertedJson.getBigDecimal("OperNumber"));
try { try {
String Unit = tempInsertedJson.get("Unit").toString(); String Unit = tempInsertedJson.get("Unit").toString();
Double oNumber = tempInsertedJson.getDouble("OperNumber"); BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString()); Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString());
//以下进行单位换算 //以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称 String UnitName = findUnitName(mId); //查询计量单位名称
@@ -235,7 +236,7 @@ public class DepotItemService {
if (Unit.equals(basicUnit)) { //如果等于基础单位 if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致 depotItem.setBasicnumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位 } else if (Unit.equals(otherUnit)) { //如果等于副单位
depotItem.setBasicnumber(oNumber * ratio); //数量乘以比例 depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例
} }
} else { } else {
depotItem.setBasicnumber(oNumber); //其他情况 depotItem.setBasicnumber(oNumber); //其他情况
@@ -245,13 +246,13 @@ public class DepotItemService {
} }
} }
if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) { if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) {
depotItem.setUnitprice(tempInsertedJson.getDouble("UnitPrice")); depotItem.setUnitprice(tempInsertedJson.getBigDecimal("UnitPrice"));
} }
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) { if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) {
depotItem.setTaxunitprice(tempInsertedJson.getDouble("TaxUnitPrice")); depotItem.setTaxunitprice(tempInsertedJson.getBigDecimal("TaxUnitPrice"));
} }
if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) { if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) {
depotItem.setAllprice(tempInsertedJson.getDouble("AllPrice")); depotItem.setAllprice(tempInsertedJson.getBigDecimal("AllPrice"));
} }
depotItem.setRemark(tempInsertedJson.getString("Remark")); depotItem.setRemark(tempInsertedJson.getString("Remark"));
if (tempInsertedJson.get("DepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("DepotId").toString())) { if (tempInsertedJson.get("DepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("DepotId").toString())) {
@@ -261,13 +262,13 @@ public class DepotItemService {
depotItem.setAnotherdepotid(tempInsertedJson.getLong("AnotherDepotId")); depotItem.setAnotherdepotid(tempInsertedJson.getLong("AnotherDepotId"));
} }
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxRate").toString())) { if (!StringUtil.isEmpty(tempInsertedJson.get("TaxRate").toString())) {
depotItem.setTaxrate(tempInsertedJson.getDouble("TaxRate")); depotItem.setTaxrate(tempInsertedJson.getBigDecimal("TaxRate"));
} }
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) { if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) {
depotItem.setTaxmoney(tempInsertedJson.getDouble("TaxMoney")); depotItem.setTaxmoney(tempInsertedJson.getBigDecimal("TaxMoney"));
} }
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) { if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
depotItem.setTaxlastmoney(tempInsertedJson.getDouble("TaxLastMoney")); depotItem.setTaxlastmoney(tempInsertedJson.getBigDecimal("TaxLastMoney"));
} }
if (tempInsertedJson.get("OtherField1") != null) { if (tempInsertedJson.get("OtherField1") != null) {
depotItem.setOtherfield1(tempInsertedJson.getString("OtherField1")); depotItem.setOtherfield1(tempInsertedJson.getString("OtherField1"));
@@ -304,10 +305,10 @@ public class DepotItemService {
depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId")); depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId"));
depotItem.setMunit(tempUpdatedJson.getString("Unit")); depotItem.setMunit(tempUpdatedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) { if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempUpdatedJson.getDouble("OperNumber")); depotItem.setOpernumber(tempUpdatedJson.getBigDecimal("OperNumber"));
try { try {
String Unit = tempUpdatedJson.get("Unit").toString(); String Unit = tempUpdatedJson.get("Unit").toString();
Double oNumber = tempUpdatedJson.getDouble("OperNumber"); BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString()); Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
//以下进行单位换算 //以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称 String UnitName = findUnitName(mId); //查询计量单位名称
@@ -320,7 +321,7 @@ public class DepotItemService {
if (Unit.equals(basicUnit)) { //如果等于基础单位 if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致 depotItem.setBasicnumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位 } else if (Unit.equals(otherUnit)) { //如果等于副单位
depotItem.setBasicnumber(oNumber * ratio); //数量乘以比例 depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例
} }
} else { } else {
depotItem.setBasicnumber(oNumber); //其他情况 depotItem.setBasicnumber(oNumber); //其他情况
@@ -330,13 +331,13 @@ public class DepotItemService {
} }
} }
if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) { if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) {
depotItem.setUnitprice(tempUpdatedJson.getDouble("UnitPrice")); depotItem.setUnitprice(tempUpdatedJson.getBigDecimal("UnitPrice"));
} }
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())) { if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())) {
depotItem.setTaxunitprice(tempUpdatedJson.getDouble("TaxUnitPrice")); depotItem.setTaxunitprice(tempUpdatedJson.getBigDecimal("TaxUnitPrice"));
} }
if (!StringUtil.isEmpty(tempUpdatedJson.get("AllPrice").toString())) { if (!StringUtil.isEmpty(tempUpdatedJson.get("AllPrice").toString())) {
depotItem.setAllprice(tempUpdatedJson.getDouble("AllPrice")); depotItem.setAllprice(tempUpdatedJson.getBigDecimal("AllPrice"));
} }
depotItem.setRemark(tempUpdatedJson.getString("Remark")); depotItem.setRemark(tempUpdatedJson.getString("Remark"));
if (tempUpdatedJson.get("DepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("DepotId").toString())) { if (tempUpdatedJson.get("DepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("DepotId").toString())) {
@@ -346,13 +347,13 @@ public class DepotItemService {
depotItem.setAnotherdepotid(tempUpdatedJson.getLong("AnotherDepotId")); depotItem.setAnotherdepotid(tempUpdatedJson.getLong("AnotherDepotId"));
} }
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxRate").toString())) { if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxRate").toString())) {
depotItem.setTaxrate(tempUpdatedJson.getDouble("TaxRate")); depotItem.setTaxrate(tempUpdatedJson.getBigDecimal("TaxRate"));
} }
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxMoney").toString())) { if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxMoney").toString())) {
depotItem.setTaxmoney(tempUpdatedJson.getDouble("TaxMoney")); depotItem.setTaxmoney(tempUpdatedJson.getBigDecimal("TaxMoney"));
} }
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())) { if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())) {
depotItem.setTaxlastmoney(tempUpdatedJson.getDouble("TaxLastMoney")); depotItem.setTaxlastmoney(tempUpdatedJson.getBigDecimal("TaxLastMoney"));
} }
depotItem.setOtherfield1(tempUpdatedJson.getString("OtherField1")); depotItem.setOtherfield1(tempUpdatedJson.getString("OtherField1"));
depotItem.setOtherfield2(tempUpdatedJson.getString("OtherField2")); 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -75,9 +76,9 @@ public class SupplierService {
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @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 supplier = supplierMapper.selectByPrimaryKey(supplierId);
supplier.setAdvancein(supplier.getAdvancein() + advanceIn); //增加预收款的金额，可能增加的是负值 supplier.setAdvancein(supplier.getAdvancein().add(advanceIn)); //增加预收款的金额，可能增加的是负值
return supplierMapper.updateByPrimaryKeySelective(supplier); return supplierMapper.updateByPrimaryKeySelective(supplier);
} }

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

@@ -10,8 +10,8 @@
<result column="Type" jdbcType="VARCHAR" property="type" /> <result column="Type" jdbcType="VARCHAR" property="type" />
<result column="OrganId" jdbcType="BIGINT" property="organid" /> <result column="OrganId" jdbcType="BIGINT" property="organid" />
<result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" /> <result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
<result column="ChangeAmount" jdbcType="DOUBLE" property="changeamount" /> <result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
<result column="TotalPrice" jdbcType="DOUBLE" property="totalprice" /> <result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
<result column="AccountId" jdbcType="BIGINT" property="accountid" /> <result column="AccountId" jdbcType="BIGINT" property="accountid" />
<result column="BillNo" jdbcType="VARCHAR" property="billno" /> <result column="BillNo" jdbcType="VARCHAR" property="billno" />
<result column="BillTime" jdbcType="TIMESTAMP" property="billtime" /> <result column="BillTime" jdbcType="TIMESTAMP" property="billtime" />
@@ -147,7 +147,7 @@
AccountId, BillNo, BillTime, AccountId, BillNo, BillTime,
Remark) Remark)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organid,jdbcType=BIGINT}, 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}, #{accountid,jdbcType=BIGINT}, #{billno,jdbcType=VARCHAR}, #{billtime,jdbcType=TIMESTAMP},
#{remark,jdbcType=VARCHAR}) #{remark,jdbcType=VARCHAR})
</insert> </insert>
@@ -203,10 +203,10 @@
#{handspersonid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT},
</if> </if>
<if test="changeamount != null"> <if test="changeamount != null">
#{changeamount,jdbcType=DOUBLE}, #{changeamount,jdbcType=DECIMAL},
</if> </if>
<if test="totalprice != null"> <if test="totalprice != null">
#{totalprice,jdbcType=DOUBLE}, #{totalprice,jdbcType=DECIMAL},
</if> </if>
<if test="accountid != null"> <if test="accountid != null">
#{accountid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT},
@@ -252,10 +252,10 @@
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT}, HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
</if> </if>
<if test="record.changeamount != null"> <if test="record.changeamount != null">
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE}, ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
</if> </if>
<if test="record.totalprice != null"> <if test="record.totalprice != null">
TotalPrice = #{record.totalprice,jdbcType=DOUBLE}, TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
</if> </if>
<if test="record.accountid != null"> <if test="record.accountid != null">
AccountId = #{record.accountid,jdbcType=BIGINT}, AccountId = #{record.accountid,jdbcType=BIGINT},
@@ -284,8 +284,8 @@
Type = #{record.type,jdbcType=VARCHAR}, Type = #{record.type,jdbcType=VARCHAR},
OrganId = #{record.organid,jdbcType=BIGINT}, OrganId = #{record.organid,jdbcType=BIGINT},
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT}, HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE}, ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
TotalPrice = #{record.totalprice,jdbcType=DOUBLE}, TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
AccountId = #{record.accountid,jdbcType=BIGINT}, AccountId = #{record.accountid,jdbcType=BIGINT},
BillNo = #{record.billno,jdbcType=VARCHAR}, BillNo = #{record.billno,jdbcType=VARCHAR},
BillTime = #{record.billtime,jdbcType=TIMESTAMP}, BillTime = #{record.billtime,jdbcType=TIMESTAMP},
@@ -311,10 +311,10 @@
HandsPersonId = #{handspersonid,jdbcType=BIGINT}, HandsPersonId = #{handspersonid,jdbcType=BIGINT},
</if> </if>
<if test="changeamount != null"> <if test="changeamount != null">
ChangeAmount = #{changeamount,jdbcType=DOUBLE}, ChangeAmount = #{changeamount,jdbcType=DECIMAL},
</if> </if>
<if test="totalprice != null"> <if test="totalprice != null">
TotalPrice = #{totalprice,jdbcType=DOUBLE}, TotalPrice = #{totalprice,jdbcType=DECIMAL},
</if> </if>
<if test="accountid != null"> <if test="accountid != null">
AccountId = #{accountid,jdbcType=BIGINT}, AccountId = #{accountid,jdbcType=BIGINT},
@@ -340,8 +340,8 @@
set Type = #{type,jdbcType=VARCHAR}, set Type = #{type,jdbcType=VARCHAR},
OrganId = #{organid,jdbcType=BIGINT}, OrganId = #{organid,jdbcType=BIGINT},
HandsPersonId = #{handspersonid,jdbcType=BIGINT}, HandsPersonId = #{handspersonid,jdbcType=BIGINT},
ChangeAmount = #{changeamount,jdbcType=DOUBLE}, ChangeAmount = #{changeamount,jdbcType=DECIMAL},
TotalPrice = #{totalprice,jdbcType=DOUBLE}, TotalPrice = #{totalprice,jdbcType=DECIMAL},
AccountId = #{accountid,jdbcType=BIGINT}, AccountId = #{accountid,jdbcType=BIGINT},
BillNo = #{billno,jdbcType=VARCHAR}, BillNo = #{billno,jdbcType=VARCHAR},
BillTime = #{billtime,jdbcType=TIMESTAMP}, BillTime = #{billtime,jdbcType=TIMESTAMP},

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

@@ -22,10 +22,10 @@
and ah.Type='${type}' and ah.Type='${type}'
</if> </if>
<if test="beginTime != null"> <if test="beginTime != null">
and ah.BillTime gt;= '%${beginTime}%' and ah.BillTime &gt;= '%${beginTime}%'
</if> </if>
<if test="endTime != null"> <if test="endTime != null">
and ah.BillTime lt;= '%${endTime}%' and ah.BillTime &lt;= '%${endTime}%'
</if> </if>
order by ah.Id desc order by ah.Id desc
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
@@ -46,10 +46,10 @@
and Type='${type}' and Type='${type}'
</if> </if>
<if test="beginTime != null"> <if test="beginTime != null">
and BillTime gt;= '%${beginTime}%' and BillTime &gt;= '%${beginTime}%'
</if> </if>
<if test="endTime != null"> <if test="endTime != null">
and BillTime lt;= '%${endTime}%' and BillTime &lt;= '%${endTime}%'
</if> </if>
</select> </select>
@@ -57,9 +57,9 @@
select max(Id) as Id from jsh_accounthead select max(Id) as Id from jsh_accounthead
</select> </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}' 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>
<select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx"> <select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">

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

@@ -10,7 +10,7 @@
<result column="HeaderId" jdbcType="BIGINT" property="headerid" /> <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
<result column="AccountId" jdbcType="BIGINT" property="accountid" /> <result column="AccountId" jdbcType="BIGINT" property="accountid" />
<result column="InOutItemId" jdbcType="BIGINT" property="inoutitemid" /> <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" /> <result column="Remark" jdbcType="VARCHAR" property="remark" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
@@ -141,7 +141,7 @@
InOutItemId, EachAmount, Remark InOutItemId, EachAmount, Remark
) )
values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 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>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
@@ -184,7 +184,7 @@
#{inoutitemid,jdbcType=BIGINT}, #{inoutitemid,jdbcType=BIGINT},
</if> </if>
<if test="eachamount != null"> <if test="eachamount != null">
#{eachamount,jdbcType=DOUBLE}, #{eachamount,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
@@ -221,7 +221,7 @@
InOutItemId = #{record.inoutitemid,jdbcType=BIGINT}, InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
</if> </if>
<if test="record.eachamount != null"> <if test="record.eachamount != null">
EachAmount = #{record.eachamount,jdbcType=DOUBLE}, EachAmount = #{record.eachamount,jdbcType=DECIMAL},
</if> </if>
<if test="record.remark != null"> <if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
@@ -241,7 +241,7 @@
HeaderId = #{record.headerid,jdbcType=BIGINT}, HeaderId = #{record.headerid,jdbcType=BIGINT},
AccountId = #{record.accountid,jdbcType=BIGINT}, AccountId = #{record.accountid,jdbcType=BIGINT},
InOutItemId = #{record.inoutitemid,jdbcType=BIGINT}, InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
EachAmount = #{record.eachamount,jdbcType=DOUBLE}, EachAmount = #{record.eachamount,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR} Remark = #{record.remark,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@@ -264,7 +264,7 @@
InOutItemId = #{inoutitemid,jdbcType=BIGINT}, InOutItemId = #{inoutitemid,jdbcType=BIGINT},
</if> </if>
<if test="eachamount != null"> <if test="eachamount != null">
EachAmount = #{eachamount,jdbcType=DOUBLE}, EachAmount = #{eachamount,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
@@ -281,7 +281,7 @@
set HeaderId = #{headerid,jdbcType=BIGINT}, set HeaderId = #{headerid,jdbcType=BIGINT},
AccountId = #{accountid,jdbcType=BIGINT}, AccountId = #{accountid,jdbcType=BIGINT},
InOutItemId = #{inoutitemid,jdbcType=BIGINT}, InOutItemId = #{inoutitemid,jdbcType=BIGINT},
EachAmount = #{eachamount,jdbcType=DOUBLE}, EachAmount = #{eachamount,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR} Remark = #{remark,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>

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

@@ -9,8 +9,8 @@
<id column="Id" jdbcType="BIGINT" property="id" /> <id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" /> <result column="Name" jdbcType="VARCHAR" property="name" />
<result column="SerialNo" jdbcType="VARCHAR" property="serialno" /> <result column="SerialNo" jdbcType="VARCHAR" property="serialno" />
<result column="InitialAmount" jdbcType="DOUBLE" property="initialamount" /> <result column="InitialAmount" jdbcType="DECIMAL" property="initialamount" />
<result column="CurrentAmount" jdbcType="DOUBLE" property="currentamount" /> <result column="CurrentAmount" jdbcType="DECIMAL" property="currentamount" />
<result column="Remark" jdbcType="VARCHAR" property="remark" /> <result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="IsDefault" jdbcType="BIT" property="isdefault" /> <result column="IsDefault" jdbcType="BIT" property="isdefault" />
</resultMap> </resultMap>
@@ -142,7 +142,7 @@
InitialAmount, CurrentAmount, Remark, InitialAmount, CurrentAmount, Remark,
IsDefault) IsDefault)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialno,jdbcType=VARCHAR}, 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}) #{isdefault,jdbcType=BIT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
@@ -185,10 +185,10 @@
#{serialno,jdbcType=VARCHAR}, #{serialno,jdbcType=VARCHAR},
</if> </if>
<if test="initialamount != null"> <if test="initialamount != null">
#{initialamount,jdbcType=DOUBLE}, #{initialamount,jdbcType=DECIMAL},
</if> </if>
<if test="currentamount != null"> <if test="currentamount != null">
#{currentamount,jdbcType=DOUBLE}, #{currentamount,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
@@ -225,10 +225,10 @@
SerialNo = #{record.serialno,jdbcType=VARCHAR}, SerialNo = #{record.serialno,jdbcType=VARCHAR},
</if> </if>
<if test="record.initialamount != null"> <if test="record.initialamount != null">
InitialAmount = #{record.initialamount,jdbcType=DOUBLE}, InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
</if> </if>
<if test="record.currentamount != null"> <if test="record.currentamount != null">
CurrentAmount = #{record.currentamount,jdbcType=DOUBLE}, CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
</if> </if>
<if test="record.remark != null"> <if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
@@ -250,8 +250,8 @@
set Id = #{record.id,jdbcType=BIGINT}, set Id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR}, Name = #{record.name,jdbcType=VARCHAR},
SerialNo = #{record.serialno,jdbcType=VARCHAR}, SerialNo = #{record.serialno,jdbcType=VARCHAR},
InitialAmount = #{record.initialamount,jdbcType=DOUBLE}, InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
CurrentAmount = #{record.currentamount,jdbcType=DOUBLE}, CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
IsDefault = #{record.isdefault,jdbcType=BIT} IsDefault = #{record.isdefault,jdbcType=BIT}
<if test="_parameter != null"> <if test="_parameter != null">
@@ -272,10 +272,10 @@
SerialNo = #{serialno,jdbcType=VARCHAR}, SerialNo = #{serialno,jdbcType=VARCHAR},
</if> </if>
<if test="initialamount != null"> <if test="initialamount != null">
InitialAmount = #{initialamount,jdbcType=DOUBLE}, InitialAmount = #{initialamount,jdbcType=DECIMAL},
</if> </if>
<if test="currentamount != null"> <if test="currentamount != null">
CurrentAmount = #{currentamount,jdbcType=DOUBLE}, CurrentAmount = #{currentamount,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
@@ -294,8 +294,8 @@
update jsh_account update jsh_account
set Name = #{name,jdbcType=VARCHAR}, set Name = #{name,jdbcType=VARCHAR},
SerialNo = #{serialno,jdbcType=VARCHAR}, SerialNo = #{serialno,jdbcType=VARCHAR},
InitialAmount = #{initialamount,jdbcType=DOUBLE}, InitialAmount = #{initialamount,jdbcType=DECIMAL},
CurrentAmount = #{currentamount,jdbcType=DOUBLE}, CurrentAmount = #{currentamount,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
IsDefault = #{isdefault,jdbcType=BIT} IsDefault = #{isdefault,jdbcType=BIT}
where Id = #{id,jdbcType=BIGINT} 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="Number" jdbcType="VARCHAR" property="number" />
<result column="newType" jdbcType="VARCHAR" property="type" /> <result column="newType" jdbcType="VARCHAR" property="type" />
<result column="supplier" jdbcType="VARCHAR" property="supplierName" /> <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="oTime" jdbcType="VARCHAR" property="operTime" />
<result column="AList" jdbcType="VARCHAR" property="aList" /> <result column="AList" jdbcType="VARCHAR" property="aList" />
<result column="AMList" jdbcType="VARCHAR" property="amList" /> <result column="AMList" jdbcType="VARCHAR" property="amList" />

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

@@ -12,7 +12,7 @@
<result column="labels" jdbcType="VARCHAR" property="labels" /> <result column="labels" jdbcType="VARCHAR" property="labels" />
<result column="status" jdbcType="SMALLINT" property="status" /> <result column="status" jdbcType="SMALLINT" property="status" />
<result column="userID" jdbcType="BIGINT" property="userid" /> <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="purchasedate" jdbcType="TIMESTAMP" property="purchasedate" />
<result column="periodofvalidity" jdbcType="TIMESTAMP" property="periodofvalidity" /> <result column="periodofvalidity" jdbcType="TIMESTAMP" property="periodofvalidity" />
<result column="warrantydate" jdbcType="TIMESTAMP" property="warrantydate" /> <result column="warrantydate" jdbcType="TIMESTAMP" property="warrantydate" />
@@ -195,7 +195,7 @@
addMonth) addMonth)
values (#{id,jdbcType=BIGINT}, #{assetnameid,jdbcType=BIGINT}, #{location,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{assetnameid,jdbcType=BIGINT}, #{location,jdbcType=VARCHAR},
#{labels,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, #{userid,jdbcType=BIGINT}, #{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}, #{warrantydate,jdbcType=TIMESTAMP}, #{assetnum,jdbcType=VARCHAR}, #{serialnum,jdbcType=VARCHAR},
#{supplier,jdbcType=BIGINT}, #{createtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{supplier,jdbcType=BIGINT}, #{createtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT},
#{updatetime,jdbcType=TIMESTAMP}, #{updator,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{updator,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR},
@@ -286,7 +286,7 @@
#{userid,jdbcType=BIGINT}, #{userid,jdbcType=BIGINT},
</if> </if>
<if test="price != null"> <if test="price != null">
#{price,jdbcType=DOUBLE}, #{price,jdbcType=DECIMAL},
</if> </if>
<if test="purchasedate != null"> <if test="purchasedate != null">
#{purchasedate,jdbcType=TIMESTAMP}, #{purchasedate,jdbcType=TIMESTAMP},
@@ -362,7 +362,7 @@
userID = #{record.userid,jdbcType=BIGINT}, userID = #{record.userid,jdbcType=BIGINT},
</if> </if>
<if test="record.price != null"> <if test="record.price != null">
price = #{record.price,jdbcType=DOUBLE}, price = #{record.price,jdbcType=DECIMAL},
</if> </if>
<if test="record.purchasedate != null"> <if test="record.purchasedate != null">
purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP}, purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
@@ -417,7 +417,7 @@
labels = #{record.labels,jdbcType=VARCHAR}, labels = #{record.labels,jdbcType=VARCHAR},
status = #{record.status,jdbcType=SMALLINT}, status = #{record.status,jdbcType=SMALLINT},
userID = #{record.userid,jdbcType=BIGINT}, userID = #{record.userid,jdbcType=BIGINT},
price = #{record.price,jdbcType=DOUBLE}, price = #{record.price,jdbcType=DECIMAL},
purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP}, purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP}, periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP}, warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP},
@@ -446,7 +446,7 @@
labels = #{record.labels,jdbcType=VARCHAR}, labels = #{record.labels,jdbcType=VARCHAR},
status = #{record.status,jdbcType=SMALLINT}, status = #{record.status,jdbcType=SMALLINT},
userID = #{record.userid,jdbcType=BIGINT}, userID = #{record.userid,jdbcType=BIGINT},
price = #{record.price,jdbcType=DOUBLE}, price = #{record.price,jdbcType=DECIMAL},
purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP}, purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP}, periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP}, warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP},
@@ -484,7 +484,7 @@
userID = #{userid,jdbcType=BIGINT}, userID = #{userid,jdbcType=BIGINT},
</if> </if>
<if test="price != null"> <if test="price != null">
price = #{price,jdbcType=DOUBLE}, price = #{price,jdbcType=DECIMAL},
</if> </if>
<if test="purchasedate != null"> <if test="purchasedate != null">
purchasedate = #{purchasedate,jdbcType=TIMESTAMP}, purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
@@ -536,7 +536,7 @@
labels = #{labels,jdbcType=VARCHAR}, labels = #{labels,jdbcType=VARCHAR},
status = #{status,jdbcType=SMALLINT}, status = #{status,jdbcType=SMALLINT},
userID = #{userid,jdbcType=BIGINT}, userID = #{userid,jdbcType=BIGINT},
price = #{price,jdbcType=DOUBLE}, price = #{price,jdbcType=DECIMAL},
purchasedate = #{purchasedate,jdbcType=TIMESTAMP}, purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP}, periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{warrantydate,jdbcType=TIMESTAMP}, warrantydate = #{warrantydate,jdbcType=TIMESTAMP},
@@ -562,7 +562,7 @@
labels = #{labels,jdbcType=VARCHAR}, labels = #{labels,jdbcType=VARCHAR},
status = #{status,jdbcType=SMALLINT}, status = #{status,jdbcType=SMALLINT},
userID = #{userid,jdbcType=BIGINT}, userID = #{userid,jdbcType=BIGINT},
price = #{price,jdbcType=DOUBLE}, price = #{price,jdbcType=DECIMAL},
purchasedate = #{purchasedate,jdbcType=TIMESTAMP}, purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP}, periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP},
warrantydate = #{warrantydate,jdbcType=TIMESTAMP}, warrantydate = #{warrantydate,jdbcType=TIMESTAMP},

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

@@ -18,18 +18,18 @@
<result column="OrganId" jdbcType="BIGINT" property="organid" /> <result column="OrganId" jdbcType="BIGINT" property="organid" />
<result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" /> <result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
<result column="AccountId" jdbcType="BIGINT" property="accountid" /> <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="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="PayType" jdbcType="VARCHAR" property="paytype" />
<result column="Remark" jdbcType="VARCHAR" property="remark" /> <result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="Salesman" jdbcType="VARCHAR" property="salesman" /> <result column="Salesman" jdbcType="VARCHAR" property="salesman" />
<result column="AccountIdList" jdbcType="VARCHAR" property="accountidlist" /> <result column="AccountIdList" jdbcType="VARCHAR" property="accountidlist" />
<result column="AccountMoneyList" jdbcType="VARCHAR" property="accountmoneylist" /> <result column="AccountMoneyList" jdbcType="VARCHAR" property="accountmoneylist" />
<result column="Discount" jdbcType="DOUBLE" property="discount" /> <result column="Discount" jdbcType="DECIMAL" property="discount" />
<result column="DiscountMoney" jdbcType="DOUBLE" property="discountmoney" /> <result column="DiscountMoney" jdbcType="DECIMAL" property="discountmoney" />
<result column="DiscountLastMoney" jdbcType="DOUBLE" property="discountlastmoney" /> <result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountlastmoney" />
<result column="OtherMoney" jdbcType="DOUBLE" property="othermoney" /> <result column="OtherMoney" jdbcType="DECIMAL" property="othermoney" />
<result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" /> <result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
<result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" /> <result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
<result column="AccountDay" jdbcType="INTEGER" property="accountday" /> <result column="AccountDay" jdbcType="INTEGER" property="accountday" />
@@ -176,10 +176,10 @@
#{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
#{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
#{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, #{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}, #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR},
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DOUBLE}, #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountmoney,jdbcType=DOUBLE}, #{discountlastmoney,jdbcType=DOUBLE}, #{othermoney,jdbcType=DOUBLE}, #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
#{status,jdbcType=BIT}) #{status,jdbcType=BIT})
</insert> </insert>
@@ -313,13 +313,13 @@
#{accountid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT},
</if> </if>
<if test="changeamount != null"> <if test="changeamount != null">
#{changeamount,jdbcType=DOUBLE}, #{changeamount,jdbcType=DECIMAL},
</if> </if>
<if test="allocationprojectid != null"> <if test="allocationprojectid != null">
#{allocationprojectid,jdbcType=BIGINT}, #{allocationprojectid,jdbcType=BIGINT},
</if> </if>
<if test="totalprice != null"> <if test="totalprice != null">
#{totalprice,jdbcType=DOUBLE}, #{totalprice,jdbcType=DECIMAL},
</if> </if>
<if test="paytype != null"> <if test="paytype != null">
#{paytype,jdbcType=VARCHAR}, #{paytype,jdbcType=VARCHAR},
@@ -337,16 +337,16 @@
#{accountmoneylist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR},
</if> </if>
<if test="discount != null"> <if test="discount != null">
#{discount,jdbcType=DOUBLE}, #{discount,jdbcType=DECIMAL},
</if> </if>
<if test="discountmoney != null"> <if test="discountmoney != null">
#{discountmoney,jdbcType=DOUBLE}, #{discountmoney,jdbcType=DECIMAL},
</if> </if>
<if test="discountlastmoney != null"> <if test="discountlastmoney != null">
#{discountlastmoney,jdbcType=DOUBLE}, #{discountlastmoney,jdbcType=DECIMAL},
</if> </if>
<if test="othermoney != null"> <if test="othermoney != null">
#{othermoney,jdbcType=DOUBLE}, #{othermoney,jdbcType=DECIMAL},
</if> </if>
<if test="othermoneylist != null"> <if test="othermoneylist != null">
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneylist,jdbcType=VARCHAR},
@@ -416,13 +416,13 @@
AccountId = #{record.accountid,jdbcType=BIGINT}, AccountId = #{record.accountid,jdbcType=BIGINT},
</if> </if>
<if test="record.changeamount != null"> <if test="record.changeamount != null">
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE}, ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
</if> </if>
<if test="record.allocationprojectid != null"> <if test="record.allocationprojectid != null">
AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT}, AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
</if> </if>
<if test="record.totalprice != null"> <if test="record.totalprice != null">
TotalPrice = #{record.totalprice,jdbcType=DOUBLE}, TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
</if> </if>
<if test="record.paytype != null"> <if test="record.paytype != null">
PayType = #{record.paytype,jdbcType=VARCHAR}, PayType = #{record.paytype,jdbcType=VARCHAR},
@@ -440,16 +440,16 @@
AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR}, AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
</if> </if>
<if test="record.discount != null"> <if test="record.discount != null">
Discount = #{record.discount,jdbcType=DOUBLE}, Discount = #{record.discount,jdbcType=DECIMAL},
</if> </if>
<if test="record.discountmoney != null"> <if test="record.discountmoney != null">
DiscountMoney = #{record.discountmoney,jdbcType=DOUBLE}, DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
</if> </if>
<if test="record.discountlastmoney != null"> <if test="record.discountlastmoney != null">
DiscountLastMoney = #{record.discountlastmoney,jdbcType=DOUBLE}, DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
</if> </if>
<if test="record.othermoney != null"> <if test="record.othermoney != null">
OtherMoney = #{record.othermoney,jdbcType=DOUBLE}, OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
</if> </if>
<if test="record.othermoneylist != null"> <if test="record.othermoneylist != null">
OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR}, OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
@@ -486,18 +486,18 @@
OrganId = #{record.organid,jdbcType=BIGINT}, OrganId = #{record.organid,jdbcType=BIGINT},
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT}, HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
AccountId = #{record.accountid,jdbcType=BIGINT}, AccountId = #{record.accountid,jdbcType=BIGINT},
ChangeAmount = #{record.changeamount,jdbcType=DOUBLE}, ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT}, AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
TotalPrice = #{record.totalprice,jdbcType=DOUBLE}, TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
PayType = #{record.paytype,jdbcType=VARCHAR}, PayType = #{record.paytype,jdbcType=VARCHAR},
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
Salesman = #{record.salesman,jdbcType=VARCHAR}, Salesman = #{record.salesman,jdbcType=VARCHAR},
AccountIdList = #{record.accountidlist,jdbcType=VARCHAR}, AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR}, AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
Discount = #{record.discount,jdbcType=DOUBLE}, Discount = #{record.discount,jdbcType=DECIMAL},
DiscountMoney = #{record.discountmoney,jdbcType=DOUBLE}, DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
DiscountLastMoney = #{record.discountlastmoney,jdbcType=DOUBLE}, DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
OtherMoney = #{record.othermoney,jdbcType=DOUBLE}, OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR}, OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR}, OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
AccountDay = #{record.accountday,jdbcType=INTEGER}, AccountDay = #{record.accountday,jdbcType=INTEGER},
@@ -547,13 +547,13 @@
AccountId = #{accountid,jdbcType=BIGINT}, AccountId = #{accountid,jdbcType=BIGINT},
</if> </if>
<if test="changeamount != null"> <if test="changeamount != null">
ChangeAmount = #{changeamount,jdbcType=DOUBLE}, ChangeAmount = #{changeamount,jdbcType=DECIMAL},
</if> </if>
<if test="allocationprojectid != null"> <if test="allocationprojectid != null">
AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT}, AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
</if> </if>
<if test="totalprice != null"> <if test="totalprice != null">
TotalPrice = #{totalprice,jdbcType=DOUBLE}, TotalPrice = #{totalprice,jdbcType=DECIMAL},
</if> </if>
<if test="paytype != null"> <if test="paytype != null">
PayType = #{paytype,jdbcType=VARCHAR}, PayType = #{paytype,jdbcType=VARCHAR},
@@ -571,16 +571,16 @@
AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR}, AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
</if> </if>
<if test="discount != null"> <if test="discount != null">
Discount = #{discount,jdbcType=DOUBLE}, Discount = #{discount,jdbcType=DECIMAL},
</if> </if>
<if test="discountmoney != null"> <if test="discountmoney != null">
DiscountMoney = #{discountmoney,jdbcType=DOUBLE}, DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
</if> </if>
<if test="discountlastmoney != null"> <if test="discountlastmoney != null">
DiscountLastMoney = #{discountlastmoney,jdbcType=DOUBLE}, DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
</if> </if>
<if test="othermoney != null"> <if test="othermoney != null">
OtherMoney = #{othermoney,jdbcType=DOUBLE}, OtherMoney = #{othermoney,jdbcType=DECIMAL},
</if> </if>
<if test="othermoneylist != null"> <if test="othermoneylist != null">
OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR}, OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
@@ -614,18 +614,18 @@
OrganId = #{organid,jdbcType=BIGINT}, OrganId = #{organid,jdbcType=BIGINT},
HandsPersonId = #{handspersonid,jdbcType=BIGINT}, HandsPersonId = #{handspersonid,jdbcType=BIGINT},
AccountId = #{accountid,jdbcType=BIGINT}, AccountId = #{accountid,jdbcType=BIGINT},
ChangeAmount = #{changeamount,jdbcType=DOUBLE}, ChangeAmount = #{changeamount,jdbcType=DECIMAL},
AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT}, AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
TotalPrice = #{totalprice,jdbcType=DOUBLE}, TotalPrice = #{totalprice,jdbcType=DECIMAL},
PayType = #{paytype,jdbcType=VARCHAR}, PayType = #{paytype,jdbcType=VARCHAR},
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
Salesman = #{salesman,jdbcType=VARCHAR}, Salesman = #{salesman,jdbcType=VARCHAR},
AccountIdList = #{accountidlist,jdbcType=VARCHAR}, AccountIdList = #{accountidlist,jdbcType=VARCHAR},
AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR}, AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
Discount = #{discount,jdbcType=DOUBLE}, Discount = #{discount,jdbcType=DECIMAL},
DiscountMoney = #{discountmoney,jdbcType=DOUBLE}, DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
DiscountLastMoney = #{discountlastmoney,jdbcType=DOUBLE}, DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
OtherMoney = #{othermoney,jdbcType=DOUBLE}, OtherMoney = #{othermoney,jdbcType=DECIMAL},
OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR}, OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR}, OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
AccountDay = #{accountday,jdbcType=INTEGER}, 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="Number" jdbcType="VARCHAR" property="Number" />
<result column="MName" jdbcType="VARCHAR" property="MName" /> <result column="MName" jdbcType="VARCHAR" property="MName" />
<result column="Model" jdbcType="VARCHAR" property="Model" /> <result column="Model" jdbcType="VARCHAR" property="Model" />
<result column="UnitPrice" jdbcType="DOUBLE" property="UnitPrice" /> <result column="UnitPrice" jdbcType="DECIMAL" property="UnitPrice" />
<result column="OperNumber" jdbcType="DOUBLE" property="OperNumber" /> <result column="OperNumber" jdbcType="DECIMAL" property="OperNumber" />
<result column="AllPrice" jdbcType="DOUBLE" property="AllPrice" /> <result column="AllPrice" jdbcType="DECIMAL" property="AllPrice" />
<result column="SName" jdbcType="VARCHAR" property="SName" /> <result column="SName" jdbcType="VARCHAR" property="SName" />
<result column="DName" jdbcType="VARCHAR" property="DName" /> <result column="DName" jdbcType="VARCHAR" property="DName" />
<result column="OperTime" jdbcType="VARCHAR" property="OperTime" /> <result column="OperTime" jdbcType="VARCHAR" property="OperTime" />
@@ -28,15 +28,15 @@
<result column="mName" jdbcType="VARCHAR" property="mName" /> <result column="mName" jdbcType="VARCHAR" property="mName" />
<result column="Model" jdbcType="VARCHAR" property="Model" /> <result column="Model" jdbcType="VARCHAR" property="Model" />
<result column="categoryName" jdbcType="VARCHAR" property="categoryName" /> <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
<result column="numSum" jdbcType="DOUBLE" property="numSum" /> <result column="numSum" jdbcType="DECIMAL" property="numSum" />
<result column="priceSum" jdbcType="DOUBLE" property="priceSum" /> <result column="priceSum" jdbcType="DECIMAL" property="priceSum" />
</resultMap> </resultMap>
<resultMap id="ResultStatementAccount" type="com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount"> <resultMap id="ResultStatementAccount" type="com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount">
<result column="Number" jdbcType="VARCHAR" property="number" /> <result column="Number" jdbcType="VARCHAR" property="number" />
<result column="type" jdbcType="VARCHAR" property="type" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="DiscountLastMoney" jdbcType="DOUBLE" property="discountLastMoney" /> <result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountLastMoney" />
<result column="ChangeAmount" jdbcType="DOUBLE" property="changeAmount" /> <result column="ChangeAmount" jdbcType="DECIMAL" property="changeAmount" />
<result column="supplierName" jdbcType="VARCHAR" property="supplierName" /> <result column="supplierName" jdbcType="VARCHAR" property="supplierName" />
<result column="oTime" jdbcType="VARCHAR" property="oTime" /> <result column="oTime" jdbcType="VARCHAR" property="oTime" />
</resultMap> </resultMap>
@@ -262,7 +262,7 @@
) cc ) cc
</select> </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}' select sum(${modeName}) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
and OrganId =${supplierId} and OperTime &lt;='${endTime}' and OrganId =${supplierId} and OperTime &lt;='${endTime}'
</select> </select>

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

@@ -10,19 +10,19 @@
<result column="HeaderId" jdbcType="BIGINT" property="headerid" /> <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
<result column="MaterialId" jdbcType="BIGINT" property="materialid" /> <result column="MaterialId" jdbcType="BIGINT" property="materialid" />
<result column="MUnit" jdbcType="VARCHAR" property="munit" /> <result column="MUnit" jdbcType="VARCHAR" property="munit" />
<result column="OperNumber" jdbcType="DOUBLE" property="opernumber" /> <result column="OperNumber" jdbcType="DECIMAL" property="opernumber" />
<result column="BasicNumber" jdbcType="DOUBLE" property="basicnumber" /> <result column="BasicNumber" jdbcType="DECIMAL" property="basicnumber" />
<result column="UnitPrice" jdbcType="DOUBLE" property="unitprice" /> <result column="UnitPrice" jdbcType="DECIMAL" property="unitprice" />
<result column="TaxUnitPrice" jdbcType="DOUBLE" property="taxunitprice" /> <result column="TaxUnitPrice" jdbcType="DECIMAL" property="taxunitprice" />
<result column="AllPrice" jdbcType="DOUBLE" property="allprice" /> <result column="AllPrice" jdbcType="DECIMAL" property="allprice" />
<result column="Remark" jdbcType="VARCHAR" property="remark" /> <result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="Img" jdbcType="VARCHAR" property="img" /> <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="DepotId" jdbcType="BIGINT" property="depotid" />
<result column="AnotherDepotId" jdbcType="BIGINT" property="anotherdepotid" /> <result column="AnotherDepotId" jdbcType="BIGINT" property="anotherdepotid" />
<result column="TaxRate" jdbcType="DOUBLE" property="taxrate" /> <result column="TaxRate" jdbcType="DECIMAL" property="taxrate" />
<result column="TaxMoney" jdbcType="DOUBLE" property="taxmoney" /> <result column="TaxMoney" jdbcType="DECIMAL" property="taxmoney" />
<result column="TaxLastMoney" jdbcType="DOUBLE" property="taxlastmoney" /> <result column="TaxLastMoney" jdbcType="DECIMAL" property="taxlastmoney" />
<result column="OtherField1" jdbcType="VARCHAR" property="otherfield1" /> <result column="OtherField1" jdbcType="VARCHAR" property="otherfield1" />
<result column="OtherField2" jdbcType="VARCHAR" property="otherfield2" /> <result column="OtherField2" jdbcType="VARCHAR" property="otherfield2" />
<result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" /> <result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" />
@@ -165,11 +165,11 @@
OtherField2, OtherField3, OtherField4, OtherField2, OtherField3, OtherField4,
OtherField5, MType) OtherField5, MType)
values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT}, values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT},
#{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DOUBLE}, #{basicnumber,jdbcType=DOUBLE}, #{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DECIMAL}, #{basicnumber,jdbcType=DECIMAL},
#{unitprice,jdbcType=DOUBLE}, #{taxunitprice,jdbcType=DOUBLE}, #{allprice,jdbcType=DOUBLE}, #{unitprice,jdbcType=DECIMAL}, #{taxunitprice,jdbcType=DECIMAL}, #{allprice,jdbcType=DECIMAL},
#{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{incidentals,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{incidentals,jdbcType=DECIMAL},
#{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DOUBLE}, #{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DECIMAL},
#{taxmoney,jdbcType=DOUBLE}, #{taxlastmoney,jdbcType=DOUBLE}, #{otherfield1,jdbcType=VARCHAR}, #{taxmoney,jdbcType=DECIMAL}, #{taxlastmoney,jdbcType=DECIMAL}, #{otherfield1,jdbcType=VARCHAR},
#{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{otherfield4,jdbcType=VARCHAR}, #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{otherfield4,jdbcType=VARCHAR},
#{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR}) #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR})
</insert> </insert>
@@ -264,19 +264,19 @@
#{munit,jdbcType=VARCHAR}, #{munit,jdbcType=VARCHAR},
</if> </if>
<if test="opernumber != null"> <if test="opernumber != null">
#{opernumber,jdbcType=DOUBLE}, #{opernumber,jdbcType=DECIMAL},
</if> </if>
<if test="basicnumber != null"> <if test="basicnumber != null">
#{basicnumber,jdbcType=DOUBLE}, #{basicnumber,jdbcType=DECIMAL},
</if> </if>
<if test="unitprice != null"> <if test="unitprice != null">
#{unitprice,jdbcType=DOUBLE}, #{unitprice,jdbcType=DECIMAL},
</if> </if>
<if test="taxunitprice != null"> <if test="taxunitprice != null">
#{taxunitprice,jdbcType=DOUBLE}, #{taxunitprice,jdbcType=DECIMAL},
</if> </if>
<if test="allprice != null"> <if test="allprice != null">
#{allprice,jdbcType=DOUBLE}, #{allprice,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
@@ -285,7 +285,7 @@
#{img,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR},
</if> </if>
<if test="incidentals != null"> <if test="incidentals != null">
#{incidentals,jdbcType=DOUBLE}, #{incidentals,jdbcType=DECIMAL},
</if> </if>
<if test="depotid != null"> <if test="depotid != null">
#{depotid,jdbcType=BIGINT}, #{depotid,jdbcType=BIGINT},
@@ -294,13 +294,13 @@
#{anotherdepotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT},
</if> </if>
<if test="taxrate != null"> <if test="taxrate != null">
#{taxrate,jdbcType=DOUBLE}, #{taxrate,jdbcType=DECIMAL},
</if> </if>
<if test="taxmoney != null"> <if test="taxmoney != null">
#{taxmoney,jdbcType=DOUBLE}, #{taxmoney,jdbcType=DECIMAL},
</if> </if>
<if test="taxlastmoney != null"> <if test="taxlastmoney != null">
#{taxlastmoney,jdbcType=DOUBLE}, #{taxlastmoney,jdbcType=DECIMAL},
</if> </if>
<if test="otherfield1 != null"> <if test="otherfield1 != null">
#{otherfield1,jdbcType=VARCHAR}, #{otherfield1,jdbcType=VARCHAR},
@@ -352,19 +352,19 @@
MUnit = #{record.munit,jdbcType=VARCHAR}, MUnit = #{record.munit,jdbcType=VARCHAR},
</if> </if>
<if test="record.opernumber != null"> <if test="record.opernumber != null">
OperNumber = #{record.opernumber,jdbcType=DOUBLE}, OperNumber = #{record.opernumber,jdbcType=DECIMAL},
</if> </if>
<if test="record.basicnumber != null"> <if test="record.basicnumber != null">
BasicNumber = #{record.basicnumber,jdbcType=DOUBLE}, BasicNumber = #{record.basicnumber,jdbcType=DECIMAL},
</if> </if>
<if test="record.unitprice != null"> <if test="record.unitprice != null">
UnitPrice = #{record.unitprice,jdbcType=DOUBLE}, UnitPrice = #{record.unitprice,jdbcType=DECIMAL},
</if> </if>
<if test="record.taxunitprice != null"> <if test="record.taxunitprice != null">
TaxUnitPrice = #{record.taxunitprice,jdbcType=DOUBLE}, TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL},
</if> </if>
<if test="record.allprice != null"> <if test="record.allprice != null">
AllPrice = #{record.allprice,jdbcType=DOUBLE}, AllPrice = #{record.allprice,jdbcType=DECIMAL},
</if> </if>
<if test="record.remark != null"> <if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
@@ -373,7 +373,7 @@
Img = #{record.img,jdbcType=VARCHAR}, Img = #{record.img,jdbcType=VARCHAR},
</if> </if>
<if test="record.incidentals != null"> <if test="record.incidentals != null">
Incidentals = #{record.incidentals,jdbcType=DOUBLE}, Incidentals = #{record.incidentals,jdbcType=DECIMAL},
</if> </if>
<if test="record.depotid != null"> <if test="record.depotid != null">
DepotId = #{record.depotid,jdbcType=BIGINT}, DepotId = #{record.depotid,jdbcType=BIGINT},
@@ -382,13 +382,13 @@
AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT}, AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT},
</if> </if>
<if test="record.taxrate != null"> <if test="record.taxrate != null">
TaxRate = #{record.taxrate,jdbcType=DOUBLE}, TaxRate = #{record.taxrate,jdbcType=DECIMAL},
</if> </if>
<if test="record.taxmoney != null"> <if test="record.taxmoney != null">
TaxMoney = #{record.taxmoney,jdbcType=DOUBLE}, TaxMoney = #{record.taxmoney,jdbcType=DECIMAL},
</if> </if>
<if test="record.taxlastmoney != null"> <if test="record.taxlastmoney != null">
TaxLastMoney = #{record.taxlastmoney,jdbcType=DOUBLE}, TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL},
</if> </if>
<if test="record.otherfield1 != null"> <if test="record.otherfield1 != null">
OtherField1 = #{record.otherfield1,jdbcType=VARCHAR}, OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
@@ -423,19 +423,19 @@
HeaderId = #{record.headerid,jdbcType=BIGINT}, HeaderId = #{record.headerid,jdbcType=BIGINT},
MaterialId = #{record.materialid,jdbcType=BIGINT}, MaterialId = #{record.materialid,jdbcType=BIGINT},
MUnit = #{record.munit,jdbcType=VARCHAR}, MUnit = #{record.munit,jdbcType=VARCHAR},
OperNumber = #{record.opernumber,jdbcType=DOUBLE}, OperNumber = #{record.opernumber,jdbcType=DECIMAL},
BasicNumber = #{record.basicnumber,jdbcType=DOUBLE}, BasicNumber = #{record.basicnumber,jdbcType=DECIMAL},
UnitPrice = #{record.unitprice,jdbcType=DOUBLE}, UnitPrice = #{record.unitprice,jdbcType=DECIMAL},
TaxUnitPrice = #{record.taxunitprice,jdbcType=DOUBLE}, TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL},
AllPrice = #{record.allprice,jdbcType=DOUBLE}, AllPrice = #{record.allprice,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
Img = #{record.img,jdbcType=VARCHAR}, Img = #{record.img,jdbcType=VARCHAR},
Incidentals = #{record.incidentals,jdbcType=DOUBLE}, Incidentals = #{record.incidentals,jdbcType=DECIMAL},
DepotId = #{record.depotid,jdbcType=BIGINT}, DepotId = #{record.depotid,jdbcType=BIGINT},
AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT}, AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT},
TaxRate = #{record.taxrate,jdbcType=DOUBLE}, TaxRate = #{record.taxrate,jdbcType=DECIMAL},
TaxMoney = #{record.taxmoney,jdbcType=DOUBLE}, TaxMoney = #{record.taxmoney,jdbcType=DECIMAL},
TaxLastMoney = #{record.taxlastmoney,jdbcType=DOUBLE}, TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL},
OtherField1 = #{record.otherfield1,jdbcType=VARCHAR}, OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
OtherField2 = #{record.otherfield2,jdbcType=VARCHAR}, OtherField2 = #{record.otherfield2,jdbcType=VARCHAR},
OtherField3 = #{record.otherfield3,jdbcType=VARCHAR}, OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
@@ -463,19 +463,19 @@
MUnit = #{munit,jdbcType=VARCHAR}, MUnit = #{munit,jdbcType=VARCHAR},
</if> </if>
<if test="opernumber != null"> <if test="opernumber != null">
OperNumber = #{opernumber,jdbcType=DOUBLE}, OperNumber = #{opernumber,jdbcType=DECIMAL},
</if> </if>
<if test="basicnumber != null"> <if test="basicnumber != null">
BasicNumber = #{basicnumber,jdbcType=DOUBLE}, BasicNumber = #{basicnumber,jdbcType=DECIMAL},
</if> </if>
<if test="unitprice != null"> <if test="unitprice != null">
UnitPrice = #{unitprice,jdbcType=DOUBLE}, UnitPrice = #{unitprice,jdbcType=DECIMAL},
</if> </if>
<if test="taxunitprice != null"> <if test="taxunitprice != null">
TaxUnitPrice = #{taxunitprice,jdbcType=DOUBLE}, TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL},
</if> </if>
<if test="allprice != null"> <if test="allprice != null">
AllPrice = #{allprice,jdbcType=DOUBLE}, AllPrice = #{allprice,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
@@ -484,7 +484,7 @@
Img = #{img,jdbcType=VARCHAR}, Img = #{img,jdbcType=VARCHAR},
</if> </if>
<if test="incidentals != null"> <if test="incidentals != null">
Incidentals = #{incidentals,jdbcType=DOUBLE}, Incidentals = #{incidentals,jdbcType=DECIMAL},
</if> </if>
<if test="depotid != null"> <if test="depotid != null">
DepotId = #{depotid,jdbcType=BIGINT}, DepotId = #{depotid,jdbcType=BIGINT},
@@ -493,13 +493,13 @@
AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT}, AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT},
</if> </if>
<if test="taxrate != null"> <if test="taxrate != null">
TaxRate = #{taxrate,jdbcType=DOUBLE}, TaxRate = #{taxrate,jdbcType=DECIMAL},
</if> </if>
<if test="taxmoney != null"> <if test="taxmoney != null">
TaxMoney = #{taxmoney,jdbcType=DOUBLE}, TaxMoney = #{taxmoney,jdbcType=DECIMAL},
</if> </if>
<if test="taxlastmoney != null"> <if test="taxlastmoney != null">
TaxLastMoney = #{taxlastmoney,jdbcType=DOUBLE}, TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL},
</if> </if>
<if test="otherfield1 != null"> <if test="otherfield1 != null">
OtherField1 = #{otherfield1,jdbcType=VARCHAR}, OtherField1 = #{otherfield1,jdbcType=VARCHAR},
@@ -531,19 +531,19 @@
set HeaderId = #{headerid,jdbcType=BIGINT}, set HeaderId = #{headerid,jdbcType=BIGINT},
MaterialId = #{materialid,jdbcType=BIGINT}, MaterialId = #{materialid,jdbcType=BIGINT},
MUnit = #{munit,jdbcType=VARCHAR}, MUnit = #{munit,jdbcType=VARCHAR},
OperNumber = #{opernumber,jdbcType=DOUBLE}, OperNumber = #{opernumber,jdbcType=DECIMAL},
BasicNumber = #{basicnumber,jdbcType=DOUBLE}, BasicNumber = #{basicnumber,jdbcType=DECIMAL},
UnitPrice = #{unitprice,jdbcType=DOUBLE}, UnitPrice = #{unitprice,jdbcType=DECIMAL},
TaxUnitPrice = #{taxunitprice,jdbcType=DOUBLE}, TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL},
AllPrice = #{allprice,jdbcType=DOUBLE}, AllPrice = #{allprice,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
Img = #{img,jdbcType=VARCHAR}, Img = #{img,jdbcType=VARCHAR},
Incidentals = #{incidentals,jdbcType=DOUBLE}, Incidentals = #{incidentals,jdbcType=DECIMAL},
DepotId = #{depotid,jdbcType=BIGINT}, DepotId = #{depotid,jdbcType=BIGINT},
AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT}, AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT},
TaxRate = #{taxrate,jdbcType=DOUBLE}, TaxRate = #{taxrate,jdbcType=DECIMAL},
TaxMoney = #{taxmoney,jdbcType=DOUBLE}, TaxMoney = #{taxmoney,jdbcType=DECIMAL},
TaxLastMoney = #{taxlastmoney,jdbcType=DOUBLE}, TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL},
OtherField1 = #{otherfield1,jdbcType=VARCHAR}, OtherField1 = #{otherfield1,jdbcType=VARCHAR},
OtherField2 = #{otherfield2,jdbcType=VARCHAR}, OtherField2 = #{otherfield2,jdbcType=VARCHAR},
OtherField3 = #{otherfield3,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 group by m.id) cc
</select> </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 select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId}) ((type='入库' and DepotId=${ProjectId})
@@ -180,7 +180,7 @@
and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00' and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
</select> </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 select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId}) ((type='入库' and DepotId=${ProjectId})
@@ -192,14 +192,14 @@
and dh.OperTime &lt;= '${MonthTime}-31 23:59:59' and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select> </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='出库' select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId} and DepotId= ${ProjectId}
and MaterialId = ${MId} and MaterialId = ${MId}
and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00' and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00'
</select> </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='出库' select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId} and DepotId= ${ProjectId}
and MaterialId = ${MId} and MaterialId = ${MId}
@@ -208,7 +208,7 @@
</select> </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 select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId}) ((type='入库' and DepotId=${ProjectId})
@@ -219,7 +219,7 @@
and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00' and MaterialId = ${MId} and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
</select> </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 select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh
where di.HeaderId = dh.id and where di.HeaderId = dh.id and
((type='入库' and DepotId=${ProjectId}) ((type='入库' and DepotId=${ProjectId})
@@ -231,14 +231,14 @@
and dh.OperTime &lt;= '${MonthTime}-31 23:59:59' and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select> </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='出库' select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId} and DepotId= ${ProjectId}
and MaterialId = ${MId} and MaterialId = ${MId}
and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00' and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00'
</select> </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='出库' select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
and DepotId= ${ProjectId} and DepotId= ${ProjectId}
and MaterialId = ${MId} and MaterialId = ${MId}
@@ -246,28 +246,28 @@
and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59' and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select> </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 select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}' 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 MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59' and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select> </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 select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}' 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 MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59' and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
</select> </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 select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}' where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}'
and jsh_depotitem.AnotherDepotId=${ProjectId} and jsh_depotitem.AnotherDepotId=${ProjectId}
and jsh_depotitem.MaterialId =${MId} and jsh_depotitem.MaterialId =${MId}
</select> </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 select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}' where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}'
and jsh_depotitem.DepotId=${ProjectId} and jsh_depotitem.DepotId=${ProjectId}

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

@@ -9,8 +9,8 @@
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="address" jdbcType="VARCHAR" property="address" /> <result column="address" jdbcType="VARCHAR" property="address" />
<result column="warehousing" jdbcType="DOUBLE" property="warehousing" /> <result column="warehousing" jdbcType="DECIMAL" property="warehousing" />
<result column="truckage" jdbcType="DOUBLE" property="truckage" /> <result column="truckage" jdbcType="DECIMAL" property="truckage" />
<result column="type" jdbcType="INTEGER" property="type" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="sort" jdbcType="VARCHAR" property="sort" /> <result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
@@ -143,7 +143,7 @@
warehousing, truckage, type, warehousing, truckage, type,
sort, remark) sort, remark)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 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}) #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
@@ -189,10 +189,10 @@
#{address,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
</if> </if>
<if test="warehousing != null"> <if test="warehousing != null">
#{warehousing,jdbcType=DOUBLE}, #{warehousing,jdbcType=DECIMAL},
</if> </if>
<if test="truckage != null"> <if test="truckage != null">
#{truckage,jdbcType=DOUBLE}, #{truckage,jdbcType=DECIMAL},
</if> </if>
<if test="type != null"> <if test="type != null">
#{type,jdbcType=INTEGER}, #{type,jdbcType=INTEGER},
@@ -232,10 +232,10 @@
address = #{record.address,jdbcType=VARCHAR}, address = #{record.address,jdbcType=VARCHAR},
</if> </if>
<if test="record.warehousing != null"> <if test="record.warehousing != null">
warehousing = #{record.warehousing,jdbcType=DOUBLE}, warehousing = #{record.warehousing,jdbcType=DECIMAL},
</if> </if>
<if test="record.truckage != null"> <if test="record.truckage != null">
truckage = #{record.truckage,jdbcType=DOUBLE}, truckage = #{record.truckage,jdbcType=DECIMAL},
</if> </if>
<if test="record.type != null"> <if test="record.type != null">
type = #{record.type,jdbcType=INTEGER}, type = #{record.type,jdbcType=INTEGER},
@@ -260,8 +260,8 @@
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
address = #{record.address,jdbcType=VARCHAR}, address = #{record.address,jdbcType=VARCHAR},
warehousing = #{record.warehousing,jdbcType=DOUBLE}, warehousing = #{record.warehousing,jdbcType=DECIMAL},
truckage = #{record.truckage,jdbcType=DOUBLE}, truckage = #{record.truckage,jdbcType=DECIMAL},
type = #{record.type,jdbcType=INTEGER}, type = #{record.type,jdbcType=INTEGER},
sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR} remark = #{record.remark,jdbcType=VARCHAR}
@@ -283,10 +283,10 @@
address = #{address,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR},
</if> </if>
<if test="warehousing != null"> <if test="warehousing != null">
warehousing = #{warehousing,jdbcType=DOUBLE}, warehousing = #{warehousing,jdbcType=DECIMAL},
</if> </if>
<if test="truckage != null"> <if test="truckage != null">
truckage = #{truckage,jdbcType=DOUBLE}, truckage = #{truckage,jdbcType=DECIMAL},
</if> </if>
<if test="type != null"> <if test="type != null">
type = #{type,jdbcType=INTEGER}, type = #{type,jdbcType=INTEGER},
@@ -308,8 +308,8 @@
update jsh_depot update jsh_depot
set name = #{name,jdbcType=VARCHAR}, set name = #{name,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR},
warehousing = #{warehousing,jdbcType=DOUBLE}, warehousing = #{warehousing,jdbcType=DECIMAL},
truckage = #{truckage,jdbcType=DOUBLE}, truckage = #{truckage,jdbcType=DECIMAL},
type = #{type,jdbcType=INTEGER}, type = #{type,jdbcType=INTEGER},
sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR} remark = #{remark,jdbcType=VARCHAR}

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

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

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

@@ -10,17 +10,17 @@
<result column="CategoryId" jdbcType="BIGINT" property="categoryid" /> <result column="CategoryId" jdbcType="BIGINT" property="categoryid" />
<result column="Name" jdbcType="VARCHAR" property="name" /> <result column="Name" jdbcType="VARCHAR" property="name" />
<result column="Mfrs" jdbcType="VARCHAR" property="mfrs" /> <result column="Mfrs" jdbcType="VARCHAR" property="mfrs" />
<result column="Packing" jdbcType="DOUBLE" property="packing" /> <result column="Packing" jdbcType="DECIMAL" property="packing" />
<result column="SafetyStock" jdbcType="DOUBLE" property="safetystock" /> <result column="SafetyStock" jdbcType="DECIMAL" property="safetystock" />
<result column="Model" jdbcType="VARCHAR" property="model" /> <result column="Model" jdbcType="VARCHAR" property="model" />
<result column="Standard" jdbcType="VARCHAR" property="standard" /> <result column="Standard" jdbcType="VARCHAR" property="standard" />
<result column="Color" jdbcType="VARCHAR" property="color" /> <result column="Color" jdbcType="VARCHAR" property="color" />
<result column="Unit" jdbcType="VARCHAR" property="unit" /> <result column="Unit" jdbcType="VARCHAR" property="unit" />
<result column="Remark" jdbcType="VARCHAR" property="remark" /> <result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="RetailPrice" jdbcType="DOUBLE" property="retailprice" /> <result column="RetailPrice" jdbcType="DECIMAL" property="retailprice" />
<result column="LowPrice" jdbcType="DOUBLE" property="lowprice" /> <result column="LowPrice" jdbcType="DECIMAL" property="lowprice" />
<result column="PresetPriceOne" jdbcType="DOUBLE" property="presetpriceone" /> <result column="PresetPriceOne" jdbcType="DECIMAL" property="presetpriceone" />
<result column="PresetPriceTwo" jdbcType="DOUBLE" property="presetpricetwo" /> <result column="PresetPriceTwo" jdbcType="DECIMAL" property="presetpricetwo" />
<result column="UnitId" jdbcType="BIGINT" property="unitid" /> <result column="UnitId" jdbcType="BIGINT" property="unitid" />
<result column="FirstOutUnit" jdbcType="VARCHAR" property="firstoutunit" /> <result column="FirstOutUnit" jdbcType="VARCHAR" property="firstoutunit" />
<result column="FirstInUnit" jdbcType="VARCHAR" property="firstinunit" /> <result column="FirstInUnit" jdbcType="VARCHAR" property="firstinunit" />
@@ -165,10 +165,10 @@
PriceStrategy, Enabled, OtherField1, PriceStrategy, Enabled, OtherField1,
OtherField2, OtherField3) OtherField2, OtherField3)
values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 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}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR},
#{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{retailprice,jdbcType=DOUBLE}, #{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{retailprice,jdbcType=DECIMAL},
#{lowprice,jdbcType=DOUBLE}, #{presetpriceone,jdbcType=DOUBLE}, #{presetpricetwo,jdbcType=DOUBLE}, #{lowprice,jdbcType=DECIMAL}, #{presetpriceone,jdbcType=DECIMAL}, #{presetpricetwo,jdbcType=DECIMAL},
#{unitid,jdbcType=BIGINT}, #{firstoutunit,jdbcType=VARCHAR}, #{firstinunit,jdbcType=VARCHAR}, #{unitid,jdbcType=BIGINT}, #{firstoutunit,jdbcType=VARCHAR}, #{firstinunit,jdbcType=VARCHAR},
#{pricestrategy,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{otherfield1,jdbcType=VARCHAR}, #{pricestrategy,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{otherfield1,jdbcType=VARCHAR},
#{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}) #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR})
@@ -264,10 +264,10 @@
#{mfrs,jdbcType=VARCHAR}, #{mfrs,jdbcType=VARCHAR},
</if> </if>
<if test="packing != null"> <if test="packing != null">
#{packing,jdbcType=DOUBLE}, #{packing,jdbcType=DECIMAL},
</if> </if>
<if test="safetystock != null"> <if test="safetystock != null">
#{safetystock,jdbcType=DOUBLE}, #{safetystock,jdbcType=DECIMAL},
</if> </if>
<if test="model != null"> <if test="model != null">
#{model,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR},
@@ -285,16 +285,16 @@
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="retailprice != null"> <if test="retailprice != null">
#{retailprice,jdbcType=DOUBLE}, #{retailprice,jdbcType=DECIMAL},
</if> </if>
<if test="lowprice != null"> <if test="lowprice != null">
#{lowprice,jdbcType=DOUBLE}, #{lowprice,jdbcType=DECIMAL},
</if> </if>
<if test="presetpriceone != null"> <if test="presetpriceone != null">
#{presetpriceone,jdbcType=DOUBLE}, #{presetpriceone,jdbcType=DECIMAL},
</if> </if>
<if test="presetpricetwo != null"> <if test="presetpricetwo != null">
#{presetpricetwo,jdbcType=DOUBLE}, #{presetpricetwo,jdbcType=DECIMAL},
</if> </if>
<if test="unitid != null"> <if test="unitid != null">
#{unitid,jdbcType=BIGINT}, #{unitid,jdbcType=BIGINT},
@@ -352,10 +352,10 @@
Mfrs = #{record.mfrs,jdbcType=VARCHAR}, Mfrs = #{record.mfrs,jdbcType=VARCHAR},
</if> </if>
<if test="record.packing != null"> <if test="record.packing != null">
Packing = #{record.packing,jdbcType=DOUBLE}, Packing = #{record.packing,jdbcType=DECIMAL},
</if> </if>
<if test="record.safetystock != null"> <if test="record.safetystock != null">
SafetyStock = #{record.safetystock,jdbcType=DOUBLE}, SafetyStock = #{record.safetystock,jdbcType=DECIMAL},
</if> </if>
<if test="record.model != null"> <if test="record.model != null">
Model = #{record.model,jdbcType=VARCHAR}, Model = #{record.model,jdbcType=VARCHAR},
@@ -373,16 +373,16 @@
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.retailprice != null"> <if test="record.retailprice != null">
RetailPrice = #{record.retailprice,jdbcType=DOUBLE}, RetailPrice = #{record.retailprice,jdbcType=DECIMAL},
</if> </if>
<if test="record.lowprice != null"> <if test="record.lowprice != null">
LowPrice = #{record.lowprice,jdbcType=DOUBLE}, LowPrice = #{record.lowprice,jdbcType=DECIMAL},
</if> </if>
<if test="record.presetpriceone != null"> <if test="record.presetpriceone != null">
PresetPriceOne = #{record.presetpriceone,jdbcType=DOUBLE}, PresetPriceOne = #{record.presetpriceone,jdbcType=DECIMAL},
</if> </if>
<if test="record.presetpricetwo != null"> <if test="record.presetpricetwo != null">
PresetPriceTwo = #{record.presetpricetwo,jdbcType=DOUBLE}, PresetPriceTwo = #{record.presetpricetwo,jdbcType=DECIMAL},
</if> </if>
<if test="record.unitid != null"> <if test="record.unitid != null">
UnitId = #{record.unitid,jdbcType=BIGINT}, UnitId = #{record.unitid,jdbcType=BIGINT},
@@ -423,17 +423,17 @@
CategoryId = #{record.categoryid,jdbcType=BIGINT}, CategoryId = #{record.categoryid,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR}, Name = #{record.name,jdbcType=VARCHAR},
Mfrs = #{record.mfrs,jdbcType=VARCHAR}, Mfrs = #{record.mfrs,jdbcType=VARCHAR},
Packing = #{record.packing,jdbcType=DOUBLE}, Packing = #{record.packing,jdbcType=DECIMAL},
SafetyStock = #{record.safetystock,jdbcType=DOUBLE}, SafetyStock = #{record.safetystock,jdbcType=DECIMAL},
Model = #{record.model,jdbcType=VARCHAR}, Model = #{record.model,jdbcType=VARCHAR},
Standard = #{record.standard,jdbcType=VARCHAR}, Standard = #{record.standard,jdbcType=VARCHAR},
Color = #{record.color,jdbcType=VARCHAR}, Color = #{record.color,jdbcType=VARCHAR},
Unit = #{record.unit,jdbcType=VARCHAR}, Unit = #{record.unit,jdbcType=VARCHAR},
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
RetailPrice = #{record.retailprice,jdbcType=DOUBLE}, RetailPrice = #{record.retailprice,jdbcType=DECIMAL},
LowPrice = #{record.lowprice,jdbcType=DOUBLE}, LowPrice = #{record.lowprice,jdbcType=DECIMAL},
PresetPriceOne = #{record.presetpriceone,jdbcType=DOUBLE}, PresetPriceOne = #{record.presetpriceone,jdbcType=DECIMAL},
PresetPriceTwo = #{record.presetpricetwo,jdbcType=DOUBLE}, PresetPriceTwo = #{record.presetpricetwo,jdbcType=DECIMAL},
UnitId = #{record.unitid,jdbcType=BIGINT}, UnitId = #{record.unitid,jdbcType=BIGINT},
FirstOutUnit = #{record.firstoutunit,jdbcType=VARCHAR}, FirstOutUnit = #{record.firstoutunit,jdbcType=VARCHAR},
FirstInUnit = #{record.firstinunit,jdbcType=VARCHAR}, FirstInUnit = #{record.firstinunit,jdbcType=VARCHAR},
@@ -463,10 +463,10 @@
Mfrs = #{mfrs,jdbcType=VARCHAR}, Mfrs = #{mfrs,jdbcType=VARCHAR},
</if> </if>
<if test="packing != null"> <if test="packing != null">
Packing = #{packing,jdbcType=DOUBLE}, Packing = #{packing,jdbcType=DECIMAL},
</if> </if>
<if test="safetystock != null"> <if test="safetystock != null">
SafetyStock = #{safetystock,jdbcType=DOUBLE}, SafetyStock = #{safetystock,jdbcType=DECIMAL},
</if> </if>
<if test="model != null"> <if test="model != null">
Model = #{model,jdbcType=VARCHAR}, Model = #{model,jdbcType=VARCHAR},
@@ -484,16 +484,16 @@
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="retailprice != null"> <if test="retailprice != null">
RetailPrice = #{retailprice,jdbcType=DOUBLE}, RetailPrice = #{retailprice,jdbcType=DECIMAL},
</if> </if>
<if test="lowprice != null"> <if test="lowprice != null">
LowPrice = #{lowprice,jdbcType=DOUBLE}, LowPrice = #{lowprice,jdbcType=DECIMAL},
</if> </if>
<if test="presetpriceone != null"> <if test="presetpriceone != null">
PresetPriceOne = #{presetpriceone,jdbcType=DOUBLE}, PresetPriceOne = #{presetpriceone,jdbcType=DECIMAL},
</if> </if>
<if test="presetpricetwo != null"> <if test="presetpricetwo != null">
PresetPriceTwo = #{presetpricetwo,jdbcType=DOUBLE}, PresetPriceTwo = #{presetpricetwo,jdbcType=DECIMAL},
</if> </if>
<if test="unitid != null"> <if test="unitid != null">
UnitId = #{unitid,jdbcType=BIGINT}, UnitId = #{unitid,jdbcType=BIGINT},
@@ -531,17 +531,17 @@
set CategoryId = #{categoryid,jdbcType=BIGINT}, set CategoryId = #{categoryid,jdbcType=BIGINT},
Name = #{name,jdbcType=VARCHAR}, Name = #{name,jdbcType=VARCHAR},
Mfrs = #{mfrs,jdbcType=VARCHAR}, Mfrs = #{mfrs,jdbcType=VARCHAR},
Packing = #{packing,jdbcType=DOUBLE}, Packing = #{packing,jdbcType=DECIMAL},
SafetyStock = #{safetystock,jdbcType=DOUBLE}, SafetyStock = #{safetystock,jdbcType=DECIMAL},
Model = #{model,jdbcType=VARCHAR}, Model = #{model,jdbcType=VARCHAR},
Standard = #{standard,jdbcType=VARCHAR}, Standard = #{standard,jdbcType=VARCHAR},
Color = #{color,jdbcType=VARCHAR}, Color = #{color,jdbcType=VARCHAR},
Unit = #{unit,jdbcType=VARCHAR}, Unit = #{unit,jdbcType=VARCHAR},
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
RetailPrice = #{retailprice,jdbcType=DOUBLE}, RetailPrice = #{retailprice,jdbcType=DECIMAL},
LowPrice = #{lowprice,jdbcType=DOUBLE}, LowPrice = #{lowprice,jdbcType=DECIMAL},
PresetPriceOne = #{presetpriceone,jdbcType=DOUBLE}, PresetPriceOne = #{presetpriceone,jdbcType=DECIMAL},
PresetPriceTwo = #{presetpricetwo,jdbcType=DOUBLE}, PresetPriceTwo = #{presetpricetwo,jdbcType=DECIMAL},
UnitId = #{unitid,jdbcType=BIGINT}, UnitId = #{unitid,jdbcType=BIGINT},
FirstOutUnit = #{firstoutunit,jdbcType=VARCHAR}, FirstOutUnit = #{firstoutunit,jdbcType=VARCHAR},
FirstInUnit = #{firstinunit,jdbcType=VARCHAR}, FirstInUnit = #{firstinunit,jdbcType=VARCHAR},

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

@@ -15,18 +15,18 @@
<result column="isystem" jdbcType="TINYINT" property="isystem" /> <result column="isystem" jdbcType="TINYINT" property="isystem" />
<result column="type" jdbcType="VARCHAR" property="type" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="enabled" jdbcType="BIT" property="enabled" /> <result column="enabled" jdbcType="BIT" property="enabled" />
<result column="AdvanceIn" jdbcType="DOUBLE" property="advancein" /> <result column="AdvanceIn" jdbcType="DECIMAL" property="advancein" />
<result column="BeginNeedGet" jdbcType="DOUBLE" property="beginneedget" /> <result column="BeginNeedGet" jdbcType="DECIMAL" property="beginneedget" />
<result column="BeginNeedPay" jdbcType="DOUBLE" property="beginneedpay" /> <result column="BeginNeedPay" jdbcType="DECIMAL" property="beginneedpay" />
<result column="AllNeedGet" jdbcType="DOUBLE" property="allneedget" /> <result column="AllNeedGet" jdbcType="DECIMAL" property="allneedget" />
<result column="AllNeedPay" jdbcType="DOUBLE" property="allneedpay" /> <result column="AllNeedPay" jdbcType="DECIMAL" property="allneedpay" />
<result column="fax" jdbcType="VARCHAR" property="fax" /> <result column="fax" jdbcType="VARCHAR" property="fax" />
<result column="telephone" jdbcType="VARCHAR" property="telephone" /> <result column="telephone" jdbcType="VARCHAR" property="telephone" />
<result column="address" jdbcType="VARCHAR" property="address" /> <result column="address" jdbcType="VARCHAR" property="address" />
<result column="taxNum" jdbcType="VARCHAR" property="taxnum" /> <result column="taxNum" jdbcType="VARCHAR" property="taxnum" />
<result column="bankName" jdbcType="VARCHAR" property="bankname" /> <result column="bankName" jdbcType="VARCHAR" property="bankname" />
<result column="accountNumber" jdbcType="VARCHAR" property="accountnumber" /> <result column="accountNumber" jdbcType="VARCHAR" property="accountnumber" />
<result column="taxRate" jdbcType="DOUBLE" property="taxrate" /> <result column="taxRate" jdbcType="DECIMAL" property="taxrate" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
@@ -165,10 +165,10 @@
values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR},
#{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
#{advancein,jdbcType=DOUBLE}, #{beginneedget,jdbcType=DOUBLE}, #{beginneedpay,jdbcType=DOUBLE}, #{advancein,jdbcType=DECIMAL}, #{beginneedget,jdbcType=DECIMAL}, #{beginneedpay,jdbcType=DECIMAL},
#{allneedget,jdbcType=DOUBLE}, #{allneedpay,jdbcType=DOUBLE}, #{fax,jdbcType=VARCHAR}, #{allneedget,jdbcType=DECIMAL}, #{allneedpay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR},
#{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxnum,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>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier">
@@ -271,19 +271,19 @@
#{enabled,jdbcType=BIT}, #{enabled,jdbcType=BIT},
</if> </if>
<if test="advancein != null"> <if test="advancein != null">
#{advancein,jdbcType=DOUBLE}, #{advancein,jdbcType=DECIMAL},
</if> </if>
<if test="beginneedget != null"> <if test="beginneedget != null">
#{beginneedget,jdbcType=DOUBLE}, #{beginneedget,jdbcType=DECIMAL},
</if> </if>
<if test="beginneedpay != null"> <if test="beginneedpay != null">
#{beginneedpay,jdbcType=DOUBLE}, #{beginneedpay,jdbcType=DECIMAL},
</if> </if>
<if test="allneedget != null"> <if test="allneedget != null">
#{allneedget,jdbcType=DOUBLE}, #{allneedget,jdbcType=DECIMAL},
</if> </if>
<if test="allneedpay != null"> <if test="allneedpay != null">
#{allneedpay,jdbcType=DOUBLE}, #{allneedpay,jdbcType=DECIMAL},
</if> </if>
<if test="fax != null"> <if test="fax != null">
#{fax,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR},
@@ -304,7 +304,7 @@
#{accountnumber,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR},
</if> </if>
<if test="taxrate != null"> <if test="taxrate != null">
#{taxrate,jdbcType=DOUBLE}, #{taxrate,jdbcType=DECIMAL},
</if> </if>
</trim> </trim>
</insert> </insert>
@@ -353,19 +353,19 @@
enabled = #{record.enabled,jdbcType=BIT}, enabled = #{record.enabled,jdbcType=BIT},
</if> </if>
<if test="record.advancein != null"> <if test="record.advancein != null">
AdvanceIn = #{record.advancein,jdbcType=DOUBLE}, AdvanceIn = #{record.advancein,jdbcType=DECIMAL},
</if> </if>
<if test="record.beginneedget != null"> <if test="record.beginneedget != null">
BeginNeedGet = #{record.beginneedget,jdbcType=DOUBLE}, BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL},
</if> </if>
<if test="record.beginneedpay != null"> <if test="record.beginneedpay != null">
BeginNeedPay = #{record.beginneedpay,jdbcType=DOUBLE}, BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL},
</if> </if>
<if test="record.allneedget != null"> <if test="record.allneedget != null">
AllNeedGet = #{record.allneedget,jdbcType=DOUBLE}, AllNeedGet = #{record.allneedget,jdbcType=DECIMAL},
</if> </if>
<if test="record.allneedpay != null"> <if test="record.allneedpay != null">
AllNeedPay = #{record.allneedpay,jdbcType=DOUBLE}, AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL},
</if> </if>
<if test="record.fax != null"> <if test="record.fax != null">
fax = #{record.fax,jdbcType=VARCHAR}, fax = #{record.fax,jdbcType=VARCHAR},
@@ -386,7 +386,7 @@
accountNumber = #{record.accountnumber,jdbcType=VARCHAR}, accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
</if> </if>
<if test="record.taxrate != null"> <if test="record.taxrate != null">
taxRate = #{record.taxrate,jdbcType=DOUBLE}, taxRate = #{record.taxrate,jdbcType=DECIMAL},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -408,18 +408,18 @@
isystem = #{record.isystem,jdbcType=TINYINT}, isystem = #{record.isystem,jdbcType=TINYINT},
type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT}, enabled = #{record.enabled,jdbcType=BIT},
AdvanceIn = #{record.advancein,jdbcType=DOUBLE}, AdvanceIn = #{record.advancein,jdbcType=DECIMAL},
BeginNeedGet = #{record.beginneedget,jdbcType=DOUBLE}, BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL},
BeginNeedPay = #{record.beginneedpay,jdbcType=DOUBLE}, BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL},
AllNeedGet = #{record.allneedget,jdbcType=DOUBLE}, AllNeedGet = #{record.allneedget,jdbcType=DECIMAL},
AllNeedPay = #{record.allneedpay,jdbcType=DOUBLE}, AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL},
fax = #{record.fax,jdbcType=VARCHAR}, fax = #{record.fax,jdbcType=VARCHAR},
telephone = #{record.telephone,jdbcType=VARCHAR}, telephone = #{record.telephone,jdbcType=VARCHAR},
address = #{record.address,jdbcType=VARCHAR}, address = #{record.address,jdbcType=VARCHAR},
taxNum = #{record.taxnum,jdbcType=VARCHAR}, taxNum = #{record.taxnum,jdbcType=VARCHAR},
bankName = #{record.bankname,jdbcType=VARCHAR}, bankName = #{record.bankname,jdbcType=VARCHAR},
accountNumber = #{record.accountnumber,jdbcType=VARCHAR}, accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
taxRate = #{record.taxrate,jdbcType=DOUBLE} taxRate = #{record.taxrate,jdbcType=DECIMAL}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@@ -456,19 +456,19 @@
enabled = #{enabled,jdbcType=BIT}, enabled = #{enabled,jdbcType=BIT},
</if> </if>
<if test="advancein != null"> <if test="advancein != null">
AdvanceIn = #{advancein,jdbcType=DOUBLE}, AdvanceIn = #{advancein,jdbcType=DECIMAL},
</if> </if>
<if test="beginneedget != null"> <if test="beginneedget != null">
BeginNeedGet = #{beginneedget,jdbcType=DOUBLE}, BeginNeedGet = #{beginneedget,jdbcType=DECIMAL},
</if> </if>
<if test="beginneedpay != null"> <if test="beginneedpay != null">
BeginNeedPay = #{beginneedpay,jdbcType=DOUBLE}, BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL},
</if> </if>
<if test="allneedget != null"> <if test="allneedget != null">
AllNeedGet = #{allneedget,jdbcType=DOUBLE}, AllNeedGet = #{allneedget,jdbcType=DECIMAL},
</if> </if>
<if test="allneedpay != null"> <if test="allneedpay != null">
AllNeedPay = #{allneedpay,jdbcType=DOUBLE}, AllNeedPay = #{allneedpay,jdbcType=DECIMAL},
</if> </if>
<if test="fax != null"> <if test="fax != null">
fax = #{fax,jdbcType=VARCHAR}, fax = #{fax,jdbcType=VARCHAR},
@@ -489,7 +489,7 @@
accountNumber = #{accountnumber,jdbcType=VARCHAR}, accountNumber = #{accountnumber,jdbcType=VARCHAR},
</if> </if>
<if test="taxrate != null"> <if test="taxrate != null">
taxRate = #{taxrate,jdbcType=DOUBLE}, taxRate = #{taxrate,jdbcType=DECIMAL},
</if> </if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
@@ -508,18 +508,18 @@
isystem = #{isystem,jdbcType=TINYINT}, isystem = #{isystem,jdbcType=TINYINT},
type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT}, enabled = #{enabled,jdbcType=BIT},
AdvanceIn = #{advancein,jdbcType=DOUBLE}, AdvanceIn = #{advancein,jdbcType=DECIMAL},
BeginNeedGet = #{beginneedget,jdbcType=DOUBLE}, BeginNeedGet = #{beginneedget,jdbcType=DECIMAL},
BeginNeedPay = #{beginneedpay,jdbcType=DOUBLE}, BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL},
AllNeedGet = #{allneedget,jdbcType=DOUBLE}, AllNeedGet = #{allneedget,jdbcType=DECIMAL},
AllNeedPay = #{allneedpay,jdbcType=DOUBLE}, AllNeedPay = #{allneedpay,jdbcType=DECIMAL},
fax = #{fax,jdbcType=VARCHAR}, fax = #{fax,jdbcType=VARCHAR},
telephone = #{telephone,jdbcType=VARCHAR}, telephone = #{telephone,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR},
taxNum = #{taxnum,jdbcType=VARCHAR}, taxNum = #{taxnum,jdbcType=VARCHAR},
bankName = #{bankname,jdbcType=VARCHAR}, bankName = #{bankname,jdbcType=VARCHAR},
accountNumber = #{accountnumber,jdbcType=VARCHAR}, accountNumber = #{accountnumber,jdbcType=VARCHAR},
taxRate = #{taxrate,jdbcType=DOUBLE} taxRate = #{taxrate,jdbcType=DECIMAL}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>