From 2b5cd3f13d474d357d37410db16dcc97002be753 Mon Sep 17 00:00:00 2001 From: judy <278197488@qq.com> Date: Mon, 15 Jul 2024 11:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9C=B0=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shkj/wms/bo/SysStockNumQueryBo.java | 81 ++++++++++++ .../base/BaseLocationController.java | 11 ++ .../business/SysStockController.java | 13 ++ .../shkj/wms/mapper/BaseLocationMapper.java | 3 + .../com/shkj/wms/mapper/SysStockMapper.java | 8 +- .../shkj/wms/scheduled/ScheduledTasks.java | 4 +- .../wms/service/IBaseLocationService.java | 3 + .../service/impl/BaseLocationServiceImpl.java | 6 + .../wms/service/impl/SysStockServiceImpl.java | 5 + .../com/shkj/wms/vo/SysStockNumDetailVo.java | 116 ++++++++++++++++++ .../mapper/wms/BaseLocationMapper.xml | 38 ++++++ .../resources/mapper/wms/SysStockMapper.xml | 42 +++++++ 12 files changed, 324 insertions(+), 6 deletions(-) create mode 100644 shkj-wms/src/main/java/com/shkj/wms/bo/SysStockNumQueryBo.java create mode 100644 shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java diff --git a/shkj-wms/src/main/java/com/shkj/wms/bo/SysStockNumQueryBo.java b/shkj-wms/src/main/java/com/shkj/wms/bo/SysStockNumQueryBo.java new file mode 100644 index 0000000..a85513a --- /dev/null +++ b/shkj-wms/src/main/java/com/shkj/wms/bo/SysStockNumQueryBo.java @@ -0,0 +1,81 @@ +package com.shkj.wms.bo; + +import com.shkj.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 堆垛机任务异常记录分页查询对象 ecs_stacker_exception + * + * @author luochenghang + * @date 2022-07-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class SysStockNumQueryBo extends BaseEntity { + + /** 分页大小 */ + private Integer pageSize; + + /** 当前页数 */ + private Integer pageNum; + + /** 排序列 */ + private String orderByColumn; + + /** 排序的方向desc或者asc */ + private String isAsc; + + private String ptPart; + private String startDate; + private String endDate; + + /** + * 带时分秒的查询时间(操作入库时间) + */ + private String startTime; + private String endTime; + + /** + * 机种（即车型） + */ + private String ptBreakCat; + + /** + * 楼层 + */ + private String layer; + + /** + * 货位 + */ + private String location; + + /** + * 台车编号 + */ + private String containerCode; + + + /** + * 库龄 + */ + private Integer storageAge; + + /** + * 批次 + */ + private String batchNo; + + /** + * 期初开始时间 + */ + private String invTimeStart; + + /** + * 货位名称 + */ + private String locationCode; + +} diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/base/BaseLocationController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/base/BaseLocationController.java index 0816660..cd9264a 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/controller/base/BaseLocationController.java +++ b/shkj-wms/src/main/java/com/shkj/wms/controller/base/BaseLocationController.java @@ -95,4 +95,15 @@ public class BaseLocationController extends BaseController { public Result switchStatus(@Valid @RequestBody SwitchStatusEntity switchStatusEntity) { return iBaseLocationService.switchStatus(switchStatusEntity.getId(), switchStatusEntity.getIsuse()); } + + /** + * 查询货位--map + */ + @GetMapping("/getBaseLocationForMap") + public TableDataInfo getBaseLocationForMap(BaseLocationQueryPageBo bo) { + startPage(); + List list = iBaseLocationService.getBaseLocationForMap(bo); + return getDataTable(list); + } + } diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/business/SysStockController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/business/SysStockController.java index 220e221..0b91b06 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/controller/business/SysStockController.java +++ b/shkj-wms/src/main/java/com/shkj/wms/controller/business/SysStockController.java @@ -2,7 +2,9 @@ package com.shkj.wms.controller.business; import java.util.List; +import com.shkj.wms.bo.SysStockNumQueryBo; import com.shkj.wms.config.ValidList; +import com.shkj.wms.vo.SysStockNumDetailVo; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -97,5 +99,16 @@ public class SysStockController extends BaseController { return iSysStockService.deleteWithValidById(ids, true); } + /** + * 库存明细 + * @param bo + * @return + */ + @GetMapping("/queryStockDetailList") + public TableDataInfo> queryStockDetailList(SysStockNumQueryBo bo) { + startPage(); + List list = iSysStockService.queryStockDetailList(bo); + return getDataTable(list); + } } diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java index a740eb0..8e633b0 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java +++ b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java @@ -95,5 +95,8 @@ public interface BaseLocationMapper extends BaseMapper { List queryBaseLocationListByGoods( BaseLocationQueryListBo bo); + + List getBaseLocationForMap(BaseLocationQueryPageBo bo); + } diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockMapper.java index 122d064..8755d81 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockMapper.java +++ b/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockMapper.java @@ -1,13 +1,11 @@ package com.shkj.wms.mapper; import com.shkj.wms.bo.SysReportStockQueryBo; +import com.shkj.wms.bo.SysStockNumQueryBo; import com.shkj.wms.bo.SysStockReduceBo; import com.shkj.wms.domain.SysStock; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.shkj.wms.vo.SysStockNumVo; -import com.shkj.wms.vo.SysStockVCLocationVo; -import com.shkj.wms.vo.SysStockVehicheColorVo; -import com.shkj.wms.vo.SysStockVehicheVo; +import com.shkj.wms.vo.*; import java.util.List; @@ -30,6 +28,8 @@ public interface SysStockMapper extends BaseMapper { List getVehicheStockList(); + List queryStockDetailList(SysStockNumQueryBo bo); + } diff --git a/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java b/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java index a4c0a38..5a0787c 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java +++ b/shkj-wms/src/main/java/com/shkj/wms/scheduled/ScheduledTasks.java @@ -177,7 +177,7 @@ public class ScheduledTasks { // @PostConstruct // @Scheduled(cron = "0/3 * * * * ? ") - @Scheduled(fixedRate = 200) + // @Scheduled(fixedRate = 200) public void task() { log.info("开始获取需要执行的任务"); //获取待下发任务数据 @@ -1739,7 +1739,7 @@ public class ScheduledTasks { /** * 空治具出库流程 */ - @Scheduled(cron = "0/5 * * * * ? ") + // @Scheduled(cron = "0/5 * * * * ? ") public void exeEmptyContainerFromWare() { if (ObjectUtils.isEmpty(redisTemplate.opsForValue().get(RedisConstant.out_empty_type))) { log.info("暂未设置空治具出库"); diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java index fd87f6e..7341dd3 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java @@ -167,4 +167,7 @@ public interface IBaseLocationService extends IService { */ Result changeLocationStatus(Long id, String status); + + List getBaseLocationForMap(BaseLocationQueryPageBo bo); + } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java index 9f5fe38..9d4c102 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseLocationServiceImpl.java @@ -901,4 +901,10 @@ public class BaseLocationServiceImpl extends ServiceImpl getBaseLocationForMap(BaseLocationQueryPageBo bo) { + List list = this.getBaseMapper().getBaseLocationForMap(bo); + return list; + } } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java index 52427b1..71972cc 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java @@ -229,4 +229,9 @@ public class SysStockServiceImpl extends ServiceImpl i } + @Override + public List queryStockDetailList(SysStockNumQueryBo bo){ + return sysStockMapper.queryStockDetailList(bo); + } + } diff --git a/shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java b/shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java new file mode 100644 index 0000000..cc9e9fc --- /dev/null +++ b/shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java @@ -0,0 +1,116 @@ +package com.shkj.wms.vo; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 库存详情对象 + * + * @author zjx + * @date 2022-12-15 + */ +@Data +public class SysStockNumDetailVo implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 仓库名称 + */ + + private String branchName; + /** + * 所在楼层 + */ + + private String layer; + /** + * 库位 + */ + private String locationCode; + /** + * 台车编号 + */ + private String containerCode; + /** + * 物料编号 + */ + private String ptPart; + + /** + * 物料名称 + */ + private String ptName; + /** + * 规格 + */ + private String ptDesc; + + /** + * 机种（即车型） + */ + private String ptBreakCat; + + /** + * 在库数量 + */ + private Integer qty; + + /** + * 待入库数量 + */ + private Integer inQty; + + /** + * 待出库数量 + */ + private Integer outQty; + + /** + * 缴库时间 + */ + + private String inTime; + + /** + * 库龄 + */ + private Integer storageAge; + + /** + * 批次 + */ + private String rerpDate; + + /** + * 作业时间 + */ + private String createTime; + + /** + * 作业类型 + */ + private String type ; + + /** + * 批次 + */ + private String batch; + + /** + * 开始时间之前的所有入库 + */ + private Integer invInqty; + + /** + * 开始时间之前的所有出库 + */ + private Integer invOutqty; + + /** + * 可用数量 + */ + private Integer useQty; + +} diff --git a/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml b/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml index f353d2a..a626894 100644 --- a/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml +++ b/shkj-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml @@ -515,4 +515,42 @@ ORDER BY bl.route asc,is_deep desc + + diff --git a/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml b/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml index 7cac5a0..04859c3 100644 --- a/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml +++ b/shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml @@ -161,4 +161,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +