diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java index 049d32b..0c46e35 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java @@ -29,7 +29,7 @@ import cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo.*; import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO; import cn.iocoder.yudao.module.erp.service.devicecategory.DeviceCategoryService; -@Tag(name = "管理后台 - 进销存系统 - 器械分类") +@Tag(name = "管理后台 - 器械分类") @RestController @RequestMapping("/erp/device-category") @Validated diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java index 1f9d5ad..d15fcd7 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java @@ -9,7 +9,7 @@ import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 进销存系统 - 器械分类分页 Request VO") +@Schema(description = "管理后台 - 器械分类分页 Request VO") @Data public class DeviceCategoryPageReqVO extends PageParam { diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java index 5073a3d..5c39434 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; -@Schema(description = "管理后台 - 进销存系统 - 器械分类 Response VO") +@Schema(description = "管理后台 - 器械分类 Response VO") @Data @ExcelIgnoreUnannotated public class DeviceCategoryRespVO { diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java index 1ce338d..f2f50fb 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java @@ -5,7 +5,7 @@ import lombok.*; import java.util.*; import javax.validation.constraints.*; -@Schema(description = "管理后台 - 进销存系统 - 器械分类新增/修改 Request VO") +@Schema(description = "管理后台 - 器械分类新增/修改 Request VO") @Data public class DeviceCategorySaveReqVO { diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java index 1c2f053..2591cf0 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** - * 进销存系统 - 器械分类 DO + * 器械分类 DO * * @author 芋道源码 */ diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java index 7a33b49..f9534fc 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java @@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; /** - * 进销存系统 - 器械分类 Service 接口 + * 器械分类 Service 接口 * * @author 芋道源码 */ diff --git a/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml b/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml index a88fb3a..602f9bf 100644 --- a/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml +++ b/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml @@ -13,7 +13,7 @@ AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} - AND deleted = 0) - + AND deleted = 0) - (SELECT IFNULL(SUM(total_price), 0) FROM erp_purchase_return WHERE return_time >= #{beginTime} diff --git a/yudao-ui/yudao-ui-admin-vue3-master/src/api/erp/devicecategory/index.ts b/yudao-ui/yudao-ui-admin-vue3-master/src/api/erp/devicecategory/index.ts index 511f5d9..3b07666 100644 --- a/yudao-ui/yudao-ui-admin-vue3-master/src/api/erp/devicecategory/index.ts +++ b/yudao-ui/yudao-ui-admin-vue3-master/src/api/erp/devicecategory/index.ts @@ -1,5 +1,4 @@ import request from '@/config/axios' -import type { Dayjs } from 'dayjs'; /** 进销存系统 - 器械分类信息 */ export interface DeviceCategory { @@ -49,4 +48,4 @@ export const DeviceCategoryApi = { exportDeviceCategory: async (params) => { return await request.download({ url: `/erp/device-category/export-excel`, params }) } -} \ No newline at end of file +}