lazhaoqian 4 年 前
コミット
28e0699145

+ 4 - 3
ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TWarehousebillsCntr.java

@@ -1,5 +1,6 @@
 package com.ruoyi.shipping.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -42,7 +43,7 @@ public class TWarehousebillsCntr extends BaseEntity
 
     /** 单箱重(吨不能超过40) */
     @Excel(name = "单箱重(吨不能超过40)")
-    private Long fCntrweight;
+    private BigDecimal fCntrweight;
 
     /** 箱状态 */
     @Excel(name = "箱状态")
@@ -191,12 +192,12 @@ public class TWarehousebillsCntr extends BaseEntity
     {
         return fCntrcount;
     }
-    public void setfCntrweight(Long fCntrweight) 
+    public void setfCntrweight(BigDecimal fCntrweight)
     {
         this.fCntrweight = fCntrweight;
     }
 
-    public Long getfCntrweight() 
+    public BigDecimal getfCntrweight()
     {
         return fCntrweight;
     }

+ 4 - 3
ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TWarehousebillsCntritems.java

@@ -1,5 +1,6 @@
 package com.ruoyi.shipping.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -50,7 +51,7 @@ public class TWarehousebillsCntritems extends BaseEntity
 
     /** 单箱重(吨不能超过40) */
     @Excel(name = "单箱重(吨不能超过40)")
-    private Long fCntrweight;
+    private BigDecimal fCntrweight;
 
     /** 箱状态 */
     @Excel(name = "箱状态")
@@ -217,12 +218,12 @@ public class TWarehousebillsCntritems extends BaseEntity
     {
         return fCntrcount;
     }
-    public void setfCntrweight(Long fCntrweight) 
+    public void setfCntrweight(BigDecimal fCntrweight)
     {
         this.fCntrweight = fCntrweight;
     }
 
-    public Long getfCntrweight() 
+    public BigDecimal getfCntrweight()
     {
         return fCntrweight;
     }

+ 6 - 6
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -586,7 +586,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfPid(fPid);
                 cntr.setfGoodsid(0L);
                 cntr.setfPackageid("0");
-                cntr.setfCntrweight(0L);
+                cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
                 tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
@@ -1110,7 +1110,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfPid(fPid);
                 cntr.setfGoodsid(0L);
                 cntr.setfPackageid("0");
-                cntr.setfCntrweight(0L);
+                cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
                 tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
@@ -2462,7 +2462,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfPid(tWarehouseBills.getfId());
                 cntr.setfGoodsid(0L);
                 cntr.setfPackageid("0");
-                cntr.setfCntrweight(0L);
+                cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
                 tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
@@ -2709,7 +2709,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfPid(tWarehouseBills.getfId());
                 cntr.setfGoodsid(0L);
                 cntr.setfPackageid("0");
-                cntr.setfCntrweight(0L);
+                cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
                 tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
@@ -2859,7 +2859,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfPid(tWarehouseBills.getfId());
                 cntr.setfGoodsid(0L);
                 cntr.setfPackageid("0");
-                cntr.setfCntrweight(0L);
+                cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
                 tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
@@ -3626,7 +3626,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntr.setfPid(tWarehousebills.getfId());
                 cntr.setfGoodsid(0L);
                 cntr.setfPackageid("0");
-                cntr.setfCntrweight(0L);
+                cntr.setfCntrweight(new BigDecimal(0));
                 cntr.setCreateBy(loginUser.getUser().getUserName());
                 cntr.setCreateTime(new Date());
                 tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);