计算销售报表-定时任务逻辑调整

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStLot.java

@@ -1,17 +1,13 @@
 package com.lideeyunji.core.framework.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.lideeyunji.tool.framework.yunji.model.global.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
-import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 物料产品库存统计表对象 gr_bi_st_lot

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProduct.java

@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 库存产品占比表对象 gr_bi_st_product
@@ -44,16 +43,16 @@ public class GrBiStProduct implements Serializable
     private String goodsClassName;
 
     @TableField(value = "QTY")
-    private Long qty;
+    private BigDecimal qty;
 
     @TableField(value = "QTY_PROP")
-    private Long qtyProp;
+    private BigDecimal qtyProp;
 
     @TableField(value = "MONEY")
-    private Long money;
+    private BigDecimal money;
 
     @TableField(value = "MONEY_PROP")
-    private Long moneyProp;
+    private BigDecimal moneyProp;
 
 
 

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProductAvl.java

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.lideeyunji.tool.framework.yunji.model.global.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 产品可销库存对象 gr_bi_st_product_avl
@@ -45,21 +43,21 @@ public class GrBiStProductAvl implements Serializable
     private Long sort;
 
     @TableField(value = "SEMIREM")
-    private Long semiRem;
+    private BigDecimal semiRem;
 
     @TableField(value = "TODAYIN")
     private String todayIn;
 
     @TableField(value = "REM")
-    private Long rem;
+    private BigDecimal rem;
 
     @TableField(value = "THISMONTHOUT")
-    private Long thisMonthOut;
+    private BigDecimal thisMonthOut;
 
     @TableField(value = "LASTMONTHOUT")
-    private Long lastMonthOut;
+    private BigDecimal lastMonthOut;
 
     @TableField(value = "THISYEAROUT")
-    private Long thisYearOut;
+    private BigDecimal thisYearOut;
 
 }