From 8198bd7484be9aee63b3492b7688e3ff4fe03757 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 22 May 2025 22:22:47 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CanteenErpMaterialEntity.java | 5 ++ .../mapper/CanteenErpMaterialMapper.xml | 1 + .../vo/meeting/app/EquipmentVo.java | 21 +++++++ .../vo/meeting/app/MeetingRoomPageVo.java | 2 + .../controller/MeetingRoomController.java | 4 +- .../mapper/MeetingBookingMapper.java | 6 ++ .../service/impl/MeetingRoomServiceImpl.java | 55 +++++++++++++++---- .../resources/mapper/MeetingBookingMapper.xml | 3 + 8 files changed, 84 insertions(+), 13 deletions(-) create mode 100644 pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/app/EquipmentVo.java diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java index da4d71057..708868fd8 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java @@ -90,5 +90,10 @@ public class CanteenErpMaterialEntity extends Model { private Long tenantId; + /** + * 采购价格 + */ + @Schema(description="采购价格") + private Integer purchasePrice; } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml index 24818d5bf..a179ff745 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml @@ -14,6 +14,7 @@ + + SELECT * FROM meeting_booking WHERE room_id = #{roomId} AND start_time >= #{startTime} AND start_time <= #{endTime} + \ No newline at end of file From 4094db89342a84f59d90ee6317c7499c84b3d69a Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 22 May 2025 23:22:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=A3=9F=E5=A0=82erp=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/dto/erp/CanteenErpMaterialSaveDTO.java | 4 ++++ .../pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java | 4 ++++ .../pjcloud/canteen/vo/erp/ErpMaterialPageVo.java | 4 ++++ .../canteen/vo/erp/InventoryRecordItemVo.java | 9 +++++++++ .../service/impl/CanteenErpMaterialServiceImpl.java | 3 ++- .../impl/CanteenInventoryRecordsServiceImpl.java | 12 ++++++++---- .../service/impl/CanteenStockServiceImpl.java | 2 +- .../mapper/CanteenInventoryRecordsMapper.xml | 3 ++- 8 files changed, 34 insertions(+), 7 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java index 78908eef7..8c2f58b17 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java @@ -37,4 +37,8 @@ public class CanteenErpMaterialSaveDTO { */ @Schema(description="库存下限") private Integer inventoryLowerLimit; + + + @Schema(description="采购价格") + private Integer purchasePrice; } diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java index 57b79cb6e..62e60afec 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java @@ -43,4 +43,8 @@ public class CanteenErpMaterialVO { @Schema(description="当前总库存") private Double currentStock; + + + @Schema(description="采购价格") + private Integer purchasePrice; } diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java index fc34a2492..c65626eab 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java @@ -33,4 +33,8 @@ public class ErpMaterialPageVo { */ @Schema(description="当前库存数量") private Double stock; + + + @Schema(description="采购价格") + private Integer purchasePrice; } diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java index ea57c65c0..bc9d7ec0e 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java @@ -22,6 +22,9 @@ public class InventoryRecordItemVo { @Schema(description="食材id") private Long erpMaterialId; + @Schema(description="食材名称") + private String name; + /** * 主表id */ @@ -45,6 +48,12 @@ public class InventoryRecordItemVo { @Schema(description="累计总金额") private Integer totalAmount; + /** + * 累计数量 + */ + @Schema(description="累计数量") + private Integer totalNumber; + /** * 备注 */ diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java index 561929812..9fb2f097c 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java @@ -64,6 +64,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl canteenStockEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); canteenStockEntityLambdaQueryWrapper.eq(CanteenStockEntity::getItemId, id); @@ -75,7 +76,6 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl().eq(CanteenStockEntity::getItemId, id)); @@ -103,6 +103,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl { List smeErpCgPlanItemVos = BeanUtils.toBean(list, InventoryRecordItemVo.class); + smeErpCgPlanItemVos.stream().forEach(item -> { + CanteenErpMaterialEntity canteenErpMaterialEntity = canteenErpMaterialMapper.selectById(item.getErpMaterialId()); + item.setName(canteenErpMaterialEntity.getName()); + }); source.setItems(smeErpCgPlanItemVos); }); diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java index 7a3124e5e..f109d0a5d 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java @@ -47,7 +47,7 @@ public class CanteenStockServiceImpl extends ServiceImpl canteenErpMaterialEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); canteenErpMaterialEntityLambdaQueryWrapper.eq(CanteenErpMaterialEntity::getId,item.getId()); CanteenErpMaterialEntity canteenErpMaterialEntity = canteenErpMaterialMapper.selectOne(canteenErpMaterialEntityLambdaQueryWrapper); diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml index ddff9e2f5..8b19a1ef5 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml @@ -48,6 +48,7 @@ and cpr.production_time = #{inventoryDate} - GROUP BY r.id; + GROUP BY r.id + order by r.create_time desc \ No newline at end of file From 503cf757da22381611e90f6615a4bdcd334f1d76 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 23 May 2025 09:41:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=A3=9F=E5=A0=82erp=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java index 81d62dde0..375ce5e0d 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java @@ -151,7 +151,11 @@ public class CanteenSpuServiceImpl extends ServiceImpl canteenSpuSimpleVOList = BeanUtils.toBean(pageData.getRecords(), CanteenSpuSimpleVO.class); Page canteenSpuSimpleVOPage = new Page<>(); canteenSpuSimpleVOPage.setRecords(canteenSpuSimpleVOList); - org.springframework.beans.BeanUtils.copyProperties(pageData, pageData, "records"); // 复制分页参数 + pageData.setCurrent(pageData.getCurrent()); + canteenSpuSimpleVOPage.setPages(pageData.getPages()); + canteenSpuSimpleVOPage.setSize(pageData.getSize()); + canteenSpuSimpleVOPage.setTotal(pageData.getTotal()); + // 复制分页参数 return canteenSpuSimpleVOPage; } From b9d6d0b0e1e853a0ecea56eaa8d6298970e719a5 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 23 May 2025 10:10:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=A3=9F=E5=A0=82erp=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/canteen/dto/erp/CanteenInventoryRecordsdDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordsdDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordsdDTO.java index a8af8727d..72d14a3c6 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordsdDTO.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordsdDTO.java @@ -67,7 +67,7 @@ public class CanteenInventoryRecordsdDTO { @Schema(description="入库明细") - private List canteenInventoryRecordsItemDTOS; + private List items; } From ade3249661992d617f05c0630a19ec01f91c80e2 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 23 May 2025 10:12:46 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=A3=9F=E5=A0=82erp=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/canteen/dto/erp/CanteenInventoryRecordEditDTO.java | 2 +- .../service/impl/CanteenInventoryRecordsServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordEditDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordEditDTO.java index dede1cc6a..c26a51a52 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordEditDTO.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenInventoryRecordEditDTO.java @@ -86,7 +86,7 @@ public class CanteenInventoryRecordEditDTO { /** * @Link SmCgPlanEditItemDTO */ - @Schema(description="item") + @Schema(description="items") private List items; diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java index a344b22d9..1334c1cec 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java @@ -58,7 +58,7 @@ public class CanteenInventoryRecordsServiceImpl extends ServiceImpl canteenInventoryRecordsItemDTOS = canteenInventoryRecordsdDTO.getCanteenInventoryRecordsItemDTOS(); + List canteenInventoryRecordsItemDTOS = canteenInventoryRecordsdDTO.getItems(); List canteenInventoryRecordsItemEntityList = BeanUtils.toBean(canteenInventoryRecordsItemDTOS, CanteenInventoryRecordsItemEntity.class); From 02eb6dd002bb0070c5c8cd807a23c3f7f0bef476 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 23 May 2025 10:44:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=A3=9F=E5=A0=82erp=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CanteenErpMaterialMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml index a179ff745..05660e129 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml @@ -21,6 +21,7 @@ m.id, m.name, m.unit, + m.purchase_price, s.base_stock AS baseStock, s.inventory_upper_limit AS inventoryUpperLimit, s.inventory_lower_limit AS inventoryLowerLimit, From 9fe173745efa68e703687086203233c956fbc1cf Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 23 May 2025 10:54:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=A3=9F=E5=A0=82erp=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/service/impl/CanteenErpMaterialServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java index 9fb2f097c..c4caac5cd 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java @@ -44,6 +44,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl