From 8657b7d92bb15298670cddc609a57b6d17994389 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 25 Apr 2025 10:10:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E9=94=80=E5=94=AE=E4=B8=93=E5=91=98=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 463f3a1201..73c0ef0926 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1468,10 +1468,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService qw = new QueryWrapper<>(); if (params != null) { if (StringUtils.isNotBlank(orgPath)) { useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + staffDeptSid =orgPath.substring(orgPath.lastIndexOf("/") + 1); } else { useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } @@ -1481,6 +1483,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { qw.notIn("furd.sid", params.getSidList()); } From f9a050bc757609cca2f7305f753fbf10aa14abb3 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 25 Apr 2025 10:57:56 +0800 Subject: [PATCH 2/8] =?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 3/8] =?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 4/8] =?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 From 79afee41e8a81acc72abdc2eb9c645dbddfdfc35 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 25 Apr 2025 11:33:06 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=BF=94=E5=88=A9=E9=A2=84=E6=8F=90?= =?UTF-8?q?=E4=B8=8E=E4=B8=8A=E4=BC=A0=E6=A0=B8=E5=AF=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=95=B0=E6=8D=AE=E8=A7=84=E5=88=99=E8=B0=83?= =?UTF-8?q?=E6=95=B4(=E5=88=86=E7=95=8C=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=94=B1=E7=94=B3=E8=AF=B7=E6=97=A5=E6=9C=9F=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8A=9E=E7=BB=93=E6=97=A5=E6=9C=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmCollectionrebateCheckapply.java | 4 ++++ .../ScmCollectionrebateCheckapplyMapper.xml | 3 +++ .../ScmCollectionrebateCheckapplyService.java | 2 +- .../ScmCollectionRebateWithApplyService.java | 2 +- .../scmfinanceadjustapply/ScmFinanceAdjustApplyService.java | 2 +- .../ScmSpecialrebateCheckapplyService.java | 2 +- .../ScmSpecialRebateWithApplyService.java | 2 +- .../scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java | 2 +- .../scmvehrebatewithapply/ScmVehRebateWithApplyService.java | 2 +- 9 files changed, 14 insertions(+), 7 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java index 5fb89b3c5b..71da08f82a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionrebateCheckapply.java
@@ -78,4 +80,6 @@ public class ScmCollectionrebateCheckapply extends BaseEntity { private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; + + private Date finishTime; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml index e461de4692..0cfa312bae 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml @@ -36,6 +36,9 @@ UPDATE scm_collectionrebate_checkapply SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java index f7d536dedf..3cb1679979 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java @@ -368,7 +368,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService details = scmFinanceAdjustDetailsService.selByMainSid(sid); - String format = scmVehRebateWithApplyService.returnBusDate(adjustApply.getCreateTime()); + String format = scmVehRebateWithApplyService.returnBusDate(adjustApply.getClosingDate()); if (!details.isEmpty() && details.size() > 0) { if (adjustWay.equals("客户交纳")) { //按照采购系统分组 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index a1c2538175..d233b775ed 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -441,7 +441,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService Date: Fri, 25 Apr 2025 13:55:28 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 769a8717bc..0b6bcfeea9 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 @@ -144,7 +144,7 @@ public class WmsInventoryCheckbillRest { } @ApiOperation("导出") - @PostMapping("/excelList") + @PostMapping("/downloadExcel") public void excelList(@RequestParam("sid") String sid){ //得到所有要导出的数据 List exportVoList = wmsInventoryCheckbillService.excelList(sid); From 9d0a4e3d3baeb5bbd93057bf1848f9188c47b65d Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 25 Apr 2025 13:57:52 +0800 Subject: [PATCH 7/8] =?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 | 1 + 1 file changed, 1 insertion(+) 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 e25259eee6..df597c5ddc 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 @@ -83,6 +83,7 @@ d.goodsSkuTitle, d.goodsSkuCode, d.warehouseName, + z.zoneName AS warehouseZoneName, d.warehouseArea, d.warehouseRackCode, d.unit, From f7e2345f10ecc64a77353f03c2fa93923b543979 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 25 Apr 2025 14:04:03 +0800 Subject: [PATCH 8/8] =?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/WmsInventoryCheckbillService.java | 3 +++ 1 file changed, 3 insertions(+) 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 80d2df3da6..a11d46e849 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 @@ -225,6 +225,9 @@ public class WmsInventoryCheckbillService extends MybatisBaseService