From 5be1876d3d9c0ec02f624dd48da82a3e4d4692d9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 27 Sep 2024 09:58:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81/=E8=80=97=E6=9D=90=20?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TbConsInfoFlowServiceImpl.java | 62 +++++++++---------- .../TbProductStockDetailServiceImpl.java | 51 ++++++++------- 2 files changed, 55 insertions(+), 58 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java index d805947c..ee3a2aa2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java @@ -86,39 +86,37 @@ public class TbConsInfoFlowServiceImpl implements TbConsInfoFlowService { //入库stockInNumber; stockIn //出库stockOutNumber; stockout public Map queryPage(TbConsInfoFlowQueryCriteria criteria){ - if(StringUtils.isBlank(criteria.getColumn())){ - throw new BadRequestException("必填参数未填写"); + if(StringUtils.isNotBlank(criteria.getColumn())){ + switch (criteria.getColumn()){ + case "addCountNumber": + criteria.setBizCode(Arrays.asList("stockIn","cancelCart","init","stockIn","checkStockIn")); + break; + case "addNumber": + criteria.setBizCode(Arrays.asList("checkStockIn", "stockOtherIn")); + break; + case "refundNumber": + criteria.setBizCode(Arrays.asList("cancelCart")); + break; + case "subCountNumber": + criteria.setBizCode(Arrays.asList("createCart","stockout","checkStockOut")); + break; + case "subNumber": + criteria.setBizCode(Arrays.asList("checkStockOut")); + break; + case "saleNumber": + criteria.setBizCode(Arrays.asList("createCart")); + break; + case "lossNumber": + criteria.setBizCode(Arrays.asList("frmLoss")); + break; + case "stockInNumber": + criteria.setBizCode(Arrays.asList("stockIn")); + break; + case "stockOutNumber": + criteria.setBizCode(Arrays.asList("stockout")); + break; + } } - switch (criteria.getColumn()){ - case "addCountNumber": - criteria.setBizCode(Arrays.asList("stockIn","cancelCart","init","stockIn","checkStockIn")); - break; - case "addNumber": - criteria.setBizCode(Arrays.asList("checkStockIn", "stockOtherIn")); - break; - case "refundNumber": - criteria.setBizCode(Arrays.asList("cancelCart")); - break; - case "subCountNumber": - criteria.setBizCode(Arrays.asList("createCart","stockout","checkStockOut")); - break; - case "subNumber": - criteria.setBizCode(Arrays.asList("checkStockOut")); - break; - case "saleNumber": - criteria.setBizCode(Arrays.asList("createCart")); - break; - case "lossNumber": - criteria.setBizCode(Arrays.asList("frmLoss")); - break; - case "stockInNumber": - criteria.setBizCode(Arrays.asList("stockIn")); - break; - case "stockOutNumber": - criteria.setBizCode(Arrays.asList("stockout")); - break; - } - Sort sort = Sort.by(Sort.Direction.DESC, "id"); Pageable pageable = PageRequest.of(criteria.getPage(), criteria.getSize(), sort); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java index ade9bf98..7be27228 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java @@ -69,31 +69,30 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ @Override public Map queryPage(TbProductStockDetailQueryCriteria criteria){ - if(StringUtils.isBlank(criteria.getColumn())){ - throw new BadRequestException("必填参数未填写"); - } - switch (criteria.getColumn()){ - case "addCountNumber": - criteria.setType(Arrays.asList("供应商入库", "盘点入库", "其他入库", "退单")); - break; - case "addNumber": - criteria.setType(Arrays.asList("供应商入库", "盘点入库", "其他入库")); - break; - case "refundNumber": - criteria.setType(Arrays.asList("退单")); - break; - case "subCountNumber": - criteria.setType(Arrays.asList("供应商出库","其他出库","盘点出库","售出记录","报损")); - break; - case "subNumber": - criteria.setType(Arrays.asList("供应商出库","其他出库","盘点出库","售出记录")); - break; - case "saleNumber": - criteria.setType(Arrays.asList("售出记录")); - break; - case "lossNumber": - criteria.setType(Arrays.asList("报损")); - break; + if(StringUtils.isNotBlank(criteria.getColumn())){ + switch (criteria.getColumn()){ + case "addCountNumber": + criteria.setType(Arrays.asList("供应商入库", "盘点入库", "其他入库", "退单")); + break; + case "addNumber": + criteria.setType(Arrays.asList("供应商入库", "盘点入库", "其他入库")); + break; + case "refundNumber": + criteria.setType(Arrays.asList("退单")); + break; + case "subCountNumber": + criteria.setType(Arrays.asList("供应商出库","其他出库","盘点出库","售出记录","报损")); + break; + case "subNumber": + criteria.setType(Arrays.asList("供应商出库","其他出库","盘点出库","售出记录")); + break; + case "saleNumber": + criteria.setType(Arrays.asList("售出记录")); + break; + case "lossNumber": + criteria.setType(Arrays.asList("报损")); + break; + } } Sort sort = Sort.by(Sort.Direction.DESC, "id"); @@ -121,7 +120,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ @Override public TbProductStockCountVo stockCount(TbProductStockCountQueryCriteria criteria) throws ParseException { if (criteria.getStartTime() == null || criteria.getEndTime() == null) { - criteria.setEndTime(new Date());// + criteria.setEndTime(new Date()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); criteria.setStartTime(sdf.parse("2024-01-01"));//创建2024年1月1日的Date对象 }