From 6acd1026c2731234ea1278000f1597ac4f09f6a7 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Sun, 5 Oct 2025 19:56:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionUnissueController.java | 10 +++++ .../entity/dto/UnissueNotifyHeadDataDto.java | 42 +++++++++++++++++++ .../mapper/UnissueNotifyHeaderMapper.java | 6 +++ .../service/UnissueNotifyHeaderService.java | 5 +++ .../impl/UnissueNotifyHeaderServiceImpl.java | 23 ++++++++++ .../notify/UnissueNotifyHeaderMapper.xml | 33 +++++++++++++++ 6 files changed, 119 insertions(+) create mode 100644 src/main/java/com/gaotao/modules/notify/entity/dto/UnissueNotifyHeadDataDto.java diff --git a/src/main/java/com/gaotao/modules/notify/controller/ProductionUnissueController.java b/src/main/java/com/gaotao/modules/notify/controller/ProductionUnissueController.java index 2e510411..b94dfddd 100644 --- a/src/main/java/com/gaotao/modules/notify/controller/ProductionUnissueController.java +++ b/src/main/java/com/gaotao/modules/notify/controller/ProductionUnissueController.java @@ -1,8 +1,11 @@ package com.gaotao.modules.notify.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; import com.gaotao.modules.base.entity.SOScheduledRoutingData; import com.gaotao.modules.notify.entity.*; +import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto; import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo; import com.gaotao.modules.notify.entity.vo.ShopOrderVo; import com.gaotao.modules.notify.service.UnissueNotifyHeaderService; @@ -143,4 +146,11 @@ public class ProductionUnissueController { unissueNotifyHeaderService.updateNotifyStatus(data); return R.ok(); } + + @PostMapping(value="/searchUnissueNotifyHeader") + @ResponseBody + public R searchUnissueNotifyHeader(@RequestBody UnissueNotifyHeadDataDto data) { + PageUtils page = unissueNotifyHeaderService.searchUnissueNotifyHeader(data); + return R.ok().put("page", page); + } } diff --git a/src/main/java/com/gaotao/modules/notify/entity/dto/UnissueNotifyHeadDataDto.java b/src/main/java/com/gaotao/modules/notify/entity/dto/UnissueNotifyHeadDataDto.java new file mode 100644 index 00000000..27dd8034 --- /dev/null +++ b/src/main/java/com/gaotao/modules/notify/entity/dto/UnissueNotifyHeadDataDto.java @@ -0,0 +1,42 @@ +package com.gaotao.modules.notify.entity.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gaotao.modules.notify.entity.InventoryCheckResult; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +@Data +public class UnissueNotifyHeadDataDto { + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startDate; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endDate; + private List orderStatusList; + private String workShopId; + private String buDesc; + private String userDisplay; + private String sql; + private String workShopName; + private String closeRemark; + private String username; + private String status; + + private int page; + private int limit; + + private int pageNum; + private int pageSize; + + private String notifyNo; + + /** + * 库存预览数据列表（用于推送WCS） + */ + private List inventoryList; +} diff --git a/src/main/java/com/gaotao/modules/notify/mapper/UnissueNotifyHeaderMapper.java b/src/main/java/com/gaotao/modules/notify/mapper/UnissueNotifyHeaderMapper.java index 7b31cae3..ff642d67 100644 --- a/src/main/java/com/gaotao/modules/notify/mapper/UnissueNotifyHeaderMapper.java +++ b/src/main/java/com/gaotao/modules/notify/mapper/UnissueNotifyHeaderMapper.java @@ -1,8 +1,12 @@ package com.gaotao.modules.notify.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.modules.notify.entity.*; +import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; @@ -25,4 +29,6 @@ public interface UnissueNotifyHeaderMapper extends BaseMapper searchNotifyHeader(Page page, @Param("data") UnissueNotifyHeadDataDto data); } diff --git a/src/main/java/com/gaotao/modules/notify/service/UnissueNotifyHeaderService.java b/src/main/java/com/gaotao/modules/notify/service/UnissueNotifyHeaderService.java index bf8efa70..2d127de4 100644 --- a/src/main/java/com/gaotao/modules/notify/service/UnissueNotifyHeaderService.java +++ b/src/main/java/com/gaotao/modules/notify/service/UnissueNotifyHeaderService.java @@ -1,10 +1,13 @@ package com.gaotao.modules.notify.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.entity.SOScheduledRoutingData; import com.gaotao.modules.notify.entity.SOIssueNotifyHeaderData; import com.gaotao.modules.notify.entity.UnissueNotifyHeader; import com.gaotao.modules.notify.entity.UnissueNotifyOrderList; import com.gaotao.modules.notify.entity.UnissueNotifyOrderMaterialList; +import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto; import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo; import com.gaotao.modules.notify.entity.vo.ShopOrderVo; @@ -34,4 +37,6 @@ public interface UnissueNotifyHeaderService { List searchUnissueNotifyMaterialList(UnissueNotifyOrderList data); void updateNotifyStatus(UnissueNotifyHeader data); + + PageUtils searchUnissueNotifyHeader(UnissueNotifyHeadDataDto data); } diff --git a/src/main/java/com/gaotao/modules/notify/service/impl/UnissueNotifyHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/notify/service/impl/UnissueNotifyHeaderServiceImpl.java index 48054488..c2ab9421 100644 --- a/src/main/java/com/gaotao/modules/notify/service/impl/UnissueNotifyHeaderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/notify/service/impl/UnissueNotifyHeaderServiceImpl.java @@ -2,10 +2,14 @@ package com.gaotao.modules.notify.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; import com.gaotao.modules.api.service.IfsApiIssueAndReturnService; import com.gaotao.modules.base.entity.SOScheduledRoutingData; import com.gaotao.modules.notify.entity.*; +import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto; import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo; import com.gaotao.modules.notify.entity.vo.ShopOrderVo; import com.gaotao.modules.notify.mapper.UnissueNotifyHeaderMapper; @@ -194,5 +198,24 @@ public class UnissueNotifyHeaderServiceImpl implements UnissueNotifyHeaderServic unissueNotifyHeaderMapper.updateNotifyStatus(data); } + @Override + public PageUtils searchUnissueNotifyHeader(UnissueNotifyHeadDataDto data) { + if(data.getOrderStatusList() !=null && data.getOrderStatusList().size()>0){ + String str="("; + for (int i = 0; i page = new Page<>(data.getPage(), data.getLimit()); + IPage resultList = unissueNotifyHeaderMapper.searchNotifyHeader(page, data); + return new PageUtils(resultList); + } + } diff --git a/src/main/resources/mapper/notify/UnissueNotifyHeaderMapper.xml b/src/main/resources/mapper/notify/UnissueNotifyHeaderMapper.xml index 4022a1ff..3689c579 100644 --- a/src/main/resources/mapper/notify/UnissueNotifyHeaderMapper.xml +++ b/src/main/resources/mapper/notify/UnissueNotifyHeaderMapper.xml @@ -38,4 +38,37 @@ update unissue_notify_header set status=#{status} where site=#{site} and notify_no=#{notifyNo} + \ No newline at end of file