From a098a86acc0050c7bcaaf7d0cea723b759b7732a Mon Sep 17 00:00:00 2001
From: HuangHuiKang <HuangHuiKang@qq.com>
Date: Thu, 25 Jun 2026 14:18:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=8D=95=E5=8F=8A=E7=9B=98=E7=82=B9=E6=89=A7=E8=A1=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/dal/mysql/stock/ErpStockCheckItemMapper.java   | 10 ++++------
 .../admin/deviceledger/vo/DeviceLedgerPageReqVO.java   |  2 +-
 .../admin/dvrepair/vo/DvRepairPageReqVO.java           |  3 +++
 .../module/mes/dal/mysql/dvrepair/DvRepairMapper.java  |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckItemMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckItemMapper.java
index f1eb4c7f2..80c8a72d6 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckItemMapper.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckItemMapper.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckRecordPageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
 import com.alibaba.excel.util.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -23,6 +24,7 @@ import java.util.stream.Collectors;
 public interface ErpStockCheckItemMapper extends BaseMapperX<ErpStockCheckItemDO> {
 
     DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    Integer STOCK_CHECK_STATUS_CHECKED = 1;
 
     default PageResult<ErpStockCheckItemDO> selectRecordPage(ErpStockCheckRecordPageReqVO reqVO) {
         LambdaQueryWrapperX<ErpStockCheckItemDO> query = new LambdaQueryWrapperX<ErpStockCheckItemDO>()
@@ -43,6 +45,8 @@ public interface ErpStockCheckItemMapper extends BaseMapperX<ErpStockCheckItemDO
 
     default String buildCheckFilterSql(ErpStockCheckRecordPageReqVO reqVO) {
         StringBuilder checkFilterSql = new StringBuilder("select id from erp_stock_check where deleted = 0");
+        checkFilterSql.append(" and check_status = ").append(STOCK_CHECK_STATUS_CHECKED);
+        checkFilterSql.append(" and status = ").append(ErpAuditStatus.APPROVE.getStatus());
         if (StringUtils.isNotBlank(reqVO.getNo())) {
             checkFilterSql.append(" and no like '%").append(reqVO.getNo().replace("'", "''")).append("%'");
         }
@@ -60,12 +64,6 @@ public interface ErpStockCheckItemMapper extends BaseMapperX<ErpStockCheckItemDO
         if (reqVO.getCategoryType() != null) {
             checkFilterSql.append(" and category_type = ").append(reqVO.getCategoryType());
         }
-        if (reqVO.getCheckStatus() != null) {
-            checkFilterSql.append(" and check_status = ").append(reqVO.getCheckStatus());
-        }
-        if (reqVO.getStatus() != null) {
-            checkFilterSql.append(" and status = ").append(reqVO.getStatus());
-        }
         if (StringUtils.isNotBlank(reqVO.getCreator())) {
             checkFilterSql.append(" and creator = '").append(reqVO.getCreator().replace("'", "''")).append("'");
         }
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java
index 5a6eafd28..0b23f027b 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java
@@ -101,7 +101,7 @@ public class DeviceLedgerPageReqVO extends PageParam {
 
     @Schema(description = "出厂日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime[] outgoingTime;
+    private LocalDate[] outgoingTime;
 
     @Schema(description = "序列号")
     private String sn;
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java
index 7cff354a2..43a2c53cc 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java
@@ -66,6 +66,9 @@ public class DvRepairPageReqVO extends PageParam {
     @Schema(description = "单据状态0-待完成 1-已完成", example = "1")
     private Integer status;
 
+    @Schema(description = "维修状态 0-待完成 1-通过 2-不通过", example = "1")
+    private Integer repairStatus;
+
     @Schema(description = "备注")
     private String remark;
 
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java
index 5d06a60d7..143403488 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java
@@ -46,7 +46,6 @@ public interface DvRepairMapper extends BaseMapperX<DvRepairDO> {
             dvRepairDOLambdaQueryWrapperX.in(DvRepairDO::getMachineryId,reqVO.getMachineryIds());
         }*/
         dvRepairDOLambdaQueryWrapperX
-
                 .likeIfPresent(DvRepairDO::getRepairName, reqVO.getRepairName())
                 .eqIfPresent(DvRepairDO::getMachineryId, reqVO.getMachineryId())
 
@@ -61,6 +60,7 @@ public interface DvRepairMapper extends BaseMapperX<DvRepairDO> {
                 .eqIfPresent(DvRepairDO::getAcceptedBy, reqVO.getAcceptedBy())
                 .eqIfPresent(DvRepairDO::getConfirmBy, reqVO.getConfirmBy())
                 .eqIfPresent(DvRepairDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(DvRepairDO::getRepairStatus, reqVO.getRepairStatus())
                 .eqIfPresent(DvRepairDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(DvRepairDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(DvRepairDO::getCreateTime);
@@ -78,4 +78,4 @@ public interface DvRepairMapper extends BaseMapperX<DvRepairDO> {
     }
 
     void selectDeviceRepair(EventStatisticsVO eventStatisticsVO);
-}
\ No newline at end of file
+}