From 054438085f3dd68b162155a96101ecc1d65737d3 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Sat, 17 May 2025 16:47:51 +0800 Subject: [PATCH] dev --- .../com/syjiaer/clinic/server/common/constants/Constants.java | 2 +- .../server/entity/organization/dto/DockerSearchQuery.java | 2 ++ .../syjiaer/clinic/server/service/charge/ChargeService.java | 4 ++-- .../server/service/social/SocialInventoryUploadService.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java b/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java index 214e3c9..bca9c2d 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java +++ b/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java @@ -4,7 +4,7 @@ public class Constants { public static final String IPurchaseCodePrefix = "IP"; public static final String IInitCodePrefix = "II"; public static final String RetailFeedetlSn = "FFLS"; - public static final Integer DetailPageSize = 20; + public static final Integer DetailPageSize = 100; public static final String InitInventory = "初始化库存"; public static final String PurchaseInventory = "采购入库"; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java index add886e..fa98351 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java @@ -4,6 +4,8 @@ import lombok.Data; @Data public class DockerSearchQuery { + private Integer pageNum; + private Integer pageSize; private String keyword; private Integer role; diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index 37fd90c..26e9b3a 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -716,7 +716,7 @@ public class ChargeService extends BaseService { Goods dbGoods = goodsMapper.selectById(log.getGoodsId()); chargeInventoryLog.setTrdnFlag(false); chargeInventoryLog.setUnit(dbGoods.getPackagingUnit()); - chargeInventoryLog.setNumber(log.getChangeWholeNumber()); + chargeInventoryLog.setNumber(Math.abs(log.getChangeWholeNumber())); chargeInventoryLog.setGoodsName(dbGoods.getName()); if (log.getChangeFragmentNumber() != 0) { chargeInventoryLog.setTrdnFlag(true); @@ -942,7 +942,7 @@ public class ChargeService extends BaseService { inventoryLogMapper.insert(log); //添加退款退货的记录 ChargeInventoryLog refundInventory = new ChargeInventoryLog(); - BeanUtils.copyProperties(chargeOrder, refundInventory); + BeanUtils.copyProperties(chargeInventoryLog, refundInventory); refundInventory.setType(RetailInventoryTypeEnum.Refund.getType()); refundInventory.setUploadStatus(UploadStatusEnum.NoUpload.getStatus()); refundInventory.setCreateTime(LocalDateTime.now()); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java index cb5630c..d5778aa 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java @@ -425,7 +425,7 @@ public class SocialInventoryUploadService extends BaseService { if (rlQuery.getSocialType() != null && InventorySocialTypeEnum.getByType(rlQuery.getSocialType()) != null) { queryWrapper.eq("social_type", rlQuery.getSocialType()); } - Page chargeInventoryLogPage = pageHelper(rlQuery.getPageNum(), rlQuery.getPageSize(), queryWrapper, chargeInventoryLogMapper); + Page chargeInventoryLogPage = pageHelper(rlQuery.getPageNum(), rlQuery.getPageSize(), queryWrapper, chargeInventoryLogMapper,"create_time",false); return chargeInventoryLogPage; }