From aab5a4271a989846be60f67722772ede3b474fef Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 24 Feb 2025 09:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateQuery.java | 16 +++++ .../api/scmvehrebate/ScmVehRebateQuery.java | 18 ++++++ .../biz/scmvehrebate/ScmVehRebateService.java | 62 ++++++++++++++++--- .../WmsWarehouseRackService.java | 5 +- .../wmsinventory/WmsInventoryService.java | 6 +- .../wmsinventory/appH5/GoodsTwoListVo.java | 2 +- 6 files changed, 94 insertions(+), 15 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java index 7f8a7fc6b8..79225130da 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java @@ -85,6 +85,22 @@ public class ScmSpecialRebateQuery implements Query { @ApiModelProperty("页面分配数量（0查询分配数量大于0的 1查询所有）") private String isPage; + @ApiModelProperty("所属年月") + private String palceGenDate; + @ApiModelProperty("预提日期") + private String withholdingDate; + @ApiModelProperty("上传日期") + private String uploadStartDate; + private String uploadEndDate; + @ApiModelProperty("上传状态") + private String uploadState; + @ApiModelProperty("是否调整") + private String isAdjustment; + @ApiModelProperty("是否上传完成") + private String isUploadFinish; + @ApiModelProperty("二次上传状态") + private String secondUploadState; + private String userSid; private String orgPath; private String menuUrl; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java index 5a9ebfba50..d6eaa12af4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java @@ -80,6 +80,24 @@ public class ScmVehRebateQuery implements Query { @ApiModelProperty("采购系统") private String purchaseSystemName; + @ApiModelProperty("所属年月") + private String palceGenDate; + @ApiModelProperty("预提日期") + private String withholdingDate; + @ApiModelProperty("上传日期") + private String uploadStartDate; + private String uploadEndDate; + @ApiModelProperty("上传状态") + private String uploadState; + @ApiModelProperty("是否调整") + private String isAdjustment; + @ApiModelProperty("是否上传完成") + private String isUploadFinish; + @ApiModelProperty("一次核对状态") + private String onceCheckState; + @ApiModelProperty("二次上传状态") + private String secondUploadState; + private String userSid; private String orgPath; private String menuUrl; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 55e6affce7..042f9130e3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -149,11 +149,53 @@ public class ScmVehRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") + .or().isNull("uploadDate") + ); + } else { + qw.ne("uploadDate", ""); + qw.isNotNull("uploadDate"); + } + } + if (StringUtils.isNotBlank(query.getIsAdjustment())) { + qw.like("isAdjustment", query.getIsAdjustment()); + } + if (StringUtils.isNotBlank(query.getIsUploadFinish())) { + if (query.getIsUploadFinish().equals("是")) { + qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0); + } else { + qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0); + } + } + if (StringUtils.isNotBlank(query.getOnceCheckState())) { + qw.eq("onceCheckState", query.getOnceCheckState()); + } + if (StringUtils.isNotBlank(query.getSecondUploadState())) { + if (query.getSecondUploadState().equals("是")){ + //qw.eq() + } + } String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + String uploadStartDate = query.getUploadStartDate(); + String uploadEndDate = query.getUploadEndDate(); + qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). + or(). + apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" + ); qw.orderByDesc("createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -161,13 +203,13 @@ public class ScmVehRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())){ + if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) { + if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) { record.setSecondCheckState("是"); - }else { + } else { record.setSecondCheckState("否"); } - }else { + } else { record.setSecondCheckState("否"); } } @@ -458,13 +500,13 @@ public class ScmVehRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())){ + if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) { + if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) { record.setSecondCheckState("是"); - }else { + } else { record.setSecondCheckState("否"); } - }else { + } else { record.setSecondCheckState("否"); } } @@ -2113,9 +2155,9 @@ public class ScmVehRebateService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); WmsWarehouseRackQuery query = pq.getParams(); @@ -272,8 +273,8 @@ public class WmsWarehouseRackService extends MybatisBaseService