From 27b60dd9253163517869ee2b22a96807e6bd2fef Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 28 Dec 2023 14:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/board/BoardController.java | 62 +++++++++++++++++++ .../mysql/issueJob/IssueJobDetailMapper.java | 16 +++-- .../production/ProductionDetailMapper.java | 11 +++- .../CountRequestMainServiceImpl.java | 1 - .../deliverJob/DeliverJobMainService.java | 11 ++-- .../deliverJob/DeliverJobMainServiceImpl.java | 12 ++++ .../issueJob/IssueJobDetailService.java | 17 +++-- .../issueJob/IssueJobDetailServiceImpl.java | 28 +++++---- .../service/location/LocationServiceImpl.java | 1 - .../production/ProductionDetailService.java | 8 ++- .../ProductionDetailServiceImpl.java | 13 +++- .../production/ProductionMainServiceImpl.java | 1 - .../PurchasereceiptJobMainService.java | 7 +++ .../PurchasereceiptJobMainServiceImpl.java | 18 ++++-- .../mapper/issueJob/IssueJobDetailMapper.xml | 13 ++-- .../production/ProductionDetailMapper.xml | 12 ++-- 16 files changed, 179 insertions(+), 52 deletions(-) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/board/BoardController.java diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/board/BoardController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/board/BoardController.java new file mode 100644 index 00000000..cc471253 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/board/BoardController.java @@ -0,0 +1,62 @@ +package com.win.module.wms.controller.board; + +import com.win.framework.common.pojo.CommonResult; +import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainRespVO; +import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO; +import com.win.module.wms.service.deliverJob.DeliverJobMainService; +import com.win.module.wms.service.issueJob.IssueJobDetailService; +import com.win.module.wms.service.production.ProductionDetailService; +import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobMainService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +import static com.win.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 看板") +@RestController +@RequestMapping("/wms/board") +@Validated +public class BoardController { + + @Resource + private PurchasereceiptJobMainService purchasereceiptJobMainService; + @Resource + private IssueJobDetailService issueJobDetailService; + @Resource + private DeliverJobMainService deliverJobMainService; + @Resource + private ProductionDetailService productionDetailService; + + @GetMapping("/purchasereceipt") + @Operation(summary = "采购到货看板") + public CommonResult> purchasereceipt() { + return success(purchasereceiptJobMainService.getPurchasereceiptJobListBoard()); + } + + @GetMapping("/issue") + @Operation(summary = "生产叫料看板") + public CommonResult>> issue() { + return success(issueJobDetailService.getIssueJobListBoard()); + } + + @GetMapping("/production") + @Operation(summary = "生产计划看板") + public CommonResult>> production() { + return success(productionDetailService.getProductionPlanListBoard()); + } + + @GetMapping("/deliver") + @Operation(summary = "成品发运看板") + public CommonResult> deliver() { + return success(deliverJobMainService.getDeliverJobListBoard()); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java index a377b335..1124b44e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java @@ -1,18 +1,19 @@ package com.win.module.wms.dal.mysql.issueJob; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; -import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; -import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; /** * 发料任务子 Mapper @@ -94,4 +95,9 @@ public interface IssueJobDetailMapper extends BaseMapperX { .eq(IssueJobDetailDO::getMasterId, masterId)); } + /** + * 看板列表 + * @return 看板列表 + */ + List> getIssueJobListBoard(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java index 63feca32..068bc8a5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java @@ -5,14 +5,14 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; -import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; -import com.win.module.wms.dal.dataobject.work.WorkDetailDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.time.LocalDateTime; import java.util.List; +import java.util.Map; /** * 生产计划子 Mapper @@ -67,4 +67,9 @@ public interface ProductionDetailMapper extends BaseMapperX // .orderByDesc(ProductionDetailDO::getId)); // } + /** + * 看板列表 + * @return 看板列表 + */ + List> getProductionPlanListBoard(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 93faa3e5..1e0b6033 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -425,7 +425,6 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countJobMainDO.setWarehouseCode(locationDO.getWarehouseCode()); countJobMainDO.setRequestDueTime(mainDO.getDueTime()); countJobMainDO.setRequestNumber(mainDO.getNumber()); - countJobMainDO.setRequestDueTime(mainDO.getDueTime()); countJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); countJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation()); countJobMainDO.setAllowModifyQty(jobsettingDO.getAllowModifyQty()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index bb47f879..277c6d56 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -2,10 +2,7 @@ package com.win.module.wms.service.deliverJob; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; +import com.win.module.wms.controller.deliverJob.vo.*; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; @@ -152,4 +149,10 @@ public interface DeliverJobMainService { * @return pda未处理的任务数 */ Long getDeliverJobCountPda(); + + /** + * 看板列表 + * @return 看板列表 + */ + List getDeliverJobListBoard(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index 4eafdefb..75ab31c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -447,4 +447,16 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); return deliverJobMainMapper.selectCount(queryWrapper); } + + @Override + public List getDeliverJobListBoard() { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0); + LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("request_due_time", beginTime, endTime); + queryWrapper.ne("`status`", JobStatusEnum.CLOSED.getCode()); + List list = deliverJobMainMapper.selectList(queryWrapper); + return DeliverJobMainConvert.INSTANCE.convertList(list); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java index 4d0cc593..d6970cce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java @@ -1,15 +1,14 @@ package com.win.module.wms.service.issueJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; -import com.win.module.wms.controller.issueJob.vo.IssueJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * 发料任务子 Service 接口 @@ -59,4 +58,10 @@ public interface IssueJobDetailService { List getIssueJobDetailList(IssueJobDetailExportReqVO exportReqVO); List selectList(Long id); + + /** + * 看板列表 + * @return 看板列表 + */ + List> getIssueJobListBoard(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java index f1f8b5b7..ee6ed2b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java @@ -1,24 +1,22 @@ package com.win.module.wms.service.issueJob; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; -import com.win.module.wms.controller.issueJob.vo.IssueJobDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; +import com.win.module.wms.dal.mysql.issueJob.IssueJobDetailMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.issueJob.IssueJobDetailConvert; -import com.win.module.wms.dal.mysql.issueJob.IssueJobDetailMapper; +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.ISSUE_JOB_DETAIL_NOT_EXISTS; /** * 发料任务子 Service 实现类 @@ -67,4 +65,12 @@ public class IssueJobDetailServiceImpl implements IssueJobDetailService { return issueJobDetailMapper.selectList(masterId); } + @Override + public List> getIssueJobListBoard() { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0); + LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999); + return issueJobDetailMapper.getIssueJobListBoard(beginTime, endTime); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index fec191a3..4b117f03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -405,7 +405,6 @@ public class LocationServiceImpl implements LocationService { queryWrapper.eq("available", "TRUE"); queryWrapper.eq("`type`", "WIP");//线边库 queryWrapper.inSql("`code`", "SELECT DISTINCT location_code FROM transaction_balance"); - queryWrapper.last("LIMIT 10"); List locationDOList = locationMapper.selectList(queryWrapper); return LocationConvert.INSTANCE.convertList(locationDOList); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java index 59be627d..71a9b0c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java @@ -3,7 +3,6 @@ package com.win.module.wms.service.production; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; -import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; @@ -11,6 +10,7 @@ import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import javax.validation.Valid; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 生产计划子 Service 接口 @@ -82,4 +82,10 @@ public interface ProductionDetailService { PageResult getProductionDetailSenior(CustomConditions conditions); List selectList(Long masterId); + + /** + * 看板列表 + * @return 看板列表 + */ + List> getProductionPlanListBoard(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java index 82db2998..2bb8a262 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java @@ -6,14 +6,11 @@ import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.dict.DictDataApi; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; -import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; import com.win.module.wms.convert.production.ProductionDetailConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; import com.win.module.wms.service.bom.BomService; import com.win.module.wms.service.itembasic.ItembasicService; @@ -23,8 +20,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.Collection; import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.ITEMBASIC_UOM_EXCEPTION; @@ -124,6 +123,14 @@ public class ProductionDetailServiceImpl implements ProductionDetailService { return productionDetailMapper.selectList(masterId); } + @Override + public List> getProductionPlanListBoard() { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0); + LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999); + return productionDetailMapper.getProductionPlanListBoard(beginTime, endTime); + } + /** * 新增校验 * @param detailDo diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index a617c8a0..cffa06aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -511,7 +511,6 @@ public class ProductionMainServiceImpl implements ProductionMainService { LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.between("plan_date", beginTime, endTime); - queryWrapper.last("LIMIT 10"); List productionMainDOList = productionMainMapper.selectList(queryWrapper); return ProductionMainConvert.INSTANCE.convertList(productionMainDOList); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 334d6ff4..63de7d04 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO; +import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; @@ -126,4 +127,10 @@ public interface PurchasereceiptJobMainService { * @return pda未处理的任务数 */ Long getPurchasereceiptJobCountPda(); + + /** + * 看板列表 + * @return 看板列表 + */ + List getPurchasereceiptJobListBoard(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 50fb3d13..cc982978 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -14,14 +14,12 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainCreateReqVO; -import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailUpdateReqVO; -import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO; -import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO; -import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainUpdateReqVO; +import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO; import com.win.module.wms.dal.dataobject.location.LocationDO; @@ -504,6 +502,18 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain return purchasereceiptJobMainMapper.selectCount(queryWrapper); } + @Override + public List getPurchasereceiptJobListBoard() { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0); + LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("request_due_time", beginTime, endTime); + queryWrapper.ne("`status`", JobStatusEnum.CLOSED.getCode()); + List list = purchasereceiptJobMainMapper.selectList(queryWrapper); + return PurchasereceiptJobMainConvert.INSTANCE.convertList(list); + } + private PurchasereceiptJobMainDO validatePurchasereceiptJobMainExists(Long id) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = purchasereceiptJobMainMapper.selectById(id); if (purchasereceiptJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/issueJob/IssueJobDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/issueJob/IssueJobDetailMapper.xml index 5f3ef655..379c3b54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/issueJob/IssueJobDetailMapper.xml +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/issueJob/IssueJobDetailMapper.xml @@ -2,11 +2,12 @@ - + + diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/production/ProductionDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/production/ProductionDetailMapper.xml index 78b8dc41..489fc1a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/production/ProductionDetailMapper.xml +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/production/ProductionDetailMapper.xml @@ -2,11 +2,11 @@ - + +