From cc8051b579734c79529153214d27b71ec7fb136e Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Tue, 19 May 2026 15:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B8=E6=98=93=E5=8D=95=E8=AF=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E4=BB=B6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sDocumentCargoMultiApplicationService.java | 27 +++++++++++++++++++ .../BusinessDocumentCargoMultiMapper.java | 5 ++++ .../po/BusinessDocumentCargoMultiPO.java | 4 +++ .../BusinessDocumentCargoMultiApi.java | 14 +++++----- .../BusinessDocumentCargoMultiMapper.xml | 13 +++++++++ 5 files changed, 55 insertions(+), 8 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java index 0ba35bd8a..d0046c4bd 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentCargoMulti/BusinessDocumentCargoMultiApplicationService.java @@ -1,13 +1,19 @@ package com.mhd.oms.application.service.businessDocumentCargoMulti; +import com.mhd.common.core.web.page.TableDataInfo; +import com.mhd.oms.domain.businessDocumentCargoMulti.repository.mapper.BusinessDocumentCargoMultiMapper; import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; import com.mhd.oms.domain.businessDocumentCargoMulti.service.BusinessDocumentCargoMultiDomainService; import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** * 【请填写功能名称】ApplicationService @@ -21,6 +27,9 @@ public class BusinessDocumentCargoMultiApplicationService { @Autowired private BusinessDocumentCargoMultiDomainService businessDocumentCargoMultiDomainService; + @Resource + private BusinessDocumentCargoMultiMapper businessDocumentCargoMultiMapper; + /** * 分页查询【请填写功能名称】列表 @@ -69,4 +78,22 @@ public class BusinessDocumentCargoMultiApplicationService { } + + public TableDataInfo getByOrderId(String orderId) { + if (orderId == null ) { + TableDataInfo tableDataInfo = new TableDataInfo(); + tableDataInfo.setData(new ArrayList<>()); + tableDataInfo.setTotal(0); + tableDataInfo.setCode(200); + return tableDataInfo; + } + + List list = businessDocumentCargoMultiMapper.selectBatchByOrderId(orderId); + + TableDataInfo tableDataInfo = new TableDataInfo(); + tableDataInfo.setData(list); + tableDataInfo.setTotal(list.size()); + tableDataInfo.setCode(200); + return tableDataInfo; + } } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java index 61430fe50..6a2a7886c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java @@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti; import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; +import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + /** * 【请填写功能名称】Mapper接口 * @@ -19,4 +22,6 @@ public interface BusinessDocumentCargoMultiMapper extends BaseMapper queryList(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO); + + List selectBatchByOrderId(@Param("orderId") String orderId); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java index 8335fac62..c2b01b4b9 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java @@ -67,5 +67,9 @@ public class BusinessDocumentCargoMultiPO extends BaseVOEntity{ @ApiModelProperty("物料id") private Long materialBaseInfoId; + @ApiModelProperty("订单id") + private String OrderId; + @ApiModelProperty("货物信息-件数") + private BigDecimal CargoNum; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java index d5b43d562..ecc9d396a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentCargoMulti/BusinessDocumentCargoMultiApi.java @@ -4,13 +4,7 @@ import java.util.List; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO; import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO; import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO; @@ -89,7 +83,11 @@ public class BusinessDocumentCargoMultiApi extends BaseController{ - + @ApiOperation("根据物料ID列表批量查询物料") + @GetMapping("/getBatchByOrderId") + public TableDataInfo getBatchByIds(@RequestParam("orderId") String orderId) { + return businessDocumentCargoMultiApplicationService.getByOrderId(orderId); + } diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml index 56b88b1b0..dee932f53 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentCargoMulti/BusinessDocumentCargoMultiMapper.xml @@ -22,6 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -89,4 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + \ No newline at end of file