diff --git a/src/main/java/com/heai/modules/production/controller/OutboundLabelScanController.java b/src/main/java/com/heai/modules/production/controller/OutboundLabelScanController.java index fb515dc..ddef320 100644 --- a/src/main/java/com/heai/modules/production/controller/OutboundLabelScanController.java +++ b/src/main/java/com/heai/modules/production/controller/OutboundLabelScanController.java @@ -1,6 +1,9 @@ package com.heai.modules.production.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.heai.common.utils.R; +import com.heai.modules.production.entity.OutboundLabelDetailQueryData; +import com.heai.modules.production.entity.OutboundLabelDetailRowData; import com.heai.modules.production.entity.OutboundLabelScanData; import com.heai.modules.production.entity.OutboundLabelScan; import com.heai.modules.production.entity.PrintLabelRecord; @@ -23,6 +26,20 @@ public class OutboundLabelScanController { return R.ok().put("rows",list); } + /** + * @Description 发货明细关联主表分页查询 - rqrq + * @Title searchOutboundLabelDetailPage + * @param queryData 查询参数 - rqrq + * @return 分页结果 - rqrq + * @author rqrq + * @date 2026/07/24 + */ + @PostMapping("/detail/page") + public R searchOutboundLabelDetailPage(@RequestBody OutboundLabelDetailQueryData queryData){ + IPage page = outboundLabelScanService.searchOutboundLabelDetailPage(queryData); + return R.ok().put("page", page); + } + /** * @Description 查询先进先出更早日期袋贴 - rqrq * @Title queryEarlierInboundBagList diff --git a/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java b/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java index 622c91e..e0ef270 100644 --- a/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java +++ b/src/main/java/com/heai/modules/production/dao/OutboundLabelScanMapper.java @@ -1,7 +1,11 @@ package com.heai.modules.production.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.heai.modules.production.entity.OutboundLabelScan; +import com.heai.modules.production.entity.OutboundLabelDetailQueryData; +import com.heai.modules.production.entity.OutboundLabelDetailRowData; import com.heai.modules.production.entity.OutboundLabelScanData; import com.heai.modules.production.entity.PrintLabelRecord; import com.heai.modules.production.entity.SOScheduledRoutingOutData; @@ -17,6 +21,9 @@ public interface OutboundLabelScanMapper extends BaseMapper { List searchOutboundLabelScanList(OutboundLabelScanData outboundLabelScanData); + IPage searchOutboundLabelDetailPage(@Param("page") Page page, + @Param("query") OutboundLabelDetailQueryData query); + String getUserName(String createBy); List queryOutboundLabelScanList(OutboundLabelScan outboundLabelScan); diff --git a/src/main/java/com/heai/modules/production/entity/OutboundLabelDetailQueryData.java b/src/main/java/com/heai/modules/production/entity/OutboundLabelDetailQueryData.java new file mode 100644 index 0000000..c34de64 --- /dev/null +++ b/src/main/java/com/heai/modules/production/entity/OutboundLabelDetailQueryData.java @@ -0,0 +1,21 @@ +package com.heai.modules.production.entity; + +import lombok.Data; + +/** + * 发货明细关联主表查询参数 - rqrq + */ +@Data +public class OutboundLabelDetailQueryData { + private Integer no; + private Integer size; + private String site; + private String startDate; + private String endDate; + private String customerId; + private String delNotifyNo; + private String shipFlag; + private String partDesc; + private String partNo; + private String orderNo; +} diff --git a/src/main/java/com/heai/modules/production/entity/OutboundLabelDetailRowData.java b/src/main/java/com/heai/modules/production/entity/OutboundLabelDetailRowData.java new file mode 100644 index 0000000..8b4b5d2 --- /dev/null +++ b/src/main/java/com/heai/modules/production/entity/OutboundLabelDetailRowData.java @@ -0,0 +1,53 @@ +package com.heai.modules.production.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 发货明细关联主表查询结果 - rqrq + */ +@Data +public class OutboundLabelDetailRowData { + private String site; + private String delNotifyNo; + private BigDecimal delNotifyItemNo; + + private String partNo; + private String partDescription; + private String approveResultFlag; + private BigDecimal notifyQty; + private BigDecimal shipQty; + private BigDecimal allNum; + private String UMId; + private String orderNo; + private BigDecimal itemNo; + private String customerPONo; + private String orderType; + private String custPartNo; + private String intSales; + private String extSales; + private String subOrderType; + private String techInfo; + private String detailRemark; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date notifyDate; + private String customerId; + private String customerName; + private String billAirwayNo; + private String forwarderId; + private String headerRemark; + private String receiver; + private String delAddId; + private String creditFlag; + private String shipFlag; + private String shipResult; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date realShipDate; +} diff --git a/src/main/java/com/heai/modules/production/service/OutboundLabelScanService.java b/src/main/java/com/heai/modules/production/service/OutboundLabelScanService.java index 37a7f00..700e645 100644 --- a/src/main/java/com/heai/modules/production/service/OutboundLabelScanService.java +++ b/src/main/java/com/heai/modules/production/service/OutboundLabelScanService.java @@ -1,7 +1,10 @@ package com.heai.modules.production.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.heai.modules.production.entity.OutboundLabelScan; +import com.heai.modules.production.entity.OutboundLabelDetailQueryData; +import com.heai.modules.production.entity.OutboundLabelDetailRowData; import com.heai.modules.production.entity.OutboundLabelScanData; import com.heai.modules.production.entity.PrintLabelRecord; import com.heai.modules.production.entity.SOScheduledRoutingOutData; @@ -14,6 +17,8 @@ public interface OutboundLabelScanService extends IService { List searchOutboundLabelScanList(OutboundLabelScanData outboundLabelScanData); + IPage searchOutboundLabelDetailPage(OutboundLabelDetailQueryData queryData); + void saveLabel(OutboundLabelScan outboundLabelScan); SOScheduledRoutingOutData queryStandardWeight(SOScheduledRoutingOutData data); diff --git a/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java index acec649..be6014f 100644 --- a/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/OutboundLabelScanServiceImpl.java @@ -1,8 +1,12 @@ package com.heai.modules.production.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.heai.modules.production.dao.OutboundLabelScanMapper; import com.heai.modules.production.entity.OutboundLabelScan; +import com.heai.modules.production.entity.OutboundLabelDetailQueryData; +import com.heai.modules.production.entity.OutboundLabelDetailRowData; import com.heai.modules.production.entity.OutboundLabelScanData; import com.heai.modules.production.entity.PrintLabelRecord; import com.heai.modules.production.entity.SOScheduledRoutingOutData; @@ -70,6 +74,22 @@ public class OutboundLabelScanServiceImpl extends ServiceImpl searchOutboundLabelDetailPage(OutboundLabelDetailQueryData queryData) { + if (Objects.isNull(queryData)) { + throw new RuntimeException("请求参数错误"); + } + if (StringUtils.hasText(queryData.getStartDate())) { + queryData.setStartDate(queryData.getStartDate() + " 00:00:00"); + } + if (StringUtils.hasText(queryData.getEndDate())) { + queryData.setEndDate(queryData.getEndDate() + " 23:59:59"); + } + int no = Objects.isNull(queryData.getNo()) ? 1 : queryData.getNo(); + int size = Objects.isNull(queryData.getSize()) ? 50 : queryData.getSize(); + return baseMapper.searchOutboundLabelDetailPage(new Page<>(no, size), queryData); + } + @Override @Transactional public void saveLabel(OutboundLabelScan outboundLabelScan) { diff --git a/src/main/resources/mapper/production/OutboundLabelScanMapper.xml b/src/main/resources/mapper/production/OutboundLabelScanMapper.xml index 8329fd3..c5ed1cb 100644 --- a/src/main/resources/mapper/production/OutboundLabelScanMapper.xml +++ b/src/main/resources/mapper/production/OutboundLabelScanMapper.xml @@ -51,6 +51,87 @@ order by a.create_data desc + + +