diff --git a/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java b/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java index 971e390..28644c2 100644 --- a/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java +++ b/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java @@ -89,16 +89,16 @@ public class WmsPrintController { return R.ok().put("rows", rows); } - // /** - // * - // * @description 库存标签数据 - // * @author 常熟吴彦祖 - // * @date 2025/8/20 14:00 - // * @return R - // */ - // @PostMapping("getKuCunLabelData") - // public R getKuCunLabelData(@RequestBody InventoryStockOutData inData){ - // PageUtils page = wmsPrintService.getKuCunLabelData( inData); - // return R.ok().put("page", page); - // } + /** + * + * @description 库存标签数据 + * @author 常熟吴彦祖 + * @date 2025/8/20 14:00 + * @return R + */ + @PostMapping("getKuCunLabelData") + public R getKuCunLabelData(@RequestBody InventoryStockOutData inData){ + PageUtils page = wmsPrintService.getKuCunLabelData( inData); + return R.ok().put("page", page); + } } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java b/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java index cf9a8ae..d9fac1c 100644 --- a/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java +++ b/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java @@ -3,6 +3,7 @@ package com.gaotao.modules.wms.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.gaotao.modules.inventoryStock.entity.InventoryStockOutData; import com.gaotao.modules.pms.data.QcDetailReport; import com.gaotao.modules.wms.data.InboundQcResultData; import com.gaotao.modules.wms.data.PoOrderRollNoOutData; @@ -39,4 +40,6 @@ public interface WmsPrintDao { List getPoPartLabelData(@Param("site")String site,@Param("buNo")String buNo,@Param("rollList") List inList); + IPage getKuCunLabelData(Page pageData, @Param("query") InventoryStockOutData data); + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java b/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java index 8ec3964..52c0c74 100644 --- a/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java +++ b/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java @@ -41,5 +41,5 @@ public interface WmsPrintService { List getPoPartLabelData( List inList); - // PageUtils getKuCunLabelData(InventoryStockOutData inData); + PageUtils getKuCunLabelData(InventoryStockOutData inData); } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java b/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java index f4412f8..44e6640 100644 --- a/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java +++ b/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.common.utils.DateUtils; import com.gaotao.common.utils.PageUtils; +import com.gaotao.modules.inventoryStock.entity.InventoryStockOutData; import com.gaotao.modules.pms.data.QcDetailReport; import com.gaotao.modules.sys.entity.SysUserEntity; import com.gaotao.modules.trans.entity.TransNoControl; @@ -114,5 +115,9 @@ public class WmsPrintServiceImpl implements WmsPrintService { } } - + @Override + public PageUtils getKuCunLabelData(InventoryStockOutData inData){ + IPage list = this.wmsPrintDao.getKuCunLabelData(new Page(inData.getPage(), inData.getLimit()), inData); + return new PageUtils(list); + } } \ No newline at end of file diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml index ae75b49..1ec9001 100644 --- a/src/main/resources/mapper/wms/WmsPrintMapper.xml +++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml @@ -112,4 +112,49 @@ order by created_date + +