wslyx/ERP
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/master'
Some checks failed
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details
Java CI with Maven / build (11) (push) Has been cancelled
Details
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
Details
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
张怿凡
2025-11-19 16:59:31 +08:00
parent 1a49d40a40 8dc367968b
commit 22b51843c1
8 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java
View File

@@ -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

2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java
View File

@@ -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 {

2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java
View File

@@ -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 {

2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java
View File

@@ -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 {

2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java
View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/**
* 进销存系统 - 器械分类 DO
* 器械分类 DO
*
* @author 芋道源码
*/

2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java
View File

@@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 进销存系统 - 器械分类 Service 接口
* 器械分类 Service 接口
*
* @author 芋道源码
*/

2
yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml
View File

@@ -13,7 +13,7 @@
<if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
</if>
AND deleted = 0) -
AND deleted = 0) -
(SELECT IFNULL(SUM(total_price), 0)
FROM erp_purchase_return
WHERE return_time >= #{beginTime}

3
yudao-ui/yudao-ui-admin-vue3-master/src/api/erp/devicecategory/index.ts
View File

@@ -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 })
}
}
}