From 3256852a640f61a3b8da8ff7cbbbcbc1029c3342 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 10 Sep 2024 18:06:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=B0=83=E6=95=B4=E5=92=8C=E6=99=BA=E8=83=BD=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在工作日志模块中，修改了日志实例控制器、映射器和VO类，以支持新的查询条件和日期格式。 - 在智能工厂模块中，添加了新的控制器方法和VO类，以支持获取各个工厂的出入库数据总数和指定工厂指定日期的出入库规格明细详情。- 对应更新了相关服务和数据访问对象，以支持新增的业务逻辑。 - 重构了一些代码，以提高代码质量和可维护性。 --- .../admin/worklog/LogInstanceController.java | 1 - .../vo/loginstance/LogInstancePageReqVO.java | 4 +- .../worklog/LogInstanceServiceImpl.java | 4 +- .../mapper/worklog/LogInstanceMapper.xml | 6 +- .../factorydata/FactoryDataController.java | 68 +++++++++++++- .../factorydata/vo/FactoryDataPageReqVO.java | 3 + .../factorydata/vo/FactoryDataTotalVO.java | 6 ++ .../vo/sizeData/FactoryDataSizeTotalVO.java | 24 +++++ .../mysql/factorydata/FactoryDataMapper.java | 5 +- .../factorydata/FactoryDataSizeMapper.java | 6 +- .../factorydata/FactoryDataService.java | 7 +- .../factorydata/FactoryDataServiceImpl.java | 11 ++- .../factorydata/FactoryDataSizeService.java | 9 ++ .../FactoryDataSizeServiceImpl.java | 7 ++ .../mapper/factorydata/FactoryDataMapper.xml | 93 +++++++++++-------- .../factorydata/FactoryDataSizeMapper.xml | 31 +++++++ 16 files changed, 226 insertions(+), 59 deletions(-) create mode 100644 zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeTotalVO.java diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java index 5a98d0eb..14f022b7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java @@ -118,7 +118,6 @@ public class LogInstanceController { return success(logInstance); } - @PostMapping("/getNextOrUp") @Operation(summary = "获取上一篇下一篇日志") public CommonResult getNextOrUp(@RequestBody LogInstancePageReqVO dto, diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java index 36bd6ab1..bd9ec41e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; +import java.time.LocalDate; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -37,7 +37,7 @@ public class LogInstancePageReqVO extends PageParam { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; + private LocalDate[] createTime; @Schema(description = "已读、未读 | 0：未读、1：已读", example = "0") private Integer readStatus; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java index 7dd02141..836a5159 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java @@ -29,7 +29,6 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -280,6 +279,9 @@ public class LogInstanceServiceImpl implements LogInstanceService { JSONObject workLogContentJson = new JSONObject(item.getFormVariables()); for (String fieldItem : fields) { JSONObject fieldJson = new JSONObject(fieldItem); + if ("upload".equals(fieldJson.getStr("type"))) { + continue; + } String fieldStr = fieldJson.getStr("field"); String title = fieldJson.getStr("title"); String field = workLogContentJson.getStr(fieldStr); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml index 9ce4214d..fe7361a1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml @@ -110,7 +110,7 @@ a.deleted = 0 - and a.type = #{reqVO.type} + and a.form_id = #{reqVO.formId} and a.dept_id = #{reqVO.deptId} @@ -120,10 +120,10 @@ - and a.create_time >= #{reqVO.createTime[0]} + and a.time >= #{reqVO.createTime[0]} - and a.create_time <= #{reqVO.createTime[1]} + and a.time <= #{reqVO.createTime[1]} diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/FactoryDataController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/FactoryDataController.java index 1f496b11..d872d895 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/FactoryDataController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/FactoryDataController.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.*; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeCreateReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeDetailRespVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.size.vo.SizeRespVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeTotalVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.size.SizeDO; @@ -29,6 +29,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -110,6 +113,11 @@ public class FactoryDataController { @PreAuthorize("@ss.hasPermission('smartfactory:factory-data:query')") public CommonResult getDataTotal(@Valid FactoryDataPageReqVO pageReqVO) { + if (pageReqVO.getDateType() != null) { + // 设置日期 + setDate(pageReqVO); + } + FactoryDataTotalVO dataTotalVO = dataService.getDataTotal(pageReqVO.getFactoryId(), pageReqVO.getDate()); if (dataTotalVO == null) { dataTotalVO = new FactoryDataTotalVO(); @@ -121,10 +129,32 @@ public class FactoryDataController { return success(dataTotalVO); } + @GetMapping("/get-totalByFactory") + @Operation(summary = "获得各个工厂出入库数据总数 | 入库总数、出库总数、破损总数") + @PreAuthorize("@ss.hasPermission('smartfactory:factory-data:query')") + public CommonResult> getDataTotalByFactory() { + + return success(dataService.getDataTotalByFactory()); + } + + @GetMapping("/getSizeTotalByFactory") + @Operation(summary = "获得指定工厂指定日期内，出入库规格明细详情") + @PreAuthorize("@ss.hasPermission('smartfactory:factory-data:query')") + public CommonResult> getSizeTotalByFactory(@Valid FactoryDataPageReqVO pageReqVO) { + + if (pageReqVO.getDateType() != null) { + // 设置日期 + setDate(pageReqVO); + } + + return success(factoryDataSizeService.getSizeTotalByFactory(pageReqVO.getFactoryId(), pageReqVO.getDate())); + } + @GetMapping("/page") @Operation(summary = "获得工厂出库入库数据分页") @PreAuthorize("@ss.hasPermission('smartfactory:factory-data:query')") public CommonResult> getDataPage(@Valid FactoryDataPageReqVO pageReqVO) { + PageResult pageResult = dataService.getDataPage(pageReqVO); return success(pageResult); } @@ -190,4 +220,40 @@ public class FactoryDataController { .collect(Collectors.toList()); return success(dataService.importUserList(list, type)); } + + public void setDate(FactoryDataPageReqVO pageReqVO) { + + LocalDate today = LocalDate.now(); + + // dateType = 1 为昨日数据 + if (pageReqVO.getDateType() == 1) { + + // 设置日期 + pageReqVO.setDate(new LocalDate[]{today.minusDays(1), today.minusDays(1)}); + } + // dateType = 2 为本周数据 + if (pageReqVO.getDateType() == 2) { + + // 获取本周的周一 + LocalDate startOfWeek = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + + // 获取本周的周日 + LocalDate endOfWeek = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); + + // 设置日期 + pageReqVO.setDate(new LocalDate[]{startOfWeek, endOfWeek}); + } + // dateType = 3 为本月数据 + if (pageReqVO.getDateType() == 3) { + + // 获取本月的第一天 + LocalDate startOfMonth = today.with(TemporalAdjusters.firstDayOfMonth()); + + // 获取本月的最后一天 + LocalDate endOfMonth = today.with(TemporalAdjusters.lastDayOfMonth()); + + // 设置日期 + pageReqVO.setDate(new LocalDate[]{startOfMonth, endOfMonth}); + } + } } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataPageReqVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataPageReqVO.java index 3af0b51b..4c73d8c9 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataPageReqVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataPageReqVO.java @@ -30,6 +30,9 @@ public class FactoryDataPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDate[] date; + @Schema(description = "时间类型 | 1日 2周 3月", example = "1") + private Integer dateType; + @Schema(description = "总箱数") private Integer totalNum; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataTotalVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataTotalVO.java index b277e107..c836fa9c 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataTotalVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/FactoryDataTotalVO.java @@ -7,6 +7,12 @@ import lombok.Data; @Data public class FactoryDataTotalVO { + @Schema(description = "工厂id") + private Long factoryId; + + @Schema(description = "工厂名称") + private String factoryName; + @Schema(description = "入库总数") private Integer inTotal; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeTotalVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeTotalVO.java new file mode 100644 index 00000000..c356b660 --- /dev/null +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factorydata/vo/sizeData/FactoryDataSizeTotalVO.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 工厂出库入库数据 总览 Request VO") +@Data +public class FactoryDataSizeTotalVO { + + @Schema(description = "工厂id") + private Long factoryId; + + @Schema(description = "规格名称") + private String sizeName; + + @Schema(description = "入库总数") + private Integer inTotal; + + @Schema(description = "出库总数") + private Integer outTotal; + + @Schema(description = "破损总数") + private Integer damageNum; +} diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java index 76bdff90..2cbce43d 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java @@ -1,14 +1,11 @@ package cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataInfoRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataPageReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataTotalVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataDO; -import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -43,5 +40,5 @@ public interface FactoryDataMapper extends BaseMapperX { FactoryDataTotalVO selectDataSum(@Param("factoryId") Long factoryId, @Param("date") LocalDate[] date); - + List selectDataSumByFactory(); } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataSizeMapper.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataSizeMapper.java index cdae92c7..3e2b691f 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataSizeMapper.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataSizeMapper.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataInfoRespVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeTotalVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -54,4 +53,7 @@ public interface FactoryDataSizeMapper extends BaseMapperX { List selectLastSize(@Param("factoryId") Long factoryId, @Param("types") List types); + + List selectSizeDataSumByFactory(@Param("factoryId") Long factoryId, + @Param("date") LocalDate[] date); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataService.java index 6136ecce..dc34620d 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataService.java @@ -5,7 +5,6 @@ import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.*; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeCreateReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeDetailRespVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataDO; -import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import javax.validation.Valid; import java.time.LocalDate; @@ -65,7 +64,11 @@ public interface FactoryDataService { */ FactoryDataTotalVO getDataTotal(Long factoryId, LocalDate[] date); - + /** + * 获得各个工厂出入库数据总数 + * @return 总数列表 + */ + List getDataTotalByFactory(); /** * 获取当天的所有数据 diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java index 3a4f6779..e1e9542b 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java @@ -11,18 +11,13 @@ import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.*; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeCreateReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeDetailRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeSaveReqVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.packagedata.vo.PackageDataCreateReqVO; -import cn.iocoder.yudao.module.smartfactory.convert.packageData.PackageDataConvert; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO; -import cn.iocoder.yudao.module.smartfactory.dal.dataobject.packagedata.PackageDataDO; import cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata.FactoryDataMapper; import cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata.FactoryDataSizeMapper; import cn.iocoder.yudao.module.smartfactory.framework.util.StringUtil; import cn.iocoder.yudao.module.smartfactory.service.factoryinfo.FactoryInfoService; -import cn.iocoder.yudao.module.smartfactory.service.packageInfo.PackageService; -import cn.iocoder.yudao.module.smartfactory.service.packagedata.PackageDataService; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -228,6 +223,12 @@ public class FactoryDataServiceImpl implements FactoryDataService { return dataMapper.selectDataSum(factoryId, date) == null ? new FactoryDataTotalVO() : dataMapper.selectDataSum(factoryId, date); } + @Override + public List getDataTotalByFactory() { + + return dataMapper.selectDataSumByFactory(); + } + @Override public List getTodayInboundAndOutboundOverview(Date time) { String timeStr = null; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeService.java index 60d0e051..cd399962 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeService.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.smartfactory.service.factorydata; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataInfoRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeCreateReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeTotalVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import javax.validation.Valid; @@ -59,4 +60,12 @@ public interface FactoryDataSizeService { * @return 规格详情列表 */ List getLastSize(Long factoryId, List dataTypes); + + /** + * 获得指定工厂指定日期内，出入库规格明细详情 + * @param factoryId 工厂编号 + * @param date 日期 + * @return 出入库规格明细详情 + */ + List getSizeTotalByFactory(Long factoryId, LocalDate[] date); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java index bfedefe5..00de0bc4 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataSizeServiceImpl.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataInfoRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeCreateReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeSaveReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.sizeData.FactoryDataSizeTotalVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataSizeDO; import cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata.FactoryDataSizeMapper; @@ -312,4 +313,10 @@ public class FactoryDataSizeServiceImpl implements FactoryDataSizeService{ return factoryDataSizeMapper.selectLastSize(factoryId, dataTypes); } + + @Override + public List getSizeTotalByFactory(Long factoryId, LocalDate[] date) { + + return factoryDataSizeMapper.selectSizeDataSumByFactory(factoryId, date); + } } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml index bbdffbef..3a319ea2 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataMapper.xml @@ -11,43 +11,43 @@ + + \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataSizeMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataSizeMapper.xml index f9eedfb2..872ce6b4 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataSizeMapper.xml +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factorydata/FactoryDataSizeMapper.xml @@ -92,4 +92,35 @@ #{types} + + + \ No newline at end of file