From ffa741d7ed0bac4bd797b4ceb10ff3b13e7aafa4 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Wed, 15 Apr 2026 13:51:05 +0800 Subject: [PATCH] =?UTF-8?q?wms=20=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=85=A5=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 4 +++ .../facade/IStockInOrderService.java | 3 ++ .../repository/mapper/StockInOrderMapper.java | 2 ++ .../persistence/StockInOrderImpl.java | 7 ++++ .../repository/po/StockInOrderPO.java | 19 +++++++++++ .../service/StockInOrderDomainService.java | 4 +++ .../stockInOrder/StockInOrderApi.java | 7 ++++ .../stockInOrder/StockInOrderMapper.xml | 33 +++++++++++++++++++ 8 files changed, 79 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 480e162fa..b2de72033 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -28,6 +28,7 @@ import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; import com.mhd.wms.domain.stockInOrder.service.StockInOrderDomainService; +import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderImportRowDTO; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; @@ -1878,4 +1879,7 @@ public class StockInOrderApplicationService { } } + public List queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) { + return stockInOrderDomainService.queryInStockInfoByInOrderNumber(stockInOrderDTO); + } } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java index f8e3176b4..6ea6c63d8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; +import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import java.util.List; @@ -40,4 +41,6 @@ public interface IStockInOrderService extends IService * 查询入库单 */ public StockInOrderPO getInfo(Long inOrderId); + + List queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java index acd9ed861..ffb72fe71 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; +import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import java.util.List; @@ -20,4 +21,5 @@ public interface StockInOrderMapper extends BaseMapper */ public List queryList(StockInOrderDO stockInOrderDO); + List queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java index c1b4246cf..d42b7d7fe 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java @@ -6,12 +6,14 @@ import com.mhd.wms.domain.stockInOrder.repository.facade.IStockInOrderService; import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; +import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -81,4 +83,9 @@ public class StockInOrderImpl extends ServiceImpl queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) { + return stockInOrderMapper.queryInStockInfoByInOrderNumber(stockInOrderDTO); + } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java index 86d541606..7e95257c2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java @@ -373,4 +373,23 @@ public class StockInOrderPO extends BaseVOEntity { @ApiModelProperty("订单状态") @Excel(name = "订单状态") private String orderStatus; + + @ApiModelProperty("批号") + private String batchNumber; + + @ApiModelProperty("货号/物料编码") + private String materialCode; + + @ApiModelProperty("品名/物料名称") + private String materialName; + + @ApiModelProperty("型号") + private String materialShape; + + @ApiModelProperty("规格") + private String specificationModel; + + @ApiModelProperty("状态名称") + private String statusName; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 242af46d0..83f54a3cb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -43,6 +43,7 @@ import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainServi import com.mhd.wms.domain.stockShelfOrder.repository.po.StockShelfOrderPO; import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO; import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService; +import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -835,4 +836,7 @@ public class StockInOrderDomainService { return camelCase.toString(); } + public List queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) { + return stockInOrderService.queryInStockInfoByInOrderNumber(stockInOrderDTO); + } } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 50d3c198b..734bfd32f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -150,4 +150,11 @@ public class StockInOrderApi extends BaseController { stockInOrderApplicationService.omsOrderAddDetail(inMaterialDetails); } + @ApiOperation("查询入库信息（通过入库单号）") + @PostMapping("/queryInStockInfo") + public AjaxResult queryInStockInfo(@RequestBody StockInOrderDTO stockInOrderDTO) { + List list = stockInOrderApplicationService.queryInStockInfoByInOrderNumber(stockInOrderDTO); + return AjaxResult.success(list); + } + } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index 578f9cf0e..d6f3c6075 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -432,4 +433,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY a.create_time IS NULL, a.create_time DESC + + + \ No newline at end of file