DeXun/fad-l3
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: drop klp_pocketfactory/cgldb/double_rack and related code

Browse Source 
- Remove klp-pocket module entirely (acid/galvanize1/common)
- Remove klp-da OEE files (depended on pocket)
- Remove klp-wms Dr* files (double-rack)
- Strip double-rack code from WmsCoilPendingActionServiceImpl
- Remove acid/galvanize1/double-rack datasources from prod/dev yml
- Remove sql-server-api, da.oee, oee.acid config
This commit is contained in:
wangyu
2026-06-08 15:42:29 +08:00
parent 5cd31efef1
commit e793b19c41
2532 changed files with 13606 additions and 25940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
klp-cost/src/main/java/com/klp/cost/controller/CostItemController.java
View File

@@ -1,4 +1,4 @@
package com.klp.cost.controller;
package com.fad.cost.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.cost.domain.vo.CostItemVo;
import com.klp.cost.domain.bo.CostItemBo;
import com.klp.cost.service.ICostItemService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.cost.domain.vo.CostItemVo;
import com.fad.cost.domain.bo.CostItemBo;
import com.fad.cost.service.ICostItemService;
import com.fad.common.core.page.TableDataInfo;
/**
* 成本项目配置

28
klp-cost/src/main/java/com/klp/cost/controller/CostPriceController.java
View File

@@ -1,4 +1,4 @@
package com.klp.cost.controller;
package com.fad.cost.controller;
import java.util.List;
import java.util.Arrays;
@@ -9,19 +9,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.cost.domain.vo.CostPriceVo;
import com.klp.cost.domain.bo.CostPriceBo;
import com.klp.cost.service.ICostPriceService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.cost.domain.vo.CostPriceVo;
import com.fad.cost.domain.bo.CostPriceBo;
import com.fad.cost.service.ICostPriceService;
import com.fad.common.core.page.TableDataInfo;
/**
* 成本单价历史

28
klp-cost/src/main/java/com/klp/cost/controller/CostProdDetailController.java
View File

@@ -1,4 +1,4 @@
package com.klp.cost.controller;
package com.fad.cost.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.cost.domain.vo.CostProdDetailVo;
import com.klp.cost.domain.bo.CostProdDetailBo;
import com.klp.cost.service.ICostProdDetailService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.cost.domain.vo.CostProdDetailVo;
import com.fad.cost.domain.bo.CostProdDetailBo;
import com.fad.cost.service.ICostProdDetailService;
import com.fad.common.core.page.TableDataInfo;
/**
* 生产成本明细

28
klp-cost/src/main/java/com/klp/cost/controller/CostProdMetricController.java
View File

@@ -1,4 +1,4 @@
package com.klp.cost.controller;
package com.fad.cost.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.cost.domain.vo.CostProdMetricVo;
import com.klp.cost.domain.bo.CostProdMetricBo;
import com.klp.cost.service.ICostProdMetricService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.cost.domain.vo.CostProdMetricVo;
import com.fad.cost.domain.bo.CostProdMetricBo;
import com.fad.cost.service.ICostProdMetricService;
import com.fad.common.core.page.TableDataInfo;
/**
* 生产指标明细

28
klp-cost/src/main/java/com/klp/cost/controller/CostProdReportController.java
View File

@@ -1,4 +1,4 @@
package com.klp.cost.controller;
package com.fad.cost.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.cost.domain.vo.CostProdReportVo;
import com.klp.cost.domain.bo.CostProdReportBo;
import com.klp.cost.service.ICostProdReportService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.cost.domain.vo.CostProdReportVo;
import com.fad.cost.domain.bo.CostProdReportBo;
import com.fad.cost.service.ICostProdReportService;
import com.fad.common.core.page.TableDataInfo;
/**
* 生产月报

4
klp-cost/src/main/java/com/klp/cost/domain/CostItem.java
View File

@@ -1,7 +1,7 @@
package com.klp.cost.domain;
package com.fad.cost.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-cost/src/main/java/com/klp/cost/domain/CostPrice.java
View File

@@ -1,7 +1,7 @@
package com.klp.cost.domain;
package com.fad.cost.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-cost/src/main/java/com/klp/cost/domain/CostProdDetail.java
View File

@@ -1,7 +1,7 @@
package com.klp.cost.domain;
package com.fad.cost.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-cost/src/main/java/com/klp/cost/domain/CostProdMetric.java
View File

@@ -1,7 +1,7 @@
package com.klp.cost.domain;
package com.fad.cost.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-cost/src/main/java/com/klp/cost/domain/CostProdReport.java
View File

@@ -1,7 +1,7 @@
package com.klp.cost.domain;
package com.fad.cost.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.cost.domain.bo;
package com.fad.cost.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-cost/src/main/java/com/klp/cost/domain/bo/CostPriceBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.cost.domain.bo;
package com.fad.cost.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdDetailBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.cost.domain.bo;
package com.fad.cost.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.cost.domain.bo;
package com.fad.cost.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdReportBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.cost.domain.bo;
package com.fad.cost.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

6
klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java
View File

@@ -1,9 +1,9 @@
package com.klp.cost.domain.vo;
package com.fad.cost.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

6
klp-cost/src/main/java/com/klp/cost/domain/vo/CostPriceVo.java
View File

@@ -1,12 +1,12 @@
package com.klp.cost.domain.vo;
package com.fad.cost.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

6
klp-cost/src/main/java/com/klp/cost/domain/vo/CostProdDetailVo.java
View File

@@ -1,12 +1,12 @@
package com.klp.cost.domain.vo;
package com.fad.cost.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

6
klp-cost/src/main/java/com/klp/cost/domain/vo/CostProdMetricVo.java
View File

@@ -1,10 +1,10 @@
package com.klp.cost.domain.vo;
package com.fad.cost.domain.vo;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

6
klp-cost/src/main/java/com/klp/cost/domain/vo/CostProdReportVo.java
View File

@@ -1,12 +1,12 @@
package com.klp.cost.domain.vo;
package com.fad.cost.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

8
klp-cost/src/main/java/com/klp/cost/mapper/CostItemMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.cost.mapper;
package com.fad.cost.mapper;
import com.klp.cost.domain.CostItem;
import com.klp.cost.domain.vo.CostItemVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.cost.domain.CostItem;
import com.fad.cost.domain.vo.CostItemVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 成本项目配置Mapper接口

8
klp-cost/src/main/java/com/klp/cost/mapper/CostPriceMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.cost.mapper;
package com.fad.cost.mapper;
import com.klp.cost.domain.CostPrice;
import com.klp.cost.domain.vo.CostPriceVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.cost.domain.CostPrice;
import com.fad.cost.domain.vo.CostPriceVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 成本单价历史Mapper接口

8
klp-cost/src/main/java/com/klp/cost/mapper/CostProdDetailMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.cost.mapper;
package com.fad.cost.mapper;
import com.klp.cost.domain.CostProdDetail;
import com.klp.cost.domain.vo.CostProdDetailVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.cost.domain.CostProdDetail;
import com.fad.cost.domain.vo.CostProdDetailVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 生产成本明细Mapper接口

8
klp-cost/src/main/java/com/klp/cost/mapper/CostProdMetricMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.cost.mapper;
package com.fad.cost.mapper;
import com.klp.cost.domain.CostProdMetric;
import com.klp.cost.domain.vo.CostProdMetricVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.cost.domain.CostProdMetric;
import com.fad.cost.domain.vo.CostProdMetricVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 生产指标明细Mapper接口

8
klp-cost/src/main/java/com/klp/cost/mapper/CostProdReportMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.cost.mapper;
package com.fad.cost.mapper;
import com.klp.cost.domain.CostProdReport;
import com.klp.cost.domain.vo.CostProdReportVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.cost.domain.CostProdReport;
import com.fad.cost.domain.vo.CostProdReportVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 生产月报Mapper接口

12
klp-cost/src/main/java/com/klp/cost/service/ICostItemService.java
View File

@@ -1,10 +1,10 @@
package com.klp.cost.service;
package com.fad.cost.service;
import com.klp.cost.domain.CostItem;
import com.klp.cost.domain.vo.CostItemVo;
import com.klp.cost.domain.bo.CostItemBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.cost.domain.CostItem;
import com.fad.cost.domain.vo.CostItemVo;
import com.fad.cost.domain.bo.CostItemBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-cost/src/main/java/com/klp/cost/service/ICostPriceService.java
View File

@@ -1,10 +1,10 @@
package com.klp.cost.service;
package com.fad.cost.service;
import com.klp.cost.domain.CostPrice;
import com.klp.cost.domain.vo.CostPriceVo;
import com.klp.cost.domain.bo.CostPriceBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.cost.domain.CostPrice;
import com.fad.cost.domain.vo.CostPriceVo;
import com.fad.cost.domain.bo.CostPriceBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-cost/src/main/java/com/klp/cost/service/ICostProdDetailService.java
View File

@@ -1,10 +1,10 @@
package com.klp.cost.service;
package com.fad.cost.service;
import com.klp.cost.domain.CostProdDetail;
import com.klp.cost.domain.vo.CostProdDetailVo;
import com.klp.cost.domain.bo.CostProdDetailBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.cost.domain.CostProdDetail;
import com.fad.cost.domain.vo.CostProdDetailVo;
import com.fad.cost.domain.bo.CostProdDetailBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-cost/src/main/java/com/klp/cost/service/ICostProdMetricService.java
View File

@@ -1,10 +1,10 @@
package com.klp.cost.service;
package com.fad.cost.service;
import com.klp.cost.domain.CostProdMetric;
import com.klp.cost.domain.vo.CostProdMetricVo;
import com.klp.cost.domain.bo.CostProdMetricBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.cost.domain.CostProdMetric;
import com.fad.cost.domain.vo.CostProdMetricVo;
import com.fad.cost.domain.bo.CostProdMetricBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-cost/src/main/java/com/klp/cost/service/ICostProdReportService.java
View File

@@ -1,10 +1,10 @@
package com.klp.cost.service;
package com.fad.cost.service;
import com.klp.cost.domain.CostProdReport;
import com.klp.cost.domain.vo.CostProdReportVo;
import com.klp.cost.domain.bo.CostProdReportBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.cost.domain.CostProdReport;
import com.fad.cost.domain.vo.CostProdReportVo;
import com.fad.cost.domain.bo.CostProdReportBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

18
klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java
View File

@@ -1,19 +1,19 @@
package com.klp.cost.service.impl;
package com.fad.cost.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.cost.domain.bo.CostItemBo;
import com.klp.cost.domain.vo.CostItemVo;
import com.klp.cost.domain.CostItem;
import com.klp.cost.mapper.CostItemMapper;
import com.klp.cost.service.ICostItemService;
import com.fad.cost.domain.bo.CostItemBo;
import com.fad.cost.domain.vo.CostItemVo;
import com.fad.cost.domain.CostItem;
import com.fad.cost.mapper.CostItemMapper;
import com.fad.cost.service.ICostItemService;
import java.util.List;
import java.util.Map;

16
klp-cost/src/main/java/com/klp/cost/service/impl/CostPriceServiceImpl.java
View File

@@ -1,18 +1,18 @@
package com.klp.cost.service.impl;
package com.fad.cost.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.cost.domain.bo.CostPriceBo;
import com.klp.cost.domain.vo.CostPriceVo;
import com.klp.cost.domain.CostPrice;
import com.klp.cost.mapper.CostPriceMapper;
import com.klp.cost.service.ICostPriceService;
import com.fad.cost.domain.bo.CostPriceBo;
import com.fad.cost.domain.vo.CostPriceVo;
import com.fad.cost.domain.CostPrice;
import com.fad.cost.mapper.CostPriceMapper;
import com.fad.cost.service.ICostPriceService;
import java.util.List;
import java.util.Map;

18
klp-cost/src/main/java/com/klp/cost/service/impl/CostProdDetailServiceImpl.java
View File

@@ -1,21 +1,21 @@
package com.klp.cost.service.impl;
package com.fad.cost.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.klp.cost.domain.bo.CostProdDetailBo;
import com.klp.cost.domain.vo.CostProdDetailVo;
import com.klp.cost.domain.CostProdDetail;
import com.klp.cost.mapper.CostProdDetailMapper;
import com.klp.cost.service.ICostProdDetailService;
import com.fad.cost.domain.bo.CostProdDetailBo;
import com.fad.cost.domain.vo.CostProdDetailVo;
import com.fad.cost.domain.CostProdDetail;
import com.fad.cost.mapper.CostProdDetailMapper;
import com.fad.cost.service.ICostProdDetailService;
import java.util.List;
import java.util.Map;

18
klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricServiceImpl.java
View File

@@ -1,19 +1,19 @@
package com.klp.cost.service.impl;
package com.fad.cost.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.cost.domain.bo.CostProdMetricBo;
import com.klp.cost.domain.vo.CostProdMetricVo;
import com.klp.cost.domain.CostProdMetric;
import com.klp.cost.mapper.CostProdMetricMapper;
import com.klp.cost.service.ICostProdMetricService;
import com.fad.cost.domain.bo.CostProdMetricBo;
import com.fad.cost.domain.vo.CostProdMetricVo;
import com.fad.cost.domain.CostProdMetric;
import com.fad.cost.mapper.CostProdMetricMapper;
import com.fad.cost.service.ICostProdMetricService;
import java.util.List;
import java.util.Map;

22
klp-cost/src/main/java/com/klp/cost/service/impl/CostProdReportServiceImpl.java
View File

@@ -1,24 +1,24 @@
package com.klp.cost.service.impl;
package com.fad.cost.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.cost.domain.bo.CostProdReportBo;
import com.klp.cost.domain.vo.CostProdReportVo;
import com.klp.cost.domain.CostProdReport;
import com.klp.cost.domain.CostProdMetric;
import com.klp.cost.mapper.CostProdReportMapper;
import com.klp.cost.mapper.CostProdMetricMapper;
import com.klp.cost.service.ICostProdReportService;
import com.fad.cost.domain.bo.CostProdReportBo;
import com.fad.cost.domain.vo.CostProdReportVo;
import com.fad.cost.domain.CostProdReport;
import com.fad.cost.domain.CostProdMetric;
import com.fad.cost.mapper.CostProdReportMapper;
import com.fad.cost.mapper.CostProdMetricMapper;
import com.fad.cost.service.ICostProdReportService;
import java.util.List;
import java.util.Map;

4
klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.cost.mapper.CostItemMapper">
<mapper namespace="com.fad.cost.mapper.CostItemMapper">
<resultMap type="com.klp.cost.domain.CostItem" id="CostItemResult">
<resultMap type="com.fad.cost.domain.CostItem" id="CostItemResult">
<result property="itemId" column="item_id"/>
<result property="itemCode" column="item_code"/>
<result property="itemName" column="item_name"/>

4
klp-cost/src/main/resources/mapper/cost/CostPriceMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.cost.mapper.CostPriceMapper">
<mapper namespace="com.fad.cost.mapper.CostPriceMapper">
<resultMap type="com.klp.cost.domain.CostPrice" id="CostPriceResult">
<resultMap type="com.fad.cost.domain.CostPrice" id="CostPriceResult">
<result property="priceId" column="price_id"/>
<result property="itemId" column="item_id"/>
<result property="price" column="price"/>

4
klp-cost/src/main/resources/mapper/cost/CostProdDetailMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.cost.mapper.CostProdDetailMapper">
<mapper namespace="com.fad.cost.mapper.CostProdDetailMapper">
<resultMap type="com.klp.cost.domain.CostProdDetail" id="CostProdDetailResult">
<resultMap type="com.fad.cost.domain.CostProdDetail" id="CostProdDetailResult">
<result property="detailId" column="detail_id"/>
<result property="reportId" column="report_id"/>
<result property="shift" column="shift"/>

4
klp-cost/src/main/resources/mapper/cost/CostProdMetricMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.cost.mapper.CostProdMetricMapper">
<mapper namespace="com.fad.cost.mapper.CostProdMetricMapper">
<resultMap type="com.klp.cost.domain.CostProdMetric" id="CostProdMetricResult">
<resultMap type="com.fad.cost.domain.CostProdMetric" id="CostProdMetricResult">
<result property="metricId" column="metric_id"/>
<result property="reportId" column="report_id"/>
<result property="metricCode" column="metric_code"/>

4
klp-cost/src/main/resources/mapper/cost/CostProdReportMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.cost.mapper.CostProdReportMapper">
<mapper namespace="com.fad.cost.mapper.CostProdReportMapper">
<resultMap type="com.klp.cost.domain.CostProdReport" id="CostProdReportResult">
<resultMap type="com.fad.cost.domain.CostProdReport" id="CostProdReportResult">
<result property="reportId" column="report_id"/>
<result property="reportTitle" column="report_title"/>
<result property="reportDate" column="report_date"/>