From b023ce65f606ca470503166090f5afe902b218f4 Mon Sep 17 00:00:00 2001 From: king Date: Fri, 13 Mar 2026 10:52:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=80=E5=94=AE=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/job/GenerateBusinessRealJob.java | 1 + .../config/job/GenerateStLotJob.java | 8 ++-- .../config/job/GenerateStProductAvlJob.java | 7 +-- .../config/job/GenerateStProductJob.java | 8 ++-- .../framework/entity/GrBiFsBusinessReal.java | 9 ++-- .../core/framework/entity/GrBiStLot.java | 7 +-- .../core/framework/entity/GrBiStProduct.java | 9 ++-- .../framework/entity/GrBiStProductAvl.java | 6 ++- .../service/impl/GrBiStLotServiceImpl.java | 13 ++--- .../framework/GrBiFsBusinessRealMapper.xml | 33 +++++++------ .../mapper/framework/GrBiStLotMapper.xml | 48 +++++++++---------- .../framework/GrBiStProductAvlMapper.xml | 34 ++++++------- .../mapper/framework/GrBiStProductMapper.xml | 26 +++++----- 13 files changed, 108 insertions(+), 101 deletions(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java index 1b3f485..230d1aa 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateBusinessRealJob.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; /** + * 经营指标完成情况 * oracle gr_bi_fs_business_real -> mysql gr_bi_fs_business_real */ @Slf4j diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java index b32e03b..148f837 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStLotJob.java @@ -1,6 +1,5 @@ package com.lideeyunji.core.framework.config.job; -import com.lideeyunji.core.framework.service.IGrBiFsBusinessRealService; import com.lideeyunji.core.framework.service.IGrBiStLotService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; @@ -10,6 +9,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; /** + * 物料产品库存统计表 * oracle gr_bi_st_lot -> mysql gr_bi_st_lot */ @Slf4j @@ -21,9 +21,9 @@ public class GenerateStLotJob implements JobHandler { @Override public String execute(String param) throws Exception { - log.info("*********** 开始生成物料产品库存统计表完成情况 ************"); + log.info("*********** 开始生成物料产品库存统计表 ************"); grBiFsStLotService.generateStLot(lideeYunJiBaseConstant.DS_ERP_BI_DATA); - log.info("*********** 生成物料产品库存统计表完成情况完成 ************"); - return "*********** 生成物料产品库存统计表完成情况完成 ************"; + log.info("*********** 生成物料产品库存统计表完成 ************"); + return "*********** 生成物料产品库存统计表完成 ************"; } } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java index 1338777..7590326 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductAvlJob.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; /** + * 产品可销库存对象 * oracle gr_bi_st_product_avl -> mysql gr_bi_st_product_avl */ @Slf4j @@ -20,9 +21,9 @@ public class GenerateStProductAvlJob implements JobHandler { @Override public String execute(String param) throws Exception { - log.info("*********** 开始生成产品可销库存对象完成情况 ************"); + log.info("*********** 开始生成产品可销库存对象 ************"); grBiFsStProductAvlService.generateStProductAvl(lideeYunJiBaseConstant.DS_ERP_BI_DATA); - log.info("*********** 生成产品可销库存对象完成情况完成 ************"); - return "*********** 生成产品可销库存对象完成情况完成 ************"; + log.info("*********** 生成产品可销库存对象完成 ************"); + return "*********** 生成产品可销库存对象完成 ************"; } } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java index ce73c32..e4f9174 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/GenerateStProductJob.java @@ -1,6 +1,5 @@ package com.lideeyunji.core.framework.config.job; -import com.lideeyunji.core.framework.service.IGrBiStLotService; import com.lideeyunji.core.framework.service.IGrBiStProductService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler; @@ -10,6 +9,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; /** + * 库存产品占比表对象 * oracle gr_bi_st_product -> mysql gr_bi_st_product */ @Slf4j @@ -21,9 +21,9 @@ public class GenerateStProductJob implements JobHandler { @Override public String execute(String param) throws Exception { - log.info("*********** 开始生成库存产品占比表对象完成情况 ************"); + log.info("*********** 开始生成库存产品占比表对象 ************"); grBiFsStProductService.generateStProduct(lideeYunJiBaseConstant.DS_ERP_BI_DATA); - log.info("*********** 生成库存产品占比表对象完成情况完成 ************"); - return "*********** 生成库存产品占比表对象完成情况完成 ************"; + log.info("*********** 生成库存产品占比表对象完成 ************"); + return "*********** 生成库存产品占比表对象完成 ************"; } } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiFsBusinessReal.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiFsBusinessReal.java index c1645c4..6c4bab7 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiFsBusinessReal.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiFsBusinessReal.java @@ -4,10 +4,13 @@ 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; + /** * 经营指标完成情况对象 gr_bi_fs_business_real * @@ -16,13 +19,11 @@ import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity; */ @TableName("gr_bi_fs_business_real") @Data -@EqualsAndHashCode(callSuper = true) -public class GrBiFsBusinessReal extends BaseTenantEntity -{ +public class GrBiFsBusinessReal implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "ID", type = IdType.INPUT) - private String ID; + private Long id; @TableField(value = "USEYEAR") private String useYear; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStLot.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStLot.java index 9a08618..1b80c48 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStLot.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStLot.java @@ -1,5 +1,6 @@ package com.lideeyunji.core.framework.entity; +import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; @@ -7,6 +8,7 @@ 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; @@ -19,8 +21,7 @@ import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity; */ @TableName("gr_bi_st_lot") @Data -@EqualsAndHashCode(callSuper = true) -public class GrBiStLot extends BaseTenantEntity +public class GrBiStLot implements Serializable { private static final long serialVersionUID = 1L; @@ -55,7 +56,7 @@ public class GrBiStLot extends BaseTenantEntity private Long goodsQty; @TableField(value = "PRODDATE") - private Date proddate; + private Date prodDate; @TableField(value = "INVALIDDATE") private String invalidDate; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProduct.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProduct.java index 08f31a6..a48eff4 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProduct.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProduct.java @@ -8,6 +8,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity; +import java.io.Serializable; + /** * 库存产品占比表对象 gr_bi_st_product * @@ -16,8 +18,7 @@ import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity; */ @TableName("gr_bi_st_product") @Data -@EqualsAndHashCode(callSuper = true) -public class GrBiStProduct extends BaseTenantEntity +public class GrBiStProduct implements Serializable { private static final long serialVersionUID = 1L; @@ -34,10 +35,10 @@ public class GrBiStProduct extends BaseTenantEntity private String goodsType; @TableField(value = "GOODSUNIT") - private String goodsunit; + private String goodsUnit; @TableField(value = "GOODSCLASSID") - private Long goodsclassid; + private Long goodsClassId; @TableField(value = "GOODSCLASSNAME") private String goodsClassName; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProductAvl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProductAvl.java index cd1545c..7054d8f 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProductAvl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiStProductAvl.java @@ -4,10 +4,13 @@ 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; + /** * 产品可销库存对象 gr_bi_st_product_avl * @@ -16,8 +19,7 @@ import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity; */ @TableName("gr_bi_st_product_avl") @Data -@EqualsAndHashCode(callSuper = true) -public class GrBiStProductAvl extends BaseTenantEntity +public class GrBiStProductAvl implements Serializable { private static final long serialVersionUID = 1L; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiStLotServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiStLotServiceImpl.java index d13bde1..9008652 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiStLotServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiStLotServiceImpl.java @@ -1,19 +1,16 @@ package com.lideeyunji.core.framework.service.impl; -import java.time.LocalDateTime; -import java.util.List; - import cn.hutool.core.collection.CollUtil; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lideeyunji.core.framework.entity.GrBiFsBusinessReal; +import com.lideeyunji.core.framework.entity.GrBiStLot; +import com.lideeyunji.core.framework.mapper.GrBiStLotMapper; +import com.lideeyunji.core.framework.service.IGrBiStLotService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import com.lideeyunji.core.framework.mapper.GrBiStLotMapper; -import com.lideeyunji.core.framework.entity.GrBiStLot; -import com.lideeyunji.core.framework.service.IGrBiStLotService; + +import java.util.List; /** * 物料产品库存统计表Service业务层处理 diff --git a/lidee-core/src/main/resources/mapper/framework/GrBiFsBusinessRealMapper.xml b/lidee-core/src/main/resources/mapper/framework/GrBiFsBusinessRealMapper.xml index 102a245..4ae2343 100644 --- a/lidee-core/src/main/resources/mapper/framework/GrBiFsBusinessRealMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/GrBiFsBusinessRealMapper.xml @@ -4,13 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - + + + + + + + @@ -21,16 +21,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, USEYEAR, USEMONTH, ITEMID, ITEMNAME, ITEMORDER, MONTH_REAL, YEAR_REAL, MONTH_DIFF, YEAR_PLAN, YEAR_RATE from gr_bi_fs_business_real - - a.USEYEAR is not NULL - and (a.USEYEAR * 100 + a.USEMONTH) BETWEEN #{pastYearMonth} AND #{currentYearMonth} + USEYEAR is not NULL + and (USEYEAR * 100 + USEMONTH) BETWEEN #{pastYearMonth} AND #{currentYearMonth} - order by a.USEYEAR, a.USEMONTH + order by USEYEAR, USEMONTH - - and ID = #{ID} @@ -52,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{ID} - + insert into gr_bi_fs_business_real ID, @@ -82,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update gr_bi_fs_business_real USEYEAR = #{USEYEAR}, diff --git a/lidee-core/src/main/resources/mapper/framework/GrBiStLotMapper.xml b/lidee-core/src/main/resources/mapper/framework/GrBiStLotMapper.xml index 9ae1c26..df77cb1 100644 --- a/lidee-core/src/main/resources/mapper/framework/GrBiStLotMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/GrBiStLotMapper.xml @@ -4,34 +4,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + select ID, GOODSID, GOODSNAME, GOODSTYPE, GOODSUNIT, CLASSID, CLASSNAME, LOTID, LOTNO, GOODSQTY, PRODDATE, INVALIDDATE, INVALIDDAYS, STINDATE, STOUTDATE, INVALIDDAYSTYPEID, INVALIDDAYSTYPE, OUTTYPE, STORAGEID, STORAGENAME from gr_bi_st_lot - and ID = #{ID} @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{ID} - + insert into gr_bi_st_lot ID, @@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update gr_bi_st_lot GOODSID = #{GOODSID}, diff --git a/lidee-core/src/main/resources/mapper/framework/GrBiStProductAvlMapper.xml b/lidee-core/src/main/resources/mapper/framework/GrBiStProductAvlMapper.xml index e9503a9..b9617d4 100644 --- a/lidee-core/src/main/resources/mapper/framework/GrBiStProductAvlMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/GrBiStProductAvlMapper.xml @@ -4,27 +4,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + select ID, GOODSID, GOODSNAME, GOODSTYPE, GOODSUNIT, PACKSIZE, SORT, SEMIREM, TODAYIN, REM, THISMONTHOUT, LASTMONTHOUT, THISYEAROUT from gr_bi_st_product_avl - and ID = #{ID} @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{ID} - + insert into gr_bi_st_product_avl ID, @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update gr_bi_st_product_avl GOODSID = #{GOODSID}, diff --git a/lidee-core/src/main/resources/mapper/framework/GrBiStProductMapper.xml b/lidee-core/src/main/resources/mapper/framework/GrBiStProductMapper.xml index a1f3f1a..ccde60e 100644 --- a/lidee-core/src/main/resources/mapper/framework/GrBiStProductMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/GrBiStProductMapper.xml @@ -4,17 +4,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - + + + + + + + + + - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, GOODSID, GOODSNAME, GOODSTYPE, GOODSUNIT, GOODSCLASSID, GOODSCLASSNAME, QTY, QTY_PROP, MONEY, MONEY_PROP from gr_bi_st_product - and ID = #{ID} @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{ID} - + insert into gr_bi_st_product ID, @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update gr_bi_st_product GOODSID = #{GOODSID},