clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-05-17 16:47:51 +08:00
parent a186c8e88b
commit 054438085f
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java
View File

@ -4,7 +4,7 @@ public class Constants {
public static final String IPurchaseCodePrefix = "IP"; public static final String IPurchaseCodePrefix = "IP";
public static final String IInitCodePrefix = "II"; public static final String IInitCodePrefix = "II";
public static final String RetailFeedetlSn = "FFLS"; 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 InitInventory = "初始化库存";
public static final String PurchaseInventory = "采购入库"; public static final String PurchaseInventory = "采购入库";

2
src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java
View File

@ -4,6 +4,8 @@ import lombok.Data;
@Data @Data
public class DockerSearchQuery { public class DockerSearchQuery {
private Integer pageNum;
private Integer pageSize;
private String keyword; private String keyword;
private Integer role; private Integer role;

4
src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
View File

@ -716,7 +716,7 @@ public class ChargeService extends BaseService {
Goods dbGoods = goodsMapper.selectById(log.getGoodsId()); Goods dbGoods = goodsMapper.selectById(log.getGoodsId());
chargeInventoryLog.setTrdnFlag(false); chargeInventoryLog.setTrdnFlag(false);
chargeInventoryLog.setUnit(dbGoods.getPackagingUnit()); chargeInventoryLog.setUnit(dbGoods.getPackagingUnit());
chargeInventoryLog.setNumber(log.getChangeWholeNumber()); chargeInventoryLog.setNumber(Math.abs(log.getChangeWholeNumber()));
chargeInventoryLog.setGoodsName(dbGoods.getName()); chargeInventoryLog.setGoodsName(dbGoods.getName());
if (log.getChangeFragmentNumber() != 0) { if (log.getChangeFragmentNumber() != 0) {
chargeInventoryLog.setTrdnFlag(true); chargeInventoryLog.setTrdnFlag(true);
@ -942,7 +942,7 @@ public class ChargeService extends BaseService {
inventoryLogMapper.insert(log); inventoryLogMapper.insert(log);
//添加退款退货的记录 //添加退款退货的记录
ChargeInventoryLog refundInventory = new ChargeInventoryLog(); ChargeInventoryLog refundInventory = new ChargeInventoryLog();
BeanUtils.copyProperties(chargeOrder, refundInventory); BeanUtils.copyProperties(chargeInventoryLog, refundInventory);
refundInventory.setType(RetailInventoryTypeEnum.Refund.getType()); refundInventory.setType(RetailInventoryTypeEnum.Refund.getType());
refundInventory.setUploadStatus(UploadStatusEnum.NoUpload.getStatus()); refundInventory.setUploadStatus(UploadStatusEnum.NoUpload.getStatus());
refundInventory.setCreateTime(LocalDateTime.now()); refundInventory.setCreateTime(LocalDateTime.now());

2
src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
View File

@ -425,7 +425,7 @@ public class SocialInventoryUploadService extends BaseService {
if (rlQuery.getSocialType() != null && InventorySocialTypeEnum.getByType(rlQuery.getSocialType()) != null) { if (rlQuery.getSocialType() != null && InventorySocialTypeEnum.getByType(rlQuery.getSocialType()) != null) {
queryWrapper.eq("social_type", rlQuery.getSocialType()); queryWrapper.eq("social_type", rlQuery.getSocialType());
} }
Page<ChargeInventoryLog> chargeInventoryLogPage = pageHelper(rlQuery.getPageNum(), rlQuery.getPageSize(), queryWrapper, chargeInventoryLogMapper); Page<ChargeInventoryLog> chargeInventoryLogPage = pageHelper(rlQuery.getPageNum(), rlQuery.getPageSize(), queryWrapper, chargeInventoryLogMapper,"create_time",false);
return chargeInventoryLogPage; return chargeInventoryLogPage;
} }