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()); } 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 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 800ef5632b..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 @@ -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, @@ -79,20 +79,21 @@ + + \ 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..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 @@ -221,24 +221,27 @@ 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.getWarehouseZoneSid())) { + qw.eq("z.zoneName", query.getWarehouseZoneSid()); } 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 +976,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