From f9a050bc757609cca2f7305f753fbf10aa14abb3 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 25 Apr 2025 10:57:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 800ef5632b..0c8f1619e0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -54,7 +54,7 @@ z.zoneName, d.warehouseArea, d.warehouseRackSid, - d.warehouseRackName, + d.warehouseRackCode, SUM(d.bookCount) AS bookCount, SUM(d.bookCount * d.cost) AS bookAmount, SUM(d.realCount) AS realCount, From 64c9b1d3d539f4dcd5cfb73d345a8aa7ccfdbd2d Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 25 Apr 2025 11:02:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 0c8f1619e0..8fe372ed33 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -84,7 +84,7 @@ goodsSkuCode, warehouseName, warehouseArea, - warehouseRackName, + warehouseRackCode, unit, cost, bookCount, @@ -138,7 +138,7 @@ d.warehouseName, z.zoneName, d.warehouseArea, - d.warehouseRackName, + d.warehouseRackCode, d.unit, d.cost, d.bookCount, From 497ec885444cfe6ccef5fc2657b7e76767b1d3d6 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 25 Apr 2025 11:24:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsInventoryCheckbillFeign.java | 1 + .../inventroy/WmsInventoryCheckbillRest.java | 22 +++++ .../WmsInventoryCheckbillMapper.java | 3 + .../WmsInventoryCheckbillMapper.xml | 92 +++++++++++++++---- .../WmsInventoryCheckbillService.java | 18 ++-- .../WmsInventoryCheckbillDetailGoodExcel.java | 74 +++++++++++++++ 6 files changed, 184 insertions(+), 26 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodExcel.java diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillFeign.java index 96589d20a6..a3bbfe9186 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillFeign.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateQuery; import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index 6df71ebdfd..769a8717bc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -26,6 +26,7 @@ package com.yxt.wms.apiadmin.inventroy; import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -42,7 +43,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.List; @Api(tags = "库存盘点") @@ -52,6 +56,8 @@ public class WmsInventoryCheckbillRest { @Autowired private WmsInventoryCheckbillService wmsInventoryCheckbillService; + @Autowired + HttpServletResponse response; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -137,6 +143,22 @@ public class WmsInventoryCheckbillRest { return rb.success().setData(count); } + @ApiOperation("导出") + @PostMapping("/excelList") + public void excelList(@RequestParam("sid") String sid){ + //得到所有要导出的数据 + List exportVoList = wmsInventoryCheckbillService.excelList(sid); + //定义导出的excel名字 + String excelName = "盘点明细"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryCheckbillDetailGoodExcel.class, response); + } + /*********************************************************移动端************************************************************/ @ApiOperation("app-盘点-查看库位盘点列表") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index db05713f41..14faa5097c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodExcel; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo; @@ -75,4 +76,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper excelList(String sid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 8fe372ed33..e25259eee6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -79,20 +79,20 @@ + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 5cbc8dda58..80d2df3da6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -221,24 +221,24 @@ public class WmsInventoryCheckbillService extends MybatisBaseService detailGoodPageList(PagerQuery pq) { WmsInventoryCheckbillDetailGoodPageListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("billSid", query.getBillSid()); + qw.eq("d.billSid", query.getBillSid()); if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.eq("warehouseSid", query.getWarehouseSid()); + qw.eq("d.warehouseSid", query.getWarehouseSid()); } if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) { - qw.eq("warehouseAreaSid", query.getWarehouseAreaSid()); + qw.eq("d.warehouseAreaSid", query.getWarehouseAreaSid()); } if (StringUtils.isNotBlank(query.getWarehouseRackSid())) { - qw.eq("warehouseRackSid", query.getWarehouseRackSid()); + qw.eq("d.warehouseRackSid", query.getWarehouseRackSid()); } if (StringUtils.isNotBlank(query.getGoodsID())) { - qw.like("goodsID", query.getGoodsID()); + qw.like("d.goodsID", query.getGoodsID()); } if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) { - qw.like("goodsSkuTitle", query.getGoodsSkuTitle()); + qw.like("d.goodsSkuTitle", query.getGoodsSkuTitle()); } if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("goodsSkuCode", query.getGoodsSkuCode()); + qw.like("d.goodsSkuCode", query.getGoodsSkuCode()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.detailGoodPageList(page, qw); @@ -973,4 +973,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService excelList(String sid) { + return baseMapper.excelList(sid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodExcel.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodExcel.java new file mode 100644 index 0000000000..2b2e0cf20a --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodExcel.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + +import com.yxt.common.core.utils.ExportEntityMap; +import com.yxt.common.core.vo.Vo; +import lombok.Data; +import java.math.BigDecimal; + +@Data +public class WmsInventoryCheckbillDetailGoodExcel implements Vo { + + @ExportEntityMap(CnName = "商品ID", EnName = "goodsID") + private String goodsID; + @ExportEntityMap(CnName = "商品名称", EnName = "goodsSkuTitle") + private String goodsSkuTitle; + @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode") + private String goodsSkuCode; + @ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName") + private String warehouseName; + @ExportEntityMap(CnName = "区域名称", EnName = "warehouseZoneName") + private String warehouseZoneName; + @ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea") + private String warehouseArea; + @ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode") + private String warehouseRackCode; + @ExportEntityMap(CnName = "单位", EnName = "unit") + private String unit; + @ExportEntityMap(CnName = "成本单价", EnName = "cost") + private BigDecimal cost; + @ExportEntityMap(CnName = "应盘数量", EnName = "bookCount") + private BigDecimal bookCount; + @ExportEntityMap(CnName = "应盘金额", EnName = "bookAmount") + private BigDecimal bookAmount; + @ExportEntityMap(CnName = "实盘数量", EnName = "realCount") + private BigDecimal realCount; + @ExportEntityMap(CnName = "实盘金额", EnName = "realAmount") + private BigDecimal realAmount; + @ExportEntityMap(CnName = "状态", EnName = "state") + private String state; + @ExportEntityMap(CnName = "盈亏数量", EnName = "profitAndLoseCount") + private BigDecimal profitAndLoseCount; + @ExportEntityMap(CnName = "盈亏金额", EnName = "profitAndLoseAmount") + private BigDecimal profitAndLoseAmount; + @ExportEntityMap(CnName = "盘损数量", EnName = "lossCount") + private BigDecimal lossCount; + @ExportEntityMap(CnName = "盘损金额", EnName = "lossAmount") + private BigDecimal lossAmount; + @ExportEntityMap(CnName = "备注", EnName = "remarks") + private String remarks; +} \ No newline at end of file