fix:修复维修单及盘点执行相关问题

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("'");
         }

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;

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;
 

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);
-}
+}