!16 修复一系列问题

Merge pull request !16 from 乾坤平台/master

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

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

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

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

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

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

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

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

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

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