1、修改double类型为BigDecimal

2、修复sql中大于小于少&出错的问题

src/main/java/com/jsh/erp/controller/AccountController.java

@@ -1,141 +1,142 @@
-package com.jsh.erp.controller;
+package com.jsh.erp.controller;
-
+
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONObject;
-import com.jsh.erp.datasource.entities.Account;
+import com.jsh.erp.datasource.entities.Account;
-import com.jsh.erp.datasource.vo.AccountVo4InOutList;
+import com.jsh.erp.datasource.vo.AccountVo4InOutList;
-import com.jsh.erp.service.account.AccountService;
+import com.jsh.erp.service.account.AccountService;
-import com.jsh.erp.utils.BaseResponseInfo;
+import com.jsh.erp.utils.BaseResponseInfo;
-import com.jsh.erp.utils.ErpInfo;
+import com.jsh.erp.utils.ErpInfo;
-import org.slf4j.Logger;
+import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
+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.util.HashMap;
+import java.math.BigDecimal;
-import java.util.List;
+import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
-
+import java.util.Map;
-import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
+
-
+import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
-/**
+
- * @author jishenghua 75271*8920
+/**
- */
+ * @author jishenghua 75271*8920
-@RestController
+ */
-@RequestMapping(value = "/account")
+@RestController
-public class AccountController {
+@RequestMapping(value = "/account")
-    private Logger logger = LoggerFactory.getLogger(AccountController.class);
+public class AccountController {
-
+    private Logger logger = LoggerFactory.getLogger(AccountController.class);
-    @Resource
+
-    private AccountService accountService;
+    @Resource
-
+    private AccountService accountService;
-    /**
+
-     * 查找结算账户信息-下拉框
+    /**
-     * @param request
+     * 查找结算账户信息-下拉框
-     * @return
+     * @param request
-     */
+     * @return
-    @GetMapping(value = "/findBySelect")
+     */
-    public String findBySelect(HttpServletRequest request) {
+    @GetMapping(value = "/findBySelect")
-        String res = null;
+    public String findBySelect(HttpServletRequest request) {
-        try {
+        String res = null;
-            List<Account> dataList = accountService.findBySelect();
+        try {
-            //存放数据json数组
+            List<Account> dataList = accountService.findBySelect();
-            JSONArray dataArray = new JSONArray();
+            //存放数据json数组
-            if (null != dataList) {
+            JSONArray dataArray = new JSONArray();
-                for (Account account : dataList) {
+            if (null != dataList) {
-                    JSONObject item = new JSONObject();
+                for (Account account : dataList) {
-                    item.put("Id", account.getId());
+                    JSONObject item = new JSONObject();
-                    //结算账户名称
+                    item.put("Id", account.getId());
-                    item.put("AccountName", account.getName());
+                    //结算账户名称
-                    dataArray.add(item);
+                    item.put("AccountName", account.getName());
-                }
+                    dataArray.add(item);
-            }
+                }
-            res = dataArray.toJSONString();
+            }
-        } catch(Exception e){
+            res = dataArray.toJSONString();
-            e.printStackTrace();
+        } catch(Exception e){
-            res = "获取数据失败";
+            e.printStackTrace();
-        }
+            res = "获取数据失败";
-        return res;
+        }
-    }
+        return res;
-
+    }
-    /**
+
-     * 获取所有结算账户
+    /**
-     * @param request
+     * 获取所有结算账户
-     * @return
+     * @param request
-     */
+     * @return
-    @GetMapping(value = "/getAccount")
+     */
-    public BaseResponseInfo getAccount(HttpServletRequest request) {
+    @GetMapping(value = "/getAccount")
-        BaseResponseInfo res = new BaseResponseInfo();
+    public BaseResponseInfo getAccount(HttpServletRequest request) {
-        Map<String, Object> map = new HashMap<String, Object>();
+        BaseResponseInfo res = new BaseResponseInfo();
-        try {
+        Map<String, Object> map = new HashMap<String, Object>();
-            List<Account> accountList = accountService.getAccount();
+        try {
-            map.put("accountList", accountList);
+            List<Account> accountList = accountService.getAccount();
-            res.code = 200;
+            map.put("accountList", accountList);
-            res.data = map;
+            res.code = 200;
-        } catch(Exception e){
+            res.data = map;
-            e.printStackTrace();
+        } catch(Exception e){
-            res.code = 500;
+            e.printStackTrace();
-            res.data = "获取数据失败";
+            res.code = 500;
-        }
+            res.data = "获取数据失败";
-        return res;
+        }
-    }
+        return res;
-
+    }
-    /**
+
-     * 账户流水信息
+    /**
-     * @param currentPage
+     * 账户流水信息
-     * @param pageSize
+     * @param currentPage
-     * @param accountId
+     * @param pageSize
-     * @param initialAmount
+     * @param accountId
-     * @param request
+     * @param initialAmount
-     * @return
+     * @param request
-     */
+     * @return
-    @GetMapping(value = "/findAccountInOutList")
+     */
-    public BaseResponseInfo findAccountInOutList(@RequestParam("currentPage") Integer currentPage,
+    @GetMapping(value = "/findAccountInOutList")
-                                                 @RequestParam("pageSize") Integer pageSize,
+    public BaseResponseInfo findAccountInOutList(@RequestParam("currentPage") Integer currentPage,
-                                                 @RequestParam("accountId") Long accountId,
+                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("initialAmount") Double initialAmount,
+                                                 @RequestParam("accountId") Long accountId,
-                                                 HttpServletRequest request) {
+                                                 @RequestParam("initialAmount") BigDecimal initialAmount,
-        BaseResponseInfo res = new BaseResponseInfo();
+                                                 HttpServletRequest request) {
-        Map<String, Object> map = new HashMap<String, Object>();
+        BaseResponseInfo res = new BaseResponseInfo();
-        try {
+        Map<String, Object> map = new HashMap<String, Object>();
-            List<AccountVo4InOutList> dataList = accountService.findAccountInOutList(accountId, (currentPage-1)*pageSize, pageSize);
+        try {
-            int total = accountService.findAccountInOutListCount(accountId);
+            List<AccountVo4InOutList> dataList = accountService.findAccountInOutList(accountId, (currentPage-1)*pageSize, pageSize);
-            map.put("total", total);
+            int total = accountService.findAccountInOutListCount(accountId);
-            //存放数据json数组
+            map.put("total", total);
-            JSONArray dataArray = new JSONArray();
+            //存放数据json数组
-            if (null != dataList) {
+            JSONArray dataArray = new JSONArray();
-                for (AccountVo4InOutList aEx : dataList) {
+            if (null != dataList) {
-                    String timeStr = aEx.getOperTime().toString();
+                for (AccountVo4InOutList aEx : dataList) {
-                    Double balance = accountService.getAccountSum(accountId, timeStr, "date") + accountService.getAccountSumByHead(accountId, timeStr, "date")
+                    String timeStr = aEx.getOperTime().toString();
-                            + accountService.getAccountSumByDetail(accountId, timeStr, "date") + accountService.getManyAccountSum(accountId, timeStr, "date") + initialAmount;
+                    BigDecimal balance = accountService.getAccountSum(accountId, timeStr, "date").add(accountService.getAccountSumByHead(accountId, timeStr, "date"))
-                    aEx.setBalance(balance);
+                            .add(accountService.getAccountSumByDetail(accountId, timeStr, "date")).add(accountService.getManyAccountSum(accountId, timeStr, "date")).add(initialAmount);
-                    dataArray.add(aEx);
+                    aEx.setBalance(balance);
-                }
+                    dataArray.add(aEx);
-            }
+                }
-            map.put("rows", dataArray);
+            }
-            res.code = 200;
+            map.put("rows", dataArray);
-            res.data = map;
+            res.code = 200;
-        } catch(Exception e){
+            res.data = map;
-            e.printStackTrace();
+        } catch(Exception e){
-            res.code = 500;
+            e.printStackTrace();
-            res.data = "获取数据失败";
+            res.code = 500;
-        }
+            res.data = "获取数据失败";
-        return res;
+        }
-    }
+        return res;
-
+    }
-
+
-    @PostMapping(value = "/updateAmountIsDefault")
+
-    public String updateAmountIsDefault(@RequestParam("isDefault") Boolean isDefault,
+    @PostMapping(value = "/updateAmountIsDefault")
-                                 @RequestParam("accountId") Long accountId,
+    public String updateAmountIsDefault(@RequestParam("isDefault") Boolean isDefault,
-                                 HttpServletRequest request) {
+                                 @RequestParam("accountId") Long accountId,
-        Map<String, Object> objectMap = new HashMap<String, Object>();
+                                 HttpServletRequest request) {
-        int res = accountService.updateAmountIsDefault(isDefault, accountId);
+        Map<String, Object> objectMap = new HashMap<String, Object>();
-        if(res > 0) {
+        int res = accountService.updateAmountIsDefault(isDefault, accountId);
-            return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
+        if(res > 0) {
-        } else {
+            return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
-            return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
+        } else {
-        }
+            return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
-    }
+        }
-
+    }
-}
+
+}

src/main/java/com/jsh/erp/controller/AccountHeadController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -69,7 +70,7 @@ public class AccountHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             JSONObject outer = new JSONObject();
-            Double sum = 0.0;
+            BigDecimal sum = BigDecimal.ZERO;
             String getS = supplierId.toString();
             int i = 1;
             if (supType.equals("customer")) { //客户
@@ -78,10 +79,14 @@ public class AccountHeadController {
                 i = -1;
             }
             //收付款部分
-            sum = sum + (allMoney(getS, "付款", "合计",endTime) + allMoney(getS, "付款", "实际",endTime)) * i;
+//            sum = sum + (allMoney(getS, "付款", "合计",endTime) + allMoney(getS, "付款", "实际",endTime)) * i;
-            sum = sum - (allMoney(getS, "收款", "合计",endTime) + allMoney(getS, "收款", "实际",endTime)) * i;
+            sum = sum.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);
             map.put("rows", outer);
             res.code = 200;
@@ -128,11 +133,11 @@ public class AccountHeadController {
      * @param endTime
      * @return
      */
-    public Double allMoney(String getS, String type, String mode, String endTime) {
+    public BigDecimal allMoney(String getS, String type, String mode, String endTime) {
-        Double allMoney = 0.0;
+        BigDecimal allMoney = BigDecimal.ZERO;
         try {
             Integer supplierId = Integer.valueOf(getS);
-            Double sum = accountHeadService.findAllMoney(supplierId, type, mode, endTime);
+            BigDecimal sum = accountHeadService.findAllMoney(supplierId, type, mode, endTime);
             if(sum != null) {
                 allMoney = sum;
             }
@@ -140,8 +145,8 @@ public class AccountHeadController {
             e.printStackTrace();
         }
         //返回正数，如果负数也转为正数
-        if (allMoney < 0) {
+        if ((allMoney.compareTo(BigDecimal.ZERO))==-1) {
-            allMoney = -allMoney;
+            allMoney = allMoney.abs();
         }
         return allMoney;
     }

src/main/java/com/jsh/erp/controller/AccountItemController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -86,8 +87,8 @@ public class AccountItemController {
                     item.put("AccountName", ai.getAccountName());
                     item.put("InOutItemId", ai.getInoutitemid());
                     item.put("InOutItemName", ai.getInOutItemName());
-                    Double eachAmount = ai.getEachamount();
+                    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());
                     dataArray.add(item);
                 }

src/main/java/com/jsh/erp/controller/DepotHeadController.java

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

src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -15,6 +15,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -152,13 +153,13 @@ public class DepotItemController {
         if (null != list) {
             for (DepotItemVo4Material di : list) {
                 JSONObject item = new JSONObject();
-                double prevSum = sumNumber("入库", pid, materialId, monthTime, true) - sumNumber("出库", pid, materialId, monthTime, true);
+                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("MaterialName", di.getMname());
                 item.put("MaterialModel", di.getMmodel());
-                item.put("thisSum", prevSum + InSum - OutSum);
+                item.put("thisSum", prevSum.add(InSum).subtract(OutSum));
                 dataArray.add(item);
             }
         }
@@ -425,12 +426,12 @@ public class DepotItemController {
             if (null != dataList) {
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     JSONObject item = new JSONObject();
-                    Double prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true) - sumNumber("出库", pid, diEx.getMId(), monthTime, true);
+                    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("MaterialModel", diEx.getMColor());
                     //扩展信息
@@ -438,21 +439,21 @@ public class DepotItemController {
                     item.put("MaterialOther", materialOther);
                     item.put("MaterialColor", diEx.getMColor());
                     item.put("MaterialUnit", diEx.getMaterialUnit());
-                    Double unitPrice = 0.0;
+                    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通过除法算出金额后，保留两位小数
                          * */
                         DecimalFormat    df   = new DecimalFormat("#.00");
-                        unitPrice= Double.parseDouble(df.format(unitPrice));
+                        unitPrice= new BigDecimal(df.format(unitPrice));
                     }
                     item.put("UnitPrice", unitPrice);
                     item.put("prevSum", prevSum);
                     item.put("InSum", InSum);
                     item.put("OutSum", OutSum);
-                    item.put("thisSum", prevSum + InSum - OutSum);
+                    item.put("thisSum", prevSum.add(InSum).subtract(OutSum));
-                    item.put("thisAllPrice", prevPrice + InPrice - OutPrice);
+                    item.put("thisAllPrice", prevPrice.add(InPrice).subtract(OutPrice));
                     dataArray.add(item);
                 }
             }
@@ -486,13 +487,13 @@ public class DepotItemController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, null, null);
-            Double thisAllPrice = 0.0;
+            BigDecimal thisAllPrice = BigDecimal.ZERO;
             if (null != dataList) {
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
-                    Double prevPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, true) - sumPrice("出库", pid, diEx.getMId(), monthTime, true);
+                    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);
@@ -537,10 +538,10 @@ public class DepotItemController {
             if (null != dataList) {
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     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("MaterialModel", diEx.getMModel());
                     //扩展信息
@@ -597,14 +598,14 @@ public class DepotItemController {
             if (null != dataList) {
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     JSONObject item = new JSONObject();
-                    Double OutSumRetail = sumNumberBuyOrSale("出库", "零售", diEx.getMId(), monthTime);
+                    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("MaterialModel", diEx.getMModel());
                     //扩展信息
@@ -612,10 +613,10 @@ public class DepotItemController {
                     item.put("MaterialOther", materialOther);
                     item.put("MaterialColor", diEx.getMColor());
                     item.put("MaterialUnit", diEx.getMaterialUnit());
-                    item.put("OutSum", OutSumRetail + OutSum);
+                    item.put("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);
                 }
             }
@@ -661,8 +662,8 @@ public class DepotItemController {
             if (null != dataList) {
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     JSONObject item = new JSONObject();
-                    Double InSum = sumNumberGift("礼品充值", pid, diEx.getMId(), "in");
+                    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("MaterialModel", diEx.getMModel());
                     //扩展信息
@@ -670,7 +671,7 @@ public class DepotItemController {
                     item.put("MaterialOther", materialOther);
                     item.put("MaterialColor", diEx.getMColor());
                     item.put("MaterialUnit", diEx.getMaterialUnit());
-                    item.put("thisSum", InSum - OutSum);
+                    item.put("thisSum", InSum.subtract(OutSum));
                     dataArray.add(item);
                 }
             }
@@ -718,23 +719,23 @@ public class DepotItemController {
             if (null != dataList) {
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     String[] objs = new String[9];
-                    Double prevSum = sumNumber("入库", pid, diEx.getMId(), monthTime, true) - sumNumber("出库", pid, diEx.getMId(), monthTime, true);
+                    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通过除法算出金额后，保留两位小数
                          * */
                         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[1] = diEx.getMModel().toString();
                     objs[2] = diEx.getMaterialUnit().toString();
@@ -770,10 +771,10 @@ public class DepotItemController {
      * @param isPrev
      * @return
      */
-    public Double sumNumber(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
+    public BigDecimal sumNumber(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
-        Double sumNumber = 0.0;
+        BigDecimal sumNumber = BigDecimal.ZERO;
         try {
-            Double sum = depotItemService.findByType(type, ProjectId, MId, MonthTime, isPrev);
+            BigDecimal sum = depotItemService.findByType(type, ProjectId, MId, MonthTime, isPrev);
             if(sum != null) {
                 sumNumber = sum;
             }
@@ -792,10 +793,10 @@ public class DepotItemController {
      * @param isPrev
      * @return
      */
-    public Double sumPrice(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
+    public BigDecimal sumPrice(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
-        Double sumPrice = 0.0;
+        BigDecimal sumPrice = BigDecimal.ZERO;
         try {
-            Double sum = depotItemService.findPriceByType(type, ProjectId, MId, MonthTime, isPrev);
+            BigDecimal sum = depotItemService.findPriceByType(type, ProjectId, MId, MonthTime, isPrev);
             if(sum != null) {
                 sumPrice = sum;
             }
@@ -805,11 +806,11 @@ public class DepotItemController {
         return sumPrice;
     }
 
-    public Double sumNumberBuyOrSale(String type, String subType, Long MId, String MonthTime) {
+    public BigDecimal sumNumberBuyOrSale(String type, String subType, Long MId, String MonthTime) {
-        Double sumNumber = 0.0;
+        BigDecimal sumNumber = BigDecimal.ZERO;
         String sumType = "Number";
         try {
-            Double sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
+            BigDecimal sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
             if(sum != null) {
                 sumNumber = sum;
             }
@@ -819,11 +820,11 @@ public class DepotItemController {
         return sumNumber;
     }
 
-    public Double sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) {
+    public BigDecimal sumPriceBuyOrSale(String type, String subType, Long MId, String MonthTime) {
-        Double sumPrice = 0.0;
+        BigDecimal sumPrice = BigDecimal.ZERO;
         String sumType = "Price";
         try {
-            Double sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
+            BigDecimal sum = depotItemService.buyOrSale(type, subType, MId, MonthTime, sumType);
             if(sum != null) {
                 sumPrice = sum;
             }
@@ -841,12 +842,12 @@ public class DepotItemController {
      * @param type
      * @return
      */
-    public Double sumNumberGift(String subType, Integer ProjectId, Long MId, String type) {
+    public BigDecimal sumNumberGift(String subType, Integer ProjectId, Long MId, String type) {
-        Double sumNumber = 0.0;
+        BigDecimal sumNumber = BigDecimal.ZERO;
         String allNumber = "";
         try {
             if (ProjectId != null) {
-                Double sum = depotItemService.findGiftByType(subType, ProjectId, MId, type);
+                BigDecimal sum = depotItemService.findGiftByType(subType, ProjectId, MId, type);
                 if(sum != null) {
                     sumNumber = sum;
                 }

src/main/java/com/jsh/erp/controller/MaterialController.java

@@ -18,6 +18,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -270,19 +271,19 @@ public class MaterialController {
             for (int i = 1; i < src.getRows(); i++) {
                 Material m = new Material();
                 m.setName(ExcelUtils.getContent(src, i, 0));
-                m.setCategoryid(1l); //根目录
+                m.setCategoryid(1L); //根目录
                 m.setModel(ExcelUtils.getContent(src, i, 2));
                 String safetyStock = ExcelUtils.getContent(src, i, 3);
-                m.setSafetystock(parseDoubleEx(safetyStock));
+                m.setSafetystock(parseBigDecimalEx(safetyStock));
                 m.setUnit(ExcelUtils.getContent(src, i, 4));
                 String retailprice = ExcelUtils.getContent(src, i, 5);
-                m.setRetailprice(parseDoubleEx(retailprice));
+                m.setRetailprice(parseBigDecimalEx(retailprice));
                 String lowPrice = ExcelUtils.getContent(src, i, 6);
-                m.setLowprice(parseDoubleEx(lowPrice));
+                m.setLowprice(parseBigDecimalEx(lowPrice));
                 String presetpriceone = ExcelUtils.getContent(src, i, 7);
-                m.setPresetpriceone(parseDoubleEx(presetpriceone));
+                m.setPresetpriceone(parseBigDecimalEx(presetpriceone));
                 String presetpricetwo = ExcelUtils.getContent(src, i, 8);
-                m.setPresetpricetwo(parseDoubleEx(presetpricetwo));
+                m.setPresetpricetwo(parseBigDecimalEx(presetpricetwo));
                 m.setRemark(ExcelUtils.getContent(src, i, 9));
                 String enabled = ExcelUtils.getContent(src, i, 10);
                 m.setEnabled(enabled.equals("启用")? true: false);
@@ -299,9 +300,9 @@ public class MaterialController {
         response.sendRedirect("../pages/materials/material.html");
     }
 
-    public Double parseDoubleEx(String str){
+    public BigDecimal parseBigDecimalEx(String str){
         if(!StringUtil.isEmpty(str)) {
-            return Double.parseDouble(str);
+            return  new BigDecimal(str);
         } else {
             return null;
         }

src/main/java/com/jsh/erp/controller/SupplierController.java

@@ -18,6 +18,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -48,7 +49,7 @@ public class SupplierController {
      */
     @PostMapping(value = "/updateAdvanceIn")
     public String updateAdvanceIn(@RequestParam("supplierId") Long supplierId,
-                                            @RequestParam("advanceIn") Double advanceIn,
+                                            @RequestParam("advanceIn") BigDecimal advanceIn,
                                             HttpServletRequest request) {
         Map<String, Object> objectMap = new HashMap<String, Object>();
         int res = supplierService.updateAdvanceIn(supplierId, advanceIn);
@@ -396,9 +397,9 @@ public class SupplierController {
                 s.setContacts(ExcelUtils.getContent(src, i, 2));
                 s.setPhonenum(ExcelUtils.getContent(src, i, 3));
                 s.setEmail(ExcelUtils.getContent(src, i, 4));
-                s.setAdvancein(parseDoubleEx(ExcelUtils.getContent(src, i, 5)));
+                s.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.setFax(ExcelUtils.getContent(src, i, 9));
                 s.setTelephone(ExcelUtils.getContent(src, i, 10));
@@ -406,7 +407,7 @@ public class SupplierController {
                 s.setTaxnum(ExcelUtils.getContent(src, i, 12));
                 s.setBankname(ExcelUtils.getContent(src, i, 13));
                 s.setAccountnumber(ExcelUtils.getContent(src, i, 14));
-                s.setTaxrate(parseDoubleEx(ExcelUtils.getContent(src, i, 15)));
+                s.setTaxrate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
                 String enabled = ExcelUtils.getContent(src, i, 16);
                 s.setEnabled(enabled.equals("启用")? true: false);
                 s.setIsystem(Byte.parseByte("1"));
@@ -423,9 +424,9 @@ public class SupplierController {
         return null;
     }
 
-    public Double parseDoubleEx(String str){
+    public BigDecimal parseBigDecimalEx(String str){
         if(!StringUtil.isEmpty(str)) {
-            return Double.parseDouble(str);
+            return new BigDecimal(str);
         } else {
             return null;
         }

src/main/java/com/jsh/erp/datasource/entities/Account.java

@@ -1,227 +1,229 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-public class Account {
+import java.math.BigDecimal;
-    /**
+
-     * This field was generated by MyBatis Generator.
+public class Account {
-     * This field corresponds to the database column jsh_account.Id
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_account.Id
-     */
+     *
-    private Long id;
+     * @mbggenerated
-
+     */
-    /**
+    private Long id;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_account.Name
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_account.Name
-     */
+     *
-    private String name;
+     * @mbggenerated
-
+     */
-    /**
+    private String name;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_account.SerialNo
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_account.SerialNo
-     */
+     *
-    private String serialno;
+     * @mbggenerated
-
+     */
-    /**
+    private String serialno;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_account.InitialAmount
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_account.InitialAmount
-     */
+     *
-    private Double initialamount;
+     * @mbggenerated
-
+     */
-    /**
+    private BigDecimal initialamount;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_account.CurrentAmount
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_account.CurrentAmount
-     */
+     *
-    private Double currentamount;
+     * @mbggenerated
-
+     */
-    /**
+    private BigDecimal currentamount;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_account.Remark
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_account.Remark
-     */
+     *
-    private String remark;
+     * @mbggenerated
-
+     */
-    /**
+    private String remark;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_account.IsDefault
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_account.IsDefault
-     */
+     *
-    private Boolean isdefault;
+     * @mbggenerated
-
+     */
-    /**
+    private Boolean isdefault;
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_account.Id
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_account.Id
+     * This method returns the value of the database column jsh_account.Id
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_account.Id
-     */
+     *
-    public Long getId() {
+     * @mbggenerated
-        return id;
+     */
-    }
+    public Long getId() {
-
+        return id;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_account.Id
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param id the value for jsh_account.Id
+     * This method sets the value of the database column jsh_account.Id
-     *
+     *
-     * @mbggenerated
+     * @param id the value for jsh_account.Id
-     */
+     *
-    public void setId(Long id) {
+     * @mbggenerated
-        this.id = id;
+     */
-    }
+    public void setId(Long id) {
-
+        this.id = id;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_account.Name
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_account.Name
+     * This method returns the value of the database column jsh_account.Name
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_account.Name
-     */
+     *
-    public String getName() {
+     * @mbggenerated
-        return name;
+     */
-    }
+    public String getName() {
-
+        return name;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_account.Name
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param name the value for jsh_account.Name
+     * This method sets the value of the database column jsh_account.Name
-     *
+     *
-     * @mbggenerated
+     * @param name the value for jsh_account.Name
-     */
+     *
-    public void setName(String name) {
+     * @mbggenerated
-        this.name = name == null ? null : name.trim();
+     */
-    }
+    public void setName(String name) {
-
+        this.name = name == null ? null : name.trim();
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_account.SerialNo
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_account.SerialNo
+     * This method returns the value of the database column jsh_account.SerialNo
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_account.SerialNo
-     */
+     *
-    public String getSerialno() {
+     * @mbggenerated
-        return serialno;
+     */
-    }
+    public String getSerialno() {
-
+        return serialno;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_account.SerialNo
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param serialno the value for jsh_account.SerialNo
+     * This method sets the value of the database column jsh_account.SerialNo
-     *
+     *
-     * @mbggenerated
+     * @param serialno the value for jsh_account.SerialNo
-     */
+     *
-    public void setSerialno(String serialno) {
+     * @mbggenerated
-        this.serialno = serialno == null ? null : serialno.trim();
+     */
-    }
+    public void setSerialno(String serialno) {
-
+        this.serialno = serialno == null ? null : serialno.trim();
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_account.InitialAmount
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_account.InitialAmount
+     * This method returns the value of the database column jsh_account.InitialAmount
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_account.InitialAmount
-     */
+     *
-    public Double getInitialamount() {
+     * @mbggenerated
-        return initialamount;
+     */
-    }
+    public BigDecimal getInitialamount() {
-
+        return initialamount;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_account.InitialAmount
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param initialamount the value for jsh_account.InitialAmount
+     * This method sets the value of the database column jsh_account.InitialAmount
-     *
+     *
-     * @mbggenerated
+     * @param initialamount the value for jsh_account.InitialAmount
-     */
+     *
-    public void setInitialamount(Double initialamount) {
+     * @mbggenerated
-        this.initialamount = initialamount;
+     */
-    }
+    public void setInitialamount(BigDecimal initialamount) {
-
+        this.initialamount = initialamount;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_account.CurrentAmount
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_account.CurrentAmount
+     * This method returns the value of the database column jsh_account.CurrentAmount
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_account.CurrentAmount
-     */
+     *
-    public Double getCurrentamount() {
+     * @mbggenerated
-        return currentamount;
+     */
-    }
+    public BigDecimal getCurrentamount() {
-
+        return currentamount;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_account.CurrentAmount
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param currentamount the value for jsh_account.CurrentAmount
+     * This method sets the value of the database column jsh_account.CurrentAmount
-     *
+     *
-     * @mbggenerated
+     * @param currentamount the value for jsh_account.CurrentAmount
-     */
+     *
-    public void setCurrentamount(Double currentamount) {
+     * @mbggenerated
-        this.currentamount = currentamount;
+     */
-    }
+    public void setCurrentamount(BigDecimal currentamount) {
-
+        this.currentamount = currentamount;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_account.Remark
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_account.Remark
+     * This method returns the value of the database column jsh_account.Remark
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_account.Remark
-     */
+     *
-    public String getRemark() {
+     * @mbggenerated
-        return remark;
+     */
-    }
+    public String getRemark() {
-
+        return remark;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_account.Remark
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param remark the value for jsh_account.Remark
+     * This method sets the value of the database column jsh_account.Remark
-     *
+     *
-     * @mbggenerated
+     * @param remark the value for jsh_account.Remark
-     */
+     *
-    public void setRemark(String remark) {
+     * @mbggenerated
-        this.remark = remark == null ? null : remark.trim();
+     */
-    }
+    public void setRemark(String remark) {
-
+        this.remark = remark == null ? null : remark.trim();
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_account.IsDefault
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_account.IsDefault
+     * This method returns the value of the database column jsh_account.IsDefault
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_account.IsDefault
-     */
+     *
-    public Boolean getIsdefault() {
+     * @mbggenerated
-        return isdefault;
+     */
-    }
+    public Boolean getIsdefault() {
-
+        return isdefault;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_account.IsDefault
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param isdefault the value for jsh_account.IsDefault
+     * This method sets the value of the database column jsh_account.IsDefault
-     *
+     *
-     * @mbggenerated
+     * @param isdefault the value for jsh_account.IsDefault
-     */
+     *
-    public void setIsdefault(Boolean isdefault) {
+     * @mbggenerated
-        this.isdefault = isdefault;
+     */
-    }
+    public void setIsdefault(Boolean isdefault) {
+        this.isdefault = isdefault;
+    }
 }

src/main/java/com/jsh/erp/datasource/entities/AccountHead.java

@@ -1,325 +1,326 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.util.Date;
+import java.math.BigDecimal;
-
+import java.util.Date;
-public class AccountHead {
+
-    /**
+public class AccountHead {
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.Id
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.Id
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private Long id;
+     */
-
+    private Long id;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.Type
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.Type
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private String type;
+     */
-
+    private String type;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.OrganId
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.OrganId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private Long organid;
+     */
-
+    private Long organid;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.HandsPersonId
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.HandsPersonId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private Long handspersonid;
+     */
-
+    private Long handspersonid;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.ChangeAmount
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.ChangeAmount
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private Double changeamount;
+     */
-
+    private BigDecimal changeamount;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.TotalPrice
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.TotalPrice
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private Double totalprice;
+     */
-
+    private BigDecimal totalprice;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.AccountId
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.AccountId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private Long accountid;
+     */
-
+    private Long accountid;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.BillNo
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.BillNo
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private String billno;
+     */
-
+    private String billno;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.BillTime
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.BillTime
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private Date billtime;
+     */
-
+    private Date billtime;
-    /**
+
-     * This field was generated by MyBatis Generator.
+    /**
-     * This field corresponds to the database column jsh_accounthead.Remark
+     * This field was generated by MyBatis Generator.
-     *
+     * This field corresponds to the database column jsh_accounthead.Remark
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    private String remark;
+     */
-
+    private String remark;
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.Id
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.Id
-     * @return the value of jsh_accounthead.Id
+     *
-     *
+     * @return the value of jsh_accounthead.Id
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public Long getId() {
+     */
-        return id;
+    public Long getId() {
-    }
+        return id;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.Id
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.Id
-     * @param id the value for jsh_accounthead.Id
+     *
-     *
+     * @param id the value for jsh_accounthead.Id
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setId(Long id) {
+     */
-        this.id = id;
+    public void setId(Long id) {
-    }
+        this.id = id;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.Type
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.Type
-     * @return the value of jsh_accounthead.Type
+     *
-     *
+     * @return the value of jsh_accounthead.Type
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public String getType() {
+     */
-        return type;
+    public String getType() {
-    }
+        return type;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.Type
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.Type
-     * @param type the value for jsh_accounthead.Type
+     *
-     *
+     * @param type the value for jsh_accounthead.Type
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setType(String type) {
+     */
-        this.type = type == null ? null : type.trim();
+    public void setType(String type) {
-    }
+        this.type = type == null ? null : type.trim();
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.OrganId
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.OrganId
-     * @return the value of jsh_accounthead.OrganId
+     *
-     *
+     * @return the value of jsh_accounthead.OrganId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public Long getOrganid() {
+     */
-        return organid;
+    public Long getOrganid() {
-    }
+        return organid;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.OrganId
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.OrganId
-     * @param organid the value for jsh_accounthead.OrganId
+     *
-     *
+     * @param organid the value for jsh_accounthead.OrganId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setOrganid(Long organid) {
+     */
-        this.organid = organid;
+    public void setOrganid(Long organid) {
-    }
+        this.organid = organid;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.HandsPersonId
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.HandsPersonId
-     * @return the value of jsh_accounthead.HandsPersonId
+     *
-     *
+     * @return the value of jsh_accounthead.HandsPersonId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public Long getHandspersonid() {
+     */
-        return handspersonid;
+    public Long getHandspersonid() {
-    }
+        return handspersonid;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.HandsPersonId
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.HandsPersonId
-     * @param handspersonid the value for jsh_accounthead.HandsPersonId
+     *
-     *
+     * @param handspersonid the value for jsh_accounthead.HandsPersonId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setHandspersonid(Long handspersonid) {
+     */
-        this.handspersonid = handspersonid;
+    public void setHandspersonid(Long handspersonid) {
-    }
+        this.handspersonid = handspersonid;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.ChangeAmount
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.ChangeAmount
-     * @return the value of jsh_accounthead.ChangeAmount
+     *
-     *
+     * @return the value of jsh_accounthead.ChangeAmount
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public Double getChangeamount() {
+     */
-        return changeamount;
+    public BigDecimal getChangeamount() {
-    }
+        return changeamount;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.ChangeAmount
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.ChangeAmount
-     * @param changeamount the value for jsh_accounthead.ChangeAmount
+     *
-     *
+     * @param changeamount the value for jsh_accounthead.ChangeAmount
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setChangeamount(Double changeamount) {
+     */
-        this.changeamount = changeamount;
+    public void setChangeamount(BigDecimal changeamount) {
-    }
+        this.changeamount = changeamount;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.TotalPrice
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.TotalPrice
-     * @return the value of jsh_accounthead.TotalPrice
+     *
-     *
+     * @return the value of jsh_accounthead.TotalPrice
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public Double getTotalprice() {
+     */
-        return totalprice;
+    public BigDecimal getTotalprice() {
-    }
+        return totalprice;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.TotalPrice
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.TotalPrice
-     * @param totalprice the value for jsh_accounthead.TotalPrice
+     *
-     *
+     * @param totalprice the value for jsh_accounthead.TotalPrice
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setTotalprice(Double totalprice) {
+     */
-        this.totalprice = totalprice;
+    public void setTotalprice(BigDecimal totalprice) {
-    }
+        this.totalprice = totalprice;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.AccountId
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.AccountId
-     * @return the value of jsh_accounthead.AccountId
+     *
-     *
+     * @return the value of jsh_accounthead.AccountId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public Long getAccountid() {
+     */
-        return accountid;
+    public Long getAccountid() {
-    }
+        return accountid;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.AccountId
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.AccountId
-     * @param accountid the value for jsh_accounthead.AccountId
+     *
-     *
+     * @param accountid the value for jsh_accounthead.AccountId
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setAccountid(Long accountid) {
+     */
-        this.accountid = accountid;
+    public void setAccountid(Long accountid) {
-    }
+        this.accountid = accountid;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.BillNo
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.BillNo
-     * @return the value of jsh_accounthead.BillNo
+     *
-     *
+     * @return the value of jsh_accounthead.BillNo
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public String getBillno() {
+     */
-        return billno;
+    public String getBillno() {
-    }
+        return billno;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.BillNo
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.BillNo
-     * @param billno the value for jsh_accounthead.BillNo
+     *
-     *
+     * @param billno the value for jsh_accounthead.BillNo
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setBillno(String billno) {
+     */
-        this.billno = billno == null ? null : billno.trim();
+    public void setBillno(String billno) {
-    }
+        this.billno = billno == null ? null : billno.trim();
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.BillTime
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.BillTime
-     * @return the value of jsh_accounthead.BillTime
+     *
-     *
+     * @return the value of jsh_accounthead.BillTime
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public Date getBilltime() {
+     */
-        return billtime;
+    public Date getBilltime() {
-    }
+        return billtime;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.BillTime
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.BillTime
-     * @param billtime the value for jsh_accounthead.BillTime
+     *
-     *
+     * @param billtime the value for jsh_accounthead.BillTime
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setBilltime(Date billtime) {
+     */
-        this.billtime = billtime;
+    public void setBilltime(Date billtime) {
-    }
+        this.billtime = billtime;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method returns the value of the database column jsh_accounthead.Remark
+     * This method was generated by MyBatis Generator.
-     *
+     * This method returns the value of the database column jsh_accounthead.Remark
-     * @return the value of jsh_accounthead.Remark
+     *
-     *
+     * @return the value of jsh_accounthead.Remark
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public String getRemark() {
+     */
-        return remark;
+    public String getRemark() {
-    }
+        return remark;
-
+    }
-    /**
+
-     * This method was generated by MyBatis Generator.
+    /**
-     * This method sets the value of the database column jsh_accounthead.Remark
+     * This method was generated by MyBatis Generator.
-     *
+     * This method sets the value of the database column jsh_accounthead.Remark
-     * @param remark the value for jsh_accounthead.Remark
+     *
-     *
+     * @param remark the value for jsh_accounthead.Remark
-     * @mbggenerated
+     *
-     */
+     * @mbggenerated
-    public void setRemark(String remark) {
+     */
-        this.remark = remark == null ? null : remark.trim();
+    public void setRemark(String remark) {
-    }
+        this.remark = remark == null ? null : remark.trim();
+    }
 }

src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java

@@ -1,136 +1,137 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.util.Date;
+import java.math.BigDecimal;
-
+import java.util.Date;
-public class AccountHeadVo4ListEx {
+
-
+public class AccountHeadVo4ListEx {
-    private Long id;
+
-
+    private Long id;
-    private String type;
+
-
+    private String type;
-    private Long organid;
+
-
+    private Long organid;
-    private Long handspersonid;
+
-
+    private Long handspersonid;
-    private Double changeamount;
+
-
+    private BigDecimal changeamount;
-    private Double totalprice;
+
-
+    private BigDecimal totalprice;
-    private Long accountid;
+
-
+    private Long accountid;
-    private String billno;
+
-
+    private String billno;
-    private Date billtime;
+
-
+    private Date billtime;
-    private String remark;
+
-
+    private String remark;
-    private String organname;
+
-
+    private String organname;
-    private String handspersonname;
+
-
+    private String handspersonname;
-    private String accountname;
+
-
+    private String accountname;
-    public Long getId() {
+
-        return id;
+    public Long getId() {
-    }
+        return id;
-
+    }
-    public void setId(Long id) {
+
-        this.id = id;
+    public void setId(Long id) {
-    }
+        this.id = id;
-
+    }
-    public String getType() {
+
-        return type;
+    public String getType() {
-    }
+        return type;
-
+    }
-    public void setType(String type) {
+
-        this.type = type;
+    public void setType(String type) {
-    }
+        this.type = type;
-
+    }
-    public Long getOrganid() {
+
-        return organid;
+    public Long getOrganid() {
-    }
+        return organid;
-
+    }
-    public void setOrganid(Long organid) {
+
-        this.organid = organid;
+    public void setOrganid(Long organid) {
-    }
+        this.organid = organid;
-
+    }
-    public Long getHandspersonid() {
+
-        return handspersonid;
+    public Long getHandspersonid() {
-    }
+        return handspersonid;
-
+    }
-    public void setHandspersonid(Long handspersonid) {
+
-        this.handspersonid = handspersonid;
+    public void setHandspersonid(Long handspersonid) {
-    }
+        this.handspersonid = handspersonid;
-
+    }
-    public Double getChangeamount() {
+
-        return changeamount;
+    public BigDecimal getChangeamount() {
-    }
+        return changeamount;
-
+    }
-    public void setChangeamount(Double changeamount) {
+
-        this.changeamount = changeamount;
+    public void setChangeamount(BigDecimal changeamount) {
-    }
+        this.changeamount = changeamount;
-
+    }
-    public Double getTotalprice() {
+
-        return totalprice;
+    public BigDecimal getTotalprice() {
-    }
+        return totalprice;
-
+    }
-    public void setTotalprice(Double totalprice) {
+
-        this.totalprice = totalprice;
+    public void setTotalprice(BigDecimal totalprice) {
-    }
+        this.totalprice = totalprice;
-
+    }
-    public Long getAccountid() {
+
-        return accountid;
+    public Long getAccountid() {
-    }
+        return accountid;
-
+    }
-    public void setAccountid(Long accountid) {
+
-        this.accountid = accountid;
+    public void setAccountid(Long accountid) {
-    }
+        this.accountid = accountid;
-
+    }
-    public String getBillno() {
+
-        return billno;
+    public String getBillno() {
-    }
+        return billno;
-
+    }
-    public void setBillno(String billno) {
+
-        this.billno = billno;
+    public void setBillno(String billno) {
-    }
+        this.billno = billno;
-
+    }
-    public Date getBilltime() {
+
-        return billtime;
+    public Date getBilltime() {
-    }
+        return billtime;
-
+    }
-    public void setBilltime(Date billtime) {
+
-        this.billtime = billtime;
+    public void setBilltime(Date billtime) {
-    }
+        this.billtime = billtime;
-
+    }
-    public String getRemark() {
+
-        return remark;
+    public String getRemark() {
-    }
+        return remark;
-
+    }
-    public void setRemark(String remark) {
+
-        this.remark = remark;
+    public void setRemark(String remark) {
-    }
+        this.remark = remark;
-
+    }
-    public String getOrganname() {
+
-        return organname;
+    public String getOrganname() {
-    }
+        return organname;
-
+    }
-    public void setOrganname(String organname) {
+
-        this.organname = organname;
+    public void setOrganname(String organname) {
-    }
+        this.organname = organname;
-
+    }
-    public String getHandspersonname() {
+
-        return handspersonname;
+    public String getHandspersonname() {
-    }
+        return handspersonname;
-
+    }
-    public void setHandspersonname(String handspersonname) {
+
-        this.handspersonname = handspersonname;
+    public void setHandspersonname(String handspersonname) {
-    }
+        this.handspersonname = handspersonname;
-
+    }
-    public String getAccountname() {
+
-        return accountname;
+    public String getAccountname() {
-    }
+        return accountname;
-
+    }
-    public void setAccountname(String accountname) {
+
-        this.accountname = accountname;
+    public void setAccountname(String accountname) {
-    }
+        this.accountname = accountname;
+    }
 }

src/main/java/com/jsh/erp/datasource/entities/AccountItem.java

@@ -1,195 +1,197 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-public class AccountItem {
+import java.math.BigDecimal;
-    /**
+
-     * This field was generated by MyBatis Generator.
+public class AccountItem {
-     * This field corresponds to the database column jsh_accountitem.Id
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_accountitem.Id
-     */
+     *
-    private Long id;
+     * @mbggenerated
-
+     */
-    /**
+    private Long id;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_accountitem.HeaderId
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_accountitem.HeaderId
-     */
+     *
-    private Long headerid;
+     * @mbggenerated
-
+     */
-    /**
+    private Long headerid;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_accountitem.AccountId
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_accountitem.AccountId
-     */
+     *
-    private Long accountid;
+     * @mbggenerated
-
+     */
-    /**
+    private Long accountid;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_accountitem.InOutItemId
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_accountitem.InOutItemId
-     */
+     *
-    private Long inoutitemid;
+     * @mbggenerated
-
+     */
-    /**
+    private Long inoutitemid;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_accountitem.EachAmount
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_accountitem.EachAmount
-     */
+     *
-    private Double eachamount;
+     * @mbggenerated
-
+     */
-    /**
+    private BigDecimal eachamount;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column jsh_accountitem.Remark
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_accountitem.Remark
-     */
+     *
-    private String remark;
+     * @mbggenerated
-
+     */
-    /**
+    private String remark;
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_accountitem.Id
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_accountitem.Id
+     * This method returns the value of the database column jsh_accountitem.Id
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_accountitem.Id
-     */
+     *
-    public Long getId() {
+     * @mbggenerated
-        return id;
+     */
-    }
+    public Long getId() {
-
+        return id;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_accountitem.Id
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param id the value for jsh_accountitem.Id
+     * This method sets the value of the database column jsh_accountitem.Id
-     *
+     *
-     * @mbggenerated
+     * @param id the value for jsh_accountitem.Id
-     */
+     *
-    public void setId(Long id) {
+     * @mbggenerated
-        this.id = id;
+     */
-    }
+    public void setId(Long id) {
-
+        this.id = id;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_accountitem.HeaderId
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_accountitem.HeaderId
+     * This method returns the value of the database column jsh_accountitem.HeaderId
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_accountitem.HeaderId
-     */
+     *
-    public Long getHeaderid() {
+     * @mbggenerated
-        return headerid;
+     */
-    }
+    public Long getHeaderid() {
-
+        return headerid;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_accountitem.HeaderId
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param headerid the value for jsh_accountitem.HeaderId
+     * This method sets the value of the database column jsh_accountitem.HeaderId
-     *
+     *
-     * @mbggenerated
+     * @param headerid the value for jsh_accountitem.HeaderId
-     */
+     *
-    public void setHeaderid(Long headerid) {
+     * @mbggenerated
-        this.headerid = headerid;
+     */
-    }
+    public void setHeaderid(Long headerid) {
-
+        this.headerid = headerid;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_accountitem.AccountId
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_accountitem.AccountId
+     * This method returns the value of the database column jsh_accountitem.AccountId
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_accountitem.AccountId
-     */
+     *
-    public Long getAccountid() {
+     * @mbggenerated
-        return accountid;
+     */
-    }
+    public Long getAccountid() {
-
+        return accountid;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_accountitem.AccountId
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param accountid the value for jsh_accountitem.AccountId
+     * This method sets the value of the database column jsh_accountitem.AccountId
-     *
+     *
-     * @mbggenerated
+     * @param accountid the value for jsh_accountitem.AccountId
-     */
+     *
-    public void setAccountid(Long accountid) {
+     * @mbggenerated
-        this.accountid = accountid;
+     */
-    }
+    public void setAccountid(Long accountid) {
-
+        this.accountid = accountid;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_accountitem.InOutItemId
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_accountitem.InOutItemId
+     * This method returns the value of the database column jsh_accountitem.InOutItemId
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_accountitem.InOutItemId
-     */
+     *
-    public Long getInoutitemid() {
+     * @mbggenerated
-        return inoutitemid;
+     */
-    }
+    public Long getInoutitemid() {
-
+        return inoutitemid;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_accountitem.InOutItemId
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param inoutitemid the value for jsh_accountitem.InOutItemId
+     * This method sets the value of the database column jsh_accountitem.InOutItemId
-     *
+     *
-     * @mbggenerated
+     * @param inoutitemid the value for jsh_accountitem.InOutItemId
-     */
+     *
-    public void setInoutitemid(Long inoutitemid) {
+     * @mbggenerated
-        this.inoutitemid = inoutitemid;
+     */
-    }
+    public void setInoutitemid(Long inoutitemid) {
-
+        this.inoutitemid = inoutitemid;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_accountitem.EachAmount
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_accountitem.EachAmount
+     * This method returns the value of the database column jsh_accountitem.EachAmount
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_accountitem.EachAmount
-     */
+     *
-    public Double getEachamount() {
+     * @mbggenerated
-        return eachamount;
+     */
-    }
+    public BigDecimal getEachamount() {
-
+        return eachamount;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_accountitem.EachAmount
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param eachamount the value for jsh_accountitem.EachAmount
+     * This method sets the value of the database column jsh_accountitem.EachAmount
-     *
+     *
-     * @mbggenerated
+     * @param eachamount the value for jsh_accountitem.EachAmount
-     */
+     *
-    public void setEachamount(Double eachamount) {
+     * @mbggenerated
-        this.eachamount = eachamount;
+     */
-    }
+    public void setEachamount(BigDecimal eachamount) {
-
+        this.eachamount = eachamount;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method returns the value of the database column jsh_accountitem.Remark
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @return the value of jsh_accountitem.Remark
+     * This method returns the value of the database column jsh_accountitem.Remark
-     *
+     *
-     * @mbggenerated
+     * @return the value of jsh_accountitem.Remark
-     */
+     *
-    public String getRemark() {
+     * @mbggenerated
-        return remark;
+     */
-    }
+    public String getRemark() {
-
+        return remark;
-    /**
+    }
-     * This method was generated by MyBatis Generator.
+
-     * This method sets the value of the database column jsh_accountitem.Remark
+    /**
-     *
+     * This method was generated by MyBatis Generator.
-     * @param remark the value for jsh_accountitem.Remark
+     * This method sets the value of the database column jsh_accountitem.Remark
-     *
+     *
-     * @mbggenerated
+     * @param remark the value for jsh_accountitem.Remark
-     */
+     *
-    public void setRemark(String remark) {
+     * @mbggenerated
-        this.remark = remark == null ? null : remark.trim();
+     */
-    }
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
 }

src/main/java/com/jsh/erp/datasource/entities/Depot.java

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

src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4Material.java

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

src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java

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

src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java

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

src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java

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

src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java

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

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java

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

src/main/java/com/jsh/erp/datasource/vo/AccountItemVo4List.java

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

src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java

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

src/main/java/com/jsh/erp/datasource/vo/AccountVo4List.java

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

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java

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

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java

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

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java

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

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4StatementAccount.java

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

src/main/java/com/jsh/erp/service/account/AccountService.java

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

src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java

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

src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java

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

src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

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

src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java

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

src/main/java/com/jsh/erp/service/supplier/SupplierService.java

@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -75,9 +76,9 @@ public class SupplierService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateAdvanceIn(Long supplierId, Double advanceIn){
+    public int updateAdvanceIn(Long supplierId, BigDecimal advanceIn){
         Supplier supplier = supplierMapper.selectByPrimaryKey(supplierId);
-        supplier.setAdvancein(supplier.getAdvancein() + advanceIn);  //增加预收款的金额，可能增加的是负值
+        supplier.setAdvancein(supplier.getAdvancein().add(advanceIn));  //增加预收款的金额，可能增加的是负值
         return supplierMapper.updateByPrimaryKeySelective(supplier);
     }
 

src/main/resources/mapper_xml/AccountHeadMapper.xml

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

src/main/resources/mapper_xml/AccountHeadMapperEx.xml

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

src/main/resources/mapper_xml/AccountItemMapper.xml

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

src/main/resources/mapper_xml/AccountMapper.xml

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

src/main/resources/mapper_xml/AccountMapperEx.xml

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

src/main/resources/mapper_xml/AssetMapper.xml

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

src/main/resources/mapper_xml/DepotHeadMapper.xml

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

src/main/resources/mapper_xml/DepotHeadMapperEx.xml

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

src/main/resources/mapper_xml/DepotItemMapper.xml

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

src/main/resources/mapper_xml/DepotItemMapperEx.xml

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

src/main/resources/mapper_xml/DepotMapper.xml

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

src/main/resources/mapper_xml/LogMapperEx.xml

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

src/main/resources/mapper_xml/MaterialMapper.xml

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

src/main/resources/mapper_xml/SupplierMapper.xml

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