From bc28f698f509c42d23fb5a1a8bfbcc2d5d2f5cfc Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 7 May 2025 17:15:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=95=E5=85=A5=E9=A3=9F=E5=A0=82?= =?UTF-8?q?=E8=BF=9B=E9=94=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanteenErpMaterialController.java | 119 ++++++++++++ .../CanteenInventoryRecordsController.java | 122 ++++++++++++ ...CanteenInventoryRecordsItemController.java | 119 ++++++++++++ .../controller/CanteenStockController.java | 119 ++++++++++++ .../entity/CanteenErpMaterialEntity.java | 91 +++++++++ .../entity/CanteenInventoryRecordsEntity.java | 176 ++++++++++++++++++ .../CanteenInventoryRecordsItemEntity.java | 175 +++++++++++++++++ .../canteen/entity/CanteenStockEntity.java | 121 ++++++++++++ .../mapper/CanteenErpMaterialMapper.java | 11 ++ .../CanteenInventoryRecordsItemMapper.java | 11 ++ .../mapper/CanteenInventoryRecordsMapper.java | 11 ++ .../canteen/mapper/CanteenStockMapper.java | 11 ++ .../service/CanteenErpMaterialService.java | 8 + .../CanteenInventoryRecordsItemService.java | 8 + .../CanteenInventoryRecordsService.java | 8 + .../canteen/service/CanteenStockService.java | 8 + .../impl/CanteenErpMaterialServiceImpl.java | 16 ++ ...anteenInventoryRecordsItemServiceImpl.java | 16 ++ .../CanteenInventoryRecordsServiceImpl.java | 16 ++ .../service/impl/CanteenStockServiceImpl.java | 16 ++ .../mapper/CanteenErpMaterialMapper.xml | 18 ++ .../CanteenInventoryRecordsItemMapper.xml | 32 ++++ .../mapper/CanteenInventoryRecordsMapper.xml | 32 ++++ .../resources/mapper/CanteenStockMapper.xml | 23 +++ 24 files changed, 1287 insertions(+) create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenErpMaterialController.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsController.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsItemController.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenStockController.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsEntity.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsItemEntity.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenStockEntity.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenErpMaterialMapper.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsItemMapper.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsMapper.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenStockMapper.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenErpMaterialService.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsItemService.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsService.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenStockService.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsItemServiceImpl.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsItemMapper.xml create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenStockMapper.xml diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenErpMaterialController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenErpMaterialController.java new file mode 100644 index 000000000..dc8d16376 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenErpMaterialController.java @@ -0,0 +1,119 @@ +package com.bsd.pjcloud.canteen.controller; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.canteen.entity.CanteenErpMaterialEntity; +import com.bsd.pjcloud.canteen.service.CanteenErpMaterialService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 原料表 + * + * @author zjf + * @date 2025-05-07 13:16:32 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/canteenErpMaterial" ) +@Tag(description = "canteenErpMaterial" , name = "原料表管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class CanteenErpMaterialController { + + private final CanteenErpMaterialService canteenErpMaterialService; + + /** + * 分页查询 + * @param page 分页对象 + * @param canteenErpMaterial 原料表 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenErpMaterial_view')" ) + public R getCanteenErpMaterialPage(@ParameterObject Page page, @ParameterObject CanteenErpMaterialEntity canteenErpMaterial) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(canteenErpMaterialService.page(page, wrapper)); + } + + + /** + * 通过id查询原料表 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenErpMaterial_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(canteenErpMaterialService.getById(id)); + } + + /** + * 新增原料表 + * @param canteenErpMaterial 原料表 + * @return R + */ + @Operation(summary = "新增原料表" , description = "新增原料表" ) + @SysLog("新增原料表" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenErpMaterial_add')" ) + public R save(@RequestBody CanteenErpMaterialEntity canteenErpMaterial) { + return R.ok(canteenErpMaterialService.save(canteenErpMaterial)); + } + + /** + * 修改原料表 + * @param canteenErpMaterial 原料表 + * @return R + */ + @Operation(summary = "修改原料表" , description = "修改原料表" ) + @SysLog("修改原料表" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenErpMaterial_edit')" ) + public R updateById(@RequestBody CanteenErpMaterialEntity canteenErpMaterial) { + return R.ok(canteenErpMaterialService.updateById(canteenErpMaterial)); + } + + /** + * 通过id删除原料表 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除原料表" , description = "通过id删除原料表" ) + @SysLog("通过id删除原料表" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenErpMaterial_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(canteenErpMaterialService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param canteenErpMaterial 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('canteen_canteenErpMaterial_export')" ) + public List export(CanteenErpMaterialEntity canteenErpMaterial,Long[] ids) { + return canteenErpMaterialService.list(Wrappers.lambdaQuery(canteenErpMaterial).in(ArrayUtil.isNotEmpty(ids), CanteenErpMaterialEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsController.java new file mode 100644 index 000000000..fd32649aa --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsController.java @@ -0,0 +1,122 @@ +package com.bsd.pjcloud.canteen.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsEntity; +import com.bsd.pjcloud.canteen.service.CanteenInventoryRecordsService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 采购记录表 + * + * @author zjf + * @date 2025-05-07 17:00:50 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/canteenInventoryRecords" ) +@Tag(description = "canteenInventoryRecords" , name = "采购记录表管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class CanteenInventoryRecordsController { + + private final CanteenInventoryRecordsService canteenInventoryRecordsService; + + /** + * 分页查询 + * @param page 分页对象 + * @param canteenInventoryRecords 采购记录表 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecords_view')" ) + public R getCanteenInventoryRecordsPage(@ParameterObject Page page, @ParameterObject CanteenInventoryRecordsEntity canteenInventoryRecords) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StrUtil.isNotBlank(canteenInventoryRecords.getInventoryCode()),CanteenInventoryRecordsEntity::getInventoryCode,canteenInventoryRecords.getInventoryCode()); + wrapper.eq(Objects.nonNull(canteenInventoryRecords.getInventoryDate()),CanteenInventoryRecordsEntity::getInventoryDate,canteenInventoryRecords.getInventoryDate()); + return R.ok(canteenInventoryRecordsService.page(page, wrapper)); + } + + + /** + * 通过id查询采购记录表 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecords_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(canteenInventoryRecordsService.getById(id)); + } + + /** + * 新增采购记录表 + * @param canteenInventoryRecords 采购记录表 + * @return R + */ + @Operation(summary = "新增采购记录表" , description = "新增采购记录表" ) + @SysLog("新增采购记录表" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecords_add')" ) + public R save(@RequestBody CanteenInventoryRecordsEntity canteenInventoryRecords) { + return R.ok(canteenInventoryRecordsService.save(canteenInventoryRecords)); + } + + /** + * 修改采购记录表 + * @param canteenInventoryRecords 采购记录表 + * @return R + */ + @Operation(summary = "修改采购记录表" , description = "修改采购记录表" ) + @SysLog("修改采购记录表" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecords_edit')" ) + public R updateById(@RequestBody CanteenInventoryRecordsEntity canteenInventoryRecords) { + return R.ok(canteenInventoryRecordsService.updateById(canteenInventoryRecords)); + } + + /** + * 通过id删除采购记录表 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除采购记录表" , description = "通过id删除采购记录表" ) + @SysLog("通过id删除采购记录表" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecords_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(canteenInventoryRecordsService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param canteenInventoryRecords 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecords_export')" ) + public List export(CanteenInventoryRecordsEntity canteenInventoryRecords,Long[] ids) { + return canteenInventoryRecordsService.list(Wrappers.lambdaQuery(canteenInventoryRecords).in(ArrayUtil.isNotEmpty(ids), CanteenInventoryRecordsEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsItemController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsItemController.java new file mode 100644 index 000000000..2a2134dac --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenInventoryRecordsItemController.java @@ -0,0 +1,119 @@ +package com.bsd.pjcloud.canteen.controller; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsItemEntity; +import com.bsd.pjcloud.canteen.service.CanteenInventoryRecordsItemService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 采购记录明细表 + * + * @author zjf + * @date 2025-05-07 17:02:53 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/canteenInventoryRecordsItem" ) +@Tag(description = "canteenInventoryRecordsItem" , name = "采购记录明细表管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class CanteenInventoryRecordsItemController { + + private final CanteenInventoryRecordsItemService canteenInventoryRecordsItemService; + + /** + * 分页查询 + * @param page 分页对象 + * @param canteenInventoryRecordsItem 采购记录明细表 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecordsItem_view')" ) + public R getCanteenInventoryRecordsItemPage(@ParameterObject Page page, @ParameterObject CanteenInventoryRecordsItemEntity canteenInventoryRecordsItem) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(canteenInventoryRecordsItemService.page(page, wrapper)); + } + + + /** + * 通过id查询采购记录明细表 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecordsItem_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(canteenInventoryRecordsItemService.getById(id)); + } + + /** + * 新增采购记录明细表 + * @param canteenInventoryRecordsItem 采购记录明细表 + * @return R + */ + @Operation(summary = "新增采购记录明细表" , description = "新增采购记录明细表" ) + @SysLog("新增采购记录明细表" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecordsItem_add')" ) + public R save(@RequestBody CanteenInventoryRecordsItemEntity canteenInventoryRecordsItem) { + return R.ok(canteenInventoryRecordsItemService.save(canteenInventoryRecordsItem)); + } + + /** + * 修改采购记录明细表 + * @param canteenInventoryRecordsItem 采购记录明细表 + * @return R + */ + @Operation(summary = "修改采购记录明细表" , description = "修改采购记录明细表" ) + @SysLog("修改采购记录明细表" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecordsItem_edit')" ) + public R updateById(@RequestBody CanteenInventoryRecordsItemEntity canteenInventoryRecordsItem) { + return R.ok(canteenInventoryRecordsItemService.updateById(canteenInventoryRecordsItem)); + } + + /** + * 通过id删除采购记录明细表 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除采购记录明细表" , description = "通过id删除采购记录明细表" ) + @SysLog("通过id删除采购记录明细表" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecordsItem_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(canteenInventoryRecordsItemService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param canteenInventoryRecordsItem 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('canteen_canteenInventoryRecordsItem_export')" ) + public List export(CanteenInventoryRecordsItemEntity canteenInventoryRecordsItem,Long[] ids) { + return canteenInventoryRecordsItemService.list(Wrappers.lambdaQuery(canteenInventoryRecordsItem).in(ArrayUtil.isNotEmpty(ids), CanteenInventoryRecordsItemEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenStockController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenStockController.java new file mode 100644 index 000000000..b5e68887d --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenStockController.java @@ -0,0 +1,119 @@ +package com.bsd.pjcloud.canteen.controller; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.canteen.entity.CanteenStockEntity; +import com.bsd.pjcloud.canteen.service.CanteenStockService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 库存表 + * + * @author zjf + * @date 2025-05-07 16:40:35 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/canteenStock" ) +@Tag(description = "canteenStock" , name = "库存表管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class CanteenStockController { + + private final CanteenStockService canteenStockService; + + /** + * 分页查询 + * @param page 分页对象 + * @param canteenStock 库存表 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenStock_view')" ) + public R getCanteenStockPage(@ParameterObject Page page, @ParameterObject CanteenStockEntity canteenStock) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(canteenStockService.page(page, wrapper)); + } + + + /** + * 通过id查询库存表 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('canteen_canteenStock_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(canteenStockService.getById(id)); + } + + /** + * 新增库存表 + * @param canteenStock 库存表 + * @return R + */ + @Operation(summary = "新增库存表" , description = "新增库存表" ) + @SysLog("新增库存表" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenStock_add')" ) + public R save(@RequestBody CanteenStockEntity canteenStock) { + return R.ok(canteenStockService.save(canteenStock)); + } + + /** + * 修改库存表 + * @param canteenStock 库存表 + * @return R + */ + @Operation(summary = "修改库存表" , description = "修改库存表" ) + @SysLog("修改库存表" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenStock_edit')" ) + public R updateById(@RequestBody CanteenStockEntity canteenStock) { + return R.ok(canteenStockService.updateById(canteenStock)); + } + + /** + * 通过id删除库存表 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除库存表" , description = "通过id删除库存表" ) + @SysLog("通过id删除库存表" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('canteen_canteenStock_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(canteenStockService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param canteenStock 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('canteen_canteenStock_export')" ) + public List export(CanteenStockEntity canteenStock,Long[] ids) { + return canteenStockService.list(Wrappers.lambdaQuery(canteenStock).in(ArrayUtil.isNotEmpty(ids), CanteenStockEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java new file mode 100644 index 000000000..e262f1abf --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenErpMaterialEntity.java @@ -0,0 +1,91 @@ +package com.bsd.pjcloud.canteen.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 原料表 + * + * @author zjf + * @date 2025-05-07 13:16:32 + */ +@Data +@TenantTable +@TableName("canteen_erp_material") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "原料表") +public class CanteenErpMaterialEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + private String name; + + /** + * 商品单位 + */ + @Schema(description="商品单位") + private String unit; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsEntity.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsEntity.java new file mode 100644 index 000000000..8d20259bd --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsEntity.java @@ -0,0 +1,176 @@ +package com.bsd.pjcloud.canteen.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 采购记录表 + * + * @author zjf + * @date 2025-05-07 17:00:50 + */ +@Data +@TenantTable +@TableName("canteen_inventory_records") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "采购记录表") +public class CanteenInventoryRecordsEntity extends Model { + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="主键") + private Long id; + + /** + * 单据编号(规则生成，出入库编号) + */ + @Schema(description="单据编号(规则生成，出入库编号)") + private String inventoryCode; + + /** + * 单据日期 + */ + @Schema(description="单据日期") + private LocalDate inventoryDate; + + /** + * 单据类型(字典inventory_type)采购入库 + */ + @Schema(description="单据类型(字典inventory_type)采购入库") + private String inventoryType; + + /** + * 来源ID（根据类型指向对应的表，如采购单ID、退货单ID等） + */ + @Schema(description="来源ID（根据类型指向对应的表，如采购单ID、退货单ID等）") + private String linkCode; + + /** + * 经办人id + */ + @Schema(description="经办人id") + private Long handlerUserId; + + /** + * 审批状态 + */ + @Schema(description="审批状态") + private String checkStatus; + + /** + * 审批人id + */ + @Schema(description="审批人id") + private String checkUserId; + + /** + * 审核日期 + */ + @Schema(description="审核日期") + private LocalDateTime checkTime; + + /** + * 商户编号 + */ + @Schema(description="商户编号") + private Long merchantId; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 货商 + */ + @Schema(description="货商") + private Long supplierId; + + /** + * 备注 + */ + @Schema(description="备注") + private String remark; + + /** + * 订单类型(1入库 2出库) + */ + @Schema(description="订单类型(1入库 2出库)") + private String orderType; + + /** + * 入库总金额 + */ + @Schema(description="入库总金额") + private Integer totalAmount; + + /** + * 收款金额 + */ + @Schema(description="收款金额") + private Integer receiveAmount; + + /** + * 实例id + */ + @Schema(description="实例id") + private String processInstanceId; + + /** + * 审核原因 + */ + @Schema(description="审核原因") + private String checkReason; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsItemEntity.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsItemEntity.java new file mode 100644 index 000000000..9c100f0a5 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenInventoryRecordsItemEntity.java @@ -0,0 +1,175 @@ +package com.bsd.pjcloud.canteen.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 采购记录明细表 + * + * @author zjf + * @date 2025-05-07 17:02:53 + */ +@Data +@TenantTable +@TableName("canteen_inventory_records_item") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "采购记录明细表") +public class CanteenInventoryRecordsItemEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 单据类型(字典inventory_type) + */ + @Schema(description="单据类型(字典inventory_type)") + private String inventoryType; + + /** + * 原料id + */ + @Schema(description="原料id") + private Long erpMaterialId; + + /** + * 商户编号 + */ + @Schema(description="商户编号") + private Long merchantId; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 出入库数量 + */ + @Schema(description="出入库数量") + private Integer quantity; + + /** + * 单价 + */ + @Schema(description="单价") + private Integer unitPrice; + + /** + * 总金额 + */ + @Schema(description="总金额") + private Integer totalAmount; + + /** + * 税率% + */ + @Schema(description="税率%") + private Integer taxRate; + + /** + * 税前金额 + */ + @Schema(description="税前金额") + private Integer taxAmount; + + /** + * 货商 + */ + @Schema(description="货商") + private Long supplierId; + + /** + * 备注 + */ + @Schema(description="备注") + private String remark; + + /** + * 订单类型(1入库 2出库) + */ + @Schema(description="订单类型(1入库 2出库)") + private String orderType; + + /** + * 出入库关联id + */ + @Schema(description="出入库关联id") + private Long inventoryId; + + /** + * 总数 + */ + @Schema(description="总数") + private Integer totalNumber; + + /** + * 账面数量 + */ + @Schema(description="账面数量") + private Integer accountNumber; + + /** + * 实际数量 + */ + @Schema(description="实际数量") + private Integer realNumber; + + /** + * 实际单价 + */ + @Schema(description="实际单价") + private Integer realPrice; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenStockEntity.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenStockEntity.java new file mode 100644 index 000000000..7f06ce3ad --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenStockEntity.java @@ -0,0 +1,121 @@ +package com.bsd.pjcloud.canteen.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 库存表 + * + * @author zjf + * @date 2025-05-07 16:40:35 + */ +@Data +@TenantTable +@TableName("canteen_stock") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "库存表") +public class CanteenStockEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 期初数量 + */ + @Schema(description="期初数量") + private Double baseStock; + + /** + * 类型 原料/成品 + */ + @Schema(description="类型 原料/成品") + private String itemType; + + /** + * 成品id/原料id + */ + @Schema(description="成品id/原料id") + private Long itemId; + + /** + * 乐观锁版本号 + */ + @Schema(description="乐观锁版本号") + private Integer version; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 库存上限 + */ + @Schema(description="库存上限") + private Integer inventoryUpperLimit; + + /** + * 库存下限 + */ + @Schema(description="库存下限") + private Integer inventoryLowerLimit; + + /** + * 当前库存数量 + */ + @Schema(description="当前库存数量") + private Double currentStock; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenErpMaterialMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenErpMaterialMapper.java new file mode 100644 index 000000000..4b837959c --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenErpMaterialMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.canteen.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.canteen.entity.CanteenErpMaterialEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CanteenErpMaterialMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsItemMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsItemMapper.java new file mode 100644 index 000000000..1b646dd0d --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsItemMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.canteen.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsItemEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CanteenInventoryRecordsItemMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsMapper.java new file mode 100644 index 000000000..0b0d8aa5e --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenInventoryRecordsMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.canteen.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CanteenInventoryRecordsMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenStockMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenStockMapper.java new file mode 100644 index 000000000..e5de4001e --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenStockMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.canteen.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.canteen.entity.CanteenStockEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CanteenStockMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenErpMaterialService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenErpMaterialService.java new file mode 100644 index 000000000..0bb1e2c4c --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenErpMaterialService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.canteen.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.canteen.entity.CanteenErpMaterialEntity; + +public interface CanteenErpMaterialService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsItemService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsItemService.java new file mode 100644 index 000000000..23b6d7363 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsItemService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.canteen.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsItemEntity; + +public interface CanteenInventoryRecordsItemService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsService.java new file mode 100644 index 000000000..139e8f111 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenInventoryRecordsService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.canteen.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsEntity; + +public interface CanteenInventoryRecordsService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenStockService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenStockService.java new file mode 100644 index 000000000..cff489e4a --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenStockService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.canteen.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.canteen.entity.CanteenStockEntity; + +public interface CanteenStockService extends IService { + +} \ No newline at end of file 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 new file mode 100644 index 000000000..6adbdeb1a --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.canteen.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.canteen.entity.CanteenErpMaterialEntity; +import com.bsd.pjcloud.canteen.mapper.CanteenErpMaterialMapper; +import com.bsd.pjcloud.canteen.service.CanteenErpMaterialService; +import org.springframework.stereotype.Service; +/** + * 原料表 + * + * @author zjf + * @date 2025-05-07 13:16:32 + */ +@Service +public class CanteenErpMaterialServiceImpl extends ServiceImpl implements CanteenErpMaterialService { +} \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsItemServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsItemServiceImpl.java new file mode 100644 index 000000000..a33e412d9 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsItemServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.canteen.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsItemEntity; +import com.bsd.pjcloud.canteen.mapper.CanteenInventoryRecordsItemMapper; +import com.bsd.pjcloud.canteen.service.CanteenInventoryRecordsItemService; +import org.springframework.stereotype.Service; +/** + * 采购记录明细表 + * + * @author zjf + * @date 2025-05-07 17:02:53 + */ +@Service +public class CanteenInventoryRecordsItemServiceImpl extends ServiceImpl implements CanteenInventoryRecordsItemService { +} \ No newline at end of file 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 new file mode 100644 index 000000000..6fcf2de4a --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.canteen.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsEntity; +import com.bsd.pjcloud.canteen.mapper.CanteenInventoryRecordsMapper; +import com.bsd.pjcloud.canteen.service.CanteenInventoryRecordsService; +import org.springframework.stereotype.Service; +/** + * 采购记录表 + * + * @author zjf + * @date 2025-05-07 17:00:50 + */ +@Service +public class CanteenInventoryRecordsServiceImpl extends ServiceImpl implements CanteenInventoryRecordsService { +} \ No newline at end of file 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 new file mode 100644 index 000000000..e2cf940b3 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.canteen.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.canteen.entity.CanteenStockEntity; +import com.bsd.pjcloud.canteen.mapper.CanteenStockMapper; +import com.bsd.pjcloud.canteen.service.CanteenStockService; +import org.springframework.stereotype.Service; +/** + * 库存表 + * + * @author zjf + * @date 2025-05-07 16:40:35 + */ +@Service +public class CanteenStockServiceImpl extends ServiceImpl implements CanteenStockService { +} \ 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 new file mode 100644 index 000000000..883e8bd42 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenErpMaterialMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsItemMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsItemMapper.xml new file mode 100644 index 000000000..974a508dd --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsItemMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 000000000..ee9c5ec22 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenStockMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenStockMapper.xml new file mode 100644 index 000000000..00e0a27e6 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenStockMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From c6484b539bdc2519338edf614ea3ef0dbe3365d5 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 8 May 2025 09:32:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=AF=97=E7=94=BB?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ThirdPartyOAth2Cotroller.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java index f4af37895..d20090ea2 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java @@ -218,12 +218,12 @@ public class ThirdPartyOAth2Cotroller { if(!CollectionUtils.isEmpty(sysUserList)){ SysUser sysUser = sysUserList.get(0); //判断当前用户设备是否信任 - String md5 = DeviceFingerprintUtil.generate(httpServletRequest); - R userTrustedDeviceR = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(sysUser.getPhone(), md5); - UserTrustedDeviceEntity userTrustedDevice = userTrustedDeviceR.getData(); - if (userTrustedDevice == null || userTrustedDevice.getExpireTime().isBefore(LocalDateTime.now())){ - return R.failed(-1,"请先信任设备"); - } +// String md5 = DeviceFingerprintUtil.generate(httpServletRequest); +// R userTrustedDeviceR = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(sysUser.getPhone(), md5); +// UserTrustedDeviceEntity userTrustedDevice = userTrustedDeviceR.getData(); +// if (userTrustedDevice == null || userTrustedDevice.getExpireTime().isBefore(LocalDateTime.now())){ +// return R.failed(-1,"请先信任设备"); +// } //登录成功生成token UserTokenDTO userTokenDTO = new UserTokenDTO(); userTokenDTO.setSysUser(sysUser);