refactor(module(qa)): 代码重构

zhuguifei

2026-03-04 63b4909ac5d0b7355be211cc7080673b41cdb3cc

refactor(module(qa)): 代码重构

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/controller/FeedmatchTimeDataController.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/FeedmatchTimeDataController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.controller;
package org.dromara.qa.analy.controller;

import java.util.Date;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.analy.domain.bo.FeedmatchTimeDataBo;
import org.dromara.analy.service.IFeedmatchTimeDataService;
import org.dromara.qa.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.qa.analy.domain.bo.FeedmatchTimeDataBo;
import org.dromara.qa.analy.service.IFeedmatchTimeDataService;
import org.dromara.common.mybatis.core.page.TableDataInfo;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/controller/HoisterTimeDataController.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/HoisterTimeDataController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.controller;
package org.dromara.qa.analy.controller;

import java.util.Date;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.analy.domain.bo.HoisterTimeDataBo;
import org.dromara.analy.service.IHoisterTimeDataService;
import org.dromara.qa.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.qa.analy.domain.bo.HoisterTimeDataBo;
import org.dromara.qa.analy.service.IHoisterTimeDataService;
import org.dromara.common.mybatis.core.page.TableDataInfo;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/controller/PackerTimeDataController.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/PackerTimeDataController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.controller;
package org.dromara.qa.analy.controller;

import java.util.Date;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.analy.domain.vo.PackerTimeDataVo;
import org.dromara.analy.domain.bo.PackerTimeDataBo;
import org.dromara.analy.service.IPackerTimeDataService;
import org.dromara.qa.analy.domain.vo.PackerTimeDataVo;
import org.dromara.qa.analy.domain.bo.PackerTimeDataBo;
import org.dromara.qa.analy.service.IPackerTimeDataService;
import org.dromara.common.mybatis.core.page.TableDataInfo;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/controller/RollerTimeDataController.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/RollerTimeDataController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.controller;
package org.dromara.qa.analy.controller;

import java.util.Date;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.analy.domain.vo.RollerTimeDataVo;
import org.dromara.analy.domain.bo.RollerTimeDataBo;
import org.dromara.analy.service.IRollerTimeDataService;
import org.dromara.qa.analy.domain.vo.RollerTimeDataVo;
import org.dromara.qa.analy.domain.bo.RollerTimeDataBo;
import org.dromara.qa.analy.service.IRollerTimeDataService;
import org.dromara.common.mybatis.core.page.TableDataInfo;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/controller/StoreSilkInfoController.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/StoreSilkInfoController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.controller;
package org.dromara.qa.analy.controller;

import java.util.List;

@@ -17,9 +17,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.analy.domain.bo.StoreSilkInfoBo;
import org.dromara.analy.service.IStoreSilkInfoService;
import org.dromara.qa.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.qa.analy.domain.bo.StoreSilkInfoBo;
import org.dromara.qa.analy.service.IStoreSilkInfoService;
import org.dromara.common.mybatis.core.page.TableDataInfo;

/**
@@ -42,7 +42,6 @@
    @SaCheckPermission("analy:storeSilk:list")
    @GetMapping("/list")
    public TableDataInfo<StoreSilkInfoVo> list(StoreSilkInfoBo bo, PageQuery pageQuery) {

        return storeSilkInfoService.queryPageList(bo, pageQuery);
    }


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/BoxTimeData.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/BoxTimeData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/FeedmatchTimeData.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/HoisterTimeData.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/HoisterTimeData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/MakeupTimeData.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/MakeupTimeData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/PackerTimeData.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/PackerTimeData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/RollerTimeData.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/RollerTimeData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/StoreSilkInfo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/StoreSilkInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/TransTimeData.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/TransTimeData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.domain;
package org.dromara.qa.analy.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/bo/FeedmatchTimeDataBo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/FeedmatchTimeDataBo.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.dromara.analy.domain.bo;
package org.dromara.qa.analy.domain.bo;

import org.dromara.analy.domain.FeedmatchTimeData;
import org.dromara.qa.analy.domain.FeedmatchTimeData;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@@ -9,7 +9,6 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * å–‚丝机对应关系业务对象 feedmatch_time_data

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/bo/HoisterTimeDataBo.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/HoisterTimeDataBo.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.dromara.analy.domain.bo;
package org.dromara.qa.analy.domain.bo;

import org.dromara.analy.domain.HoisterTimeData;
import org.dromara.qa.analy.domain.HoisterTimeData;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/bo/PackerTimeDataBo.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/PackerTimeDataBo.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.dromara.analy.domain.bo;
package org.dromara.qa.analy.domain.bo;

import org.dromara.analy.domain.PackerTimeData;
import org.dromara.qa.analy.domain.PackerTimeData;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/bo/RollerTimeDataBo.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/RollerTimeDataBo.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.dromara.analy.domain.bo;
package org.dromara.qa.analy.domain.bo;

import org.dromara.analy.domain.RollerTimeData;
import org.dromara.qa.analy.domain.RollerTimeData;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/bo/StoreSilkInfoBo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/StoreSilkInfoBo.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.dromara.analy.domain.bo;
package org.dromara.qa.analy.domain.bo;

import org.dromara.analy.domain.StoreSilkInfo;
import org.dromara.qa.analy.domain.StoreSilkInfo;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@@ -9,7 +9,6 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * å‚¨ä¸æŸœäº§é‡ä¸šåŠ¡å¯¹è±¡ oracle_store_silk

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/FeedmatchTimeDataVo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/FeedmatchTimeDataVo.java ÐÞ¸Ä
@@ -1,19 +1,15 @@
package org.dromara.analy.domain.vo;
package org.dromara.qa.analy.domain.vo;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.analy.domain.FeedmatchTimeData;

import org.dromara.qa.analy.domain.FeedmatchTimeData;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;

import java.io.Serial;
import java.io.Serializable;
import java.util.Date;



/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/HoisterTimeDataVo.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/HoisterTimeDataVo.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package org.dromara.analy.domain.vo;
package org.dromara.qa.analy.domain.vo;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.dromara.analy.domain.HoisterTimeData;
import org.dromara.qa.analy.domain.HoisterTimeData;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/PackerTimeDataVo.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/PackerTimeDataVo.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package org.dromara.analy.domain.vo;
package org.dromara.qa.analy.domain.vo;

import java.util.Date;

import org.dromara.analy.domain.PackerTimeData;
import org.dromara.qa.analy.domain.PackerTimeData;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/RollerTimeDataVo.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/RollerTimeDataVo.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package org.dromara.analy.domain.vo;
package org.dromara.qa.analy.domain.vo;

import java.util.Date;

import org.dromara.analy.domain.RollerTimeData;
import org.dromara.qa.analy.domain.RollerTimeData;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/StoreSilkInfoVo.java ÐÞ¸Ä
@@ -1,19 +1,15 @@
package org.dromara.analy.domain.vo;
package org.dromara.qa.analy.domain.vo;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.analy.domain.StoreSilkInfo;

import org.dromara.qa.analy.domain.StoreSilkInfo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;

import java.io.Serial;
import java.io.Serializable;
import java.util.Date;



/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/mapper/FeedmatchTimeDataMapper.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/FeedmatchTimeDataMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.mapper;
package org.dromara.qa.analy.mapper;

import org.dromara.analy.domain.FeedmatchTimeData;
import org.dromara.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.qa.analy.domain.FeedmatchTimeData;
import org.dromara.qa.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/mapper/HoisterTimeDataMapper.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/HoisterTimeDataMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.mapper;
package org.dromara.qa.analy.mapper;

import org.dromara.analy.domain.HoisterTimeData;
import org.dromara.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.qa.analy.domain.HoisterTimeData;
import org.dromara.qa.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/mapper/PackerTimeDataMapper.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/PackerTimeDataMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.mapper;
package org.dromara.qa.analy.mapper;

import org.dromara.analy.domain.PackerTimeData;
import org.dromara.analy.domain.vo.PackerTimeDataVo;
import org.dromara.qa.analy.domain.PackerTimeData;
import org.dromara.qa.analy.domain.vo.PackerTimeDataVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/mapper/RollerTimeDataMapper.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/RollerTimeDataMapper.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package org.dromara.analy.mapper;
package org.dromara.qa.analy.mapper;

import org.dromara.analy.domain.RollerTimeData;
import org.dromara.analy.domain.bo.RollerTimeDataBo;
import org.dromara.analy.domain.vo.RollerTimeDataVo;
import org.dromara.qa.analy.domain.RollerTimeData;
import org.dromara.qa.analy.domain.bo.RollerTimeDataBo;
import org.dromara.qa.analy.domain.vo.RollerTimeDataVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

import org.apache.ibatis.annotations.Param;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/mapper/StoreSilkInfoMapper.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/StoreSilkInfoMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.mapper;
package org.dromara.qa.analy.mapper;

import org.dromara.analy.domain.StoreSilkInfo;
import org.dromara.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.qa.analy.domain.StoreSilkInfo;
import org.dromara.qa.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/IFeedmatchTimeDataService.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IFeedmatchTimeDataService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.service;
package org.dromara.qa.analy.service;

import org.dromara.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.analy.domain.bo.FeedmatchTimeDataBo;
import org.dromara.qa.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.qa.analy.domain.bo.FeedmatchTimeDataBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/IHoisterTimeDataService.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IHoisterTimeDataService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.service;
package org.dromara.qa.analy.service;

import org.dromara.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.analy.domain.bo.HoisterTimeDataBo;
import org.dromara.qa.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.qa.analy.domain.bo.HoisterTimeDataBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/IPackerTimeDataService.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IPackerTimeDataService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.service;
package org.dromara.qa.analy.service;

import org.dromara.analy.domain.vo.PackerTimeDataVo;
import org.dromara.analy.domain.bo.PackerTimeDataBo;
import org.dromara.qa.analy.domain.vo.PackerTimeDataVo;
import org.dromara.qa.analy.domain.bo.PackerTimeDataBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/IRollerTimeDataService.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IRollerTimeDataService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.service;
package org.dromara.qa.analy.service;

import org.dromara.analy.domain.vo.RollerTimeDataVo;
import org.dromara.analy.domain.bo.RollerTimeDataBo;
import org.dromara.qa.analy.domain.vo.RollerTimeDataVo;
import org.dromara.qa.analy.domain.bo.RollerTimeDataBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/IStoreSilkInfoService.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IStoreSilkInfoService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.analy.service;
package org.dromara.qa.analy.service;

import org.dromara.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.analy.domain.bo.StoreSilkInfoBo;
import org.dromara.qa.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.qa.analy.domain.bo.StoreSilkInfoBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/FeedmatchTimeDataServiceImpl.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/FeedmatchTimeDataServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.service.impl;
package org.dromara.qa.analy.service.impl;

import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.analy.domain.bo.FeedmatchTimeDataBo;
import org.dromara.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.analy.domain.FeedmatchTimeData;
import org.dromara.analy.mapper.FeedmatchTimeDataMapper;
import org.dromara.analy.service.IFeedmatchTimeDataService;
import org.dromara.qa.analy.domain.bo.FeedmatchTimeDataBo;
import org.dromara.qa.analy.domain.vo.FeedmatchTimeDataVo;
import org.dromara.qa.analy.domain.FeedmatchTimeData;
import org.dromara.qa.analy.mapper.FeedmatchTimeDataMapper;
import org.dromara.qa.analy.service.IFeedmatchTimeDataService;

import java.util.Date;
import java.util.List;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/HoisterTimeDataServiceImpl.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/HoisterTimeDataServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.service.impl;
package org.dromara.qa.analy.service.impl;

import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.analy.domain.bo.HoisterTimeDataBo;
import org.dromara.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.analy.domain.HoisterTimeData;
import org.dromara.analy.mapper.HoisterTimeDataMapper;
import org.dromara.analy.service.IHoisterTimeDataService;
import org.dromara.qa.analy.domain.bo.HoisterTimeDataBo;
import org.dromara.qa.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.qa.analy.domain.HoisterTimeData;
import org.dromara.qa.analy.mapper.HoisterTimeDataMapper;
import org.dromara.qa.analy.service.IHoisterTimeDataService;

import java.util.Date;
import java.util.List;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/PackerTimeDataServiceImpl.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/PackerTimeDataServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.service.impl;
package org.dromara.qa.analy.service.impl;

import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.analy.domain.bo.PackerTimeDataBo;
import org.dromara.analy.domain.vo.PackerTimeDataVo;
import org.dromara.analy.domain.PackerTimeData;
import org.dromara.analy.mapper.PackerTimeDataMapper;
import org.dromara.analy.service.IPackerTimeDataService;
import org.dromara.qa.analy.domain.bo.PackerTimeDataBo;
import org.dromara.qa.analy.domain.vo.PackerTimeDataVo;
import org.dromara.qa.analy.domain.PackerTimeData;
import org.dromara.qa.analy.mapper.PackerTimeDataMapper;
import org.dromara.qa.analy.service.IPackerTimeDataService;

import java.util.Date;
import java.util.List;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/RollerTimeDataServiceImpl.java

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/RollerTimeDataServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.service.impl;
package org.dromara.qa.analy.service.impl;

import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.analy.domain.bo.RollerTimeDataBo;
import org.dromara.analy.domain.vo.RollerTimeDataVo;
import org.dromara.analy.domain.RollerTimeData;
import org.dromara.analy.mapper.RollerTimeDataMapper;
import org.dromara.analy.service.IRollerTimeDataService;
import org.dromara.qa.analy.domain.bo.RollerTimeDataBo;
import org.dromara.qa.analy.domain.vo.RollerTimeDataVo;
import org.dromara.qa.analy.domain.RollerTimeData;
import org.dromara.qa.analy.mapper.RollerTimeDataMapper;
import org.dromara.qa.analy.service.IRollerTimeDataService;

import java.util.Date;
import java.util.List;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/StoreSilkInfoServiceImpl.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/StoreSilkInfoServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.analy.service.impl;
package org.dromara.qa.analy.service.impl;

import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,18 +10,16 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.analy.domain.bo.StoreSilkInfoBo;
import org.dromara.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.analy.domain.StoreSilkInfo;
import org.dromara.analy.mapper.StoreSilkInfoMapper;
import org.dromara.analy.service.IStoreSilkInfoService;
import org.dromara.analy.mapper.FeedmatchTimeDataMapper;
import org.dromara.analy.domain.FeedmatchTimeData;
import org.dromara.qa.analy.domain.bo.StoreSilkInfoBo;
import org.dromara.qa.analy.domain.vo.StoreSilkInfoVo;
import org.dromara.qa.analy.domain.StoreSilkInfo;
import org.dromara.qa.analy.mapper.StoreSilkInfoMapper;
import org.dromara.qa.analy.service.IStoreSilkInfoService;
import org.dromara.qa.analy.mapper.FeedmatchTimeDataMapper;

import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.HashMap;

/**
 * å‚¨ä¸æŸœäº§é‡Service业务层处理
@@ -71,6 +69,7 @@
        List<StoreSilkInfoVo> storeSilkInfoList = page.getRecords();

        for (int i = 0; i < storeSilkInfoList.size(); i++) {
            //
            StoreSilkInfoVo storeSilkInfoVo = storeSilkInfoList.get(i);

        }

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/md/controller/MdShiftController.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/controller/MdShiftController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.md.controller;
package org.dromara.qa.md.controller;

import java.util.List;

@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.md.domain.vo.MdShiftVo;
import org.dromara.md.domain.bo.MdShiftBo;
import org.dromara.md.service.IMdShiftService;
import org.dromara.qa.md.domain.vo.MdShiftVo;
import org.dromara.qa.md.domain.bo.MdShiftBo;
import org.dromara.qa.md.service.IMdShiftService;
import org.dromara.common.mybatis.core.page.TableDataInfo;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/md/domain/MdShift.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/MdShift.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.md.domain;
package org.dromara.qa.md.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/md/domain/bo/MdShiftBo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/bo/MdShiftBo.java ÐÞ¸Ä
@@ -1,15 +1,13 @@
package org.dromara.md.domain.bo;
package org.dromara.qa.md.domain.bo;

import org.dromara.md.domain.MdShift;
import org.dromara.qa.md.domain.MdShift;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * ç­æ¬¡ä¸šåŠ¡å¯¹è±¡ MD_SHIFT

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/md/domain/vo/MdShiftVo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/vo/MdShiftVo.java ÐÞ¸Ä
@@ -1,19 +1,15 @@
package org.dromara.md.domain.vo;
package org.dromara.qa.md.domain.vo;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.md.domain.MdShift;

import org.dromara.qa.md.domain.MdShift;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;

import java.io.Serial;
import java.io.Serializable;
import java.util.Date;



/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/md/mapper/MdShiftMapper.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/mapper/MdShiftMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.md.mapper;
package org.dromara.qa.md.mapper;

import org.dromara.md.domain.MdShift;
import org.dromara.md.domain.vo.MdShiftVo;
import org.dromara.qa.md.domain.MdShift;
import org.dromara.qa.md.domain.vo.MdShiftVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/md/service/IMdShiftService.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/service/IMdShiftService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.md.service;
package org.dromara.qa.md.service;

import org.dromara.md.domain.vo.MdShiftVo;
import org.dromara.md.domain.bo.MdShiftBo;
import org.dromara.qa.md.domain.vo.MdShiftVo;
import org.dromara.qa.md.domain.bo.MdShiftBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/md/service/impl/MdShiftServiceImpl.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/service/impl/MdShiftServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.md.service.impl;
package org.dromara.qa.md.service.impl;

import com.baomidou.dynamic.datasource.annotation.DS;
import org.dromara.common.core.utils.MapstructUtils;
@@ -11,11 +11,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.md.domain.bo.MdShiftBo;
import org.dromara.md.domain.vo.MdShiftVo;
import org.dromara.md.domain.MdShift;
import org.dromara.md.mapper.MdShiftMapper;
import org.dromara.md.service.IMdShiftService;
import org.dromara.qa.md.domain.bo.MdShiftBo;
import org.dromara.qa.md.domain.vo.MdShiftVo;
import org.dromara.qa.md.domain.MdShift;
import org.dromara.qa.md.mapper.MdShiftMapper;
import org.dromara.qa.md.service.IMdShiftService;

import java.util.List;
import java.util.Map;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/controller/QmBatchController.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qm/controller/QmBatchController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.qm.controller;
package org.dromara.qa.qm.controller;

import java.util.List;

@@ -17,9 +17,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.qm.domain.vo.QmBatchVo;
import org.dromara.qm.domain.bo.QmBatchBo;
import org.dromara.qm.service.IQmBatchService;
import org.dromara.qa.qm.domain.vo.QmBatchVo;
import org.dromara.qa.qm.domain.bo.QmBatchBo;
import org.dromara.qa.qm.service.IQmBatchService;
import org.dromara.common.mybatis.core.page.TableDataInfo;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/QmBatch.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qm/domain/QmBatch.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.qm.domain;
package org.dromara.qa.qm.domain;

import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/bo/QmBatchBo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qm/domain/bo/QmBatchBo.java ÐÞ¸Ä
@@ -1,15 +1,13 @@
package org.dromara.qm.domain.bo;
package org.dromara.qa.qm.domain.bo;

import org.dromara.qm.domain.QmBatch;
import org.dromara.qa.qm.domain.QmBatch;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * æ£€éªŒæ‰¹æ¬¡ä¸šåŠ¡å¯¹è±¡ qm_batch

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmBatchVo.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qm/domain/vo/QmBatchVo.java ÐÞ¸Ä
@@ -1,19 +1,15 @@
package org.dromara.qm.domain.vo;
package org.dromara.qa.qm.domain.vo;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.qm.domain.QmBatch;

import org.dromara.qa.qm.domain.QmBatch;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;

import java.io.Serial;
import java.io.Serializable;
import java.util.Date;



/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/mapper/QmBatchMapper.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qm/mapper/QmBatchMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.qm.mapper;
package org.dromara.qa.qm.mapper;

import org.dromara.qm.domain.QmBatch;
import org.dromara.qm.domain.vo.QmBatchVo;
import org.dromara.qa.qm.domain.QmBatch;
import org.dromara.qa.qm.domain.vo.QmBatchVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

/**

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/service/IQmBatchService.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qm/service/IQmBatchService.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package org.dromara.qm.service;
package org.dromara.qa.qm.service;

import org.dromara.qm.domain.vo.QmBatchVo;
import org.dromara.qm.domain.bo.QmBatchBo;
import org.dromara.qa.qm.domain.vo.QmBatchVo;
import org.dromara.qa.qm.domain.bo.QmBatchBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;


 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/service/impl/QmBatchServiceImpl.java

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qm/service/impl/QmBatchServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.dromara.qm.service.impl;
package org.dromara.qa.qm.service.impl;

import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.qm.domain.bo.QmBatchBo;
import org.dromara.qm.domain.vo.QmBatchVo;
import org.dromara.qm.domain.QmBatch;
import org.dromara.qm.mapper.QmBatchMapper;
import org.dromara.qm.service.IQmBatchService;
import org.dromara.qa.qm.domain.bo.QmBatchBo;
import org.dromara.qa.qm.domain.vo.QmBatchVo;
import org.dromara.qa.qm.domain.QmBatch;
import org.dromara.qa.qm.mapper.QmBatchMapper;
import org.dromara.qa.qm.service.IQmBatchService;

import java.util.List;
import java.util.Map;

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/StoreSilkInfoMapper.xml

ÎļþÒÑɾ³ý

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/analy/FeedmatchTimeDataMapper.xml

old mode 100755
new mode 100644
copy from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/PackerTimeDataMapper.xml
copy to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/analy/FeedmatchTimeDataMapper.xml
Îļþ´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/PackerTimeDataMapper.xml ¸´ÖÆ
@@ -2,5 +2,5 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.analy.mapper.PackerTimeDataMapper">
<mapper namespace="org.dromara.qa.analy.mapper.FeedmatchTimeDataMapper">
</mapper>

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/analy/PackerTimeDataMapper.xml

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/FeedmatchTimeDataMapper.xml ÐÞ¸Ä
@@ -2,5 +2,5 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.analy.mapper.FeedmatchTimeDataMapper">
<mapper namespace="org.dromara.qa.analy.mapper.PackerTimeDataMapper">
</mapper>

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/analy/RollerTimeDataMapper.xml

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/RollerTimeDataMapper.xml ÐÞ¸Ä
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.analy.mapper.RollerTimeDataMapper">
<mapper namespace="org.dromara.qa.analy.mapper.RollerTimeDataMapper">

    <select id="selectSampledList" resultType="org.dromara.analy.domain.vo.RollerTimeDataVo">
    <select id="selectSampledList" resultType="org.dromara.qa.analy.domain.vo.RollerTimeDataVo">
        WITH roller_minute AS (
            SELECT
            *,

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/analy/StoreSilkInfoMapper.xml

old mode 100755
new mode 100644
ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/PackerTimeDataMapper.xml ÐÞ¸Ä
@@ -2,5 +2,5 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.analy.mapper.PackerTimeDataMapper">
<mapper namespace="org.dromara.qa.analy.mapper.StoreSilkInfoMapper">
</mapper>

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/md/MdShiftMapper.xml

ÎļþÃû´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/md/MdShiftMapper.xml ÐÞ¸Ä
@@ -2,5 +2,5 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.md.mapper.MdShiftMapper">
<mapper namespace="org.dromara.qa.md.mapper.MdShiftMapper">
</mapper>

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/qm/QmBatchMapper.xml

copy from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/md/MdShiftMapper.xml
copy to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/qm/QmBatchMapper.xml
Îļþ´Ó RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/md/MdShiftMapper.xml ¸´ÖÆ
@@ -2,5 +2,5 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.md.mapper.MdShiftMapper">
<mapper namespace="org.dromara.qa.qm.mapper.QmBatchMapper">
</mapper>

 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qm/QmBatchMapper.xml

ÎļþÒÑɾ³ý

 ruoyi-plus-soybean/src/service/api/analy/feed-match.ts

 ruoyi-plus-soybean/src/service/api/analy/hoister-data.ts

 ruoyi-plus-soybean/src/service/api/analy/packer-data.ts

 ruoyi-plus-soybean/src/service/api/analy/roller-data.ts

@@ -1,6 +1,5 @@
import { request } from '@/service/request';


/** èŽ·å–卷接机分析列表 */
export function fetchGetRollerSampleDataList (params?: Api.Qa.RollerDataSearchParams) {
  return request<Api.Qa.RollerDataList>({
@@ -9,7 +8,6 @@
    params
  });
}


/** èŽ·å–卷接机分析列表 */
export function fetchGetRollerDataList (params?: Api.Qa.RollerDataSearchParams) {

 ruoyi-plus-soybean/src/service/api/analy/store-silk.ts

 ruoyi-plus-soybean/src/service/api/md/shift.ts

 ruoyi-plus-soybean/src/service/api/qm/batch.ts

 ruoyi-plus-soybean/src/typings/api/analy.feed-match.api.d.ts

@@ -70,12 +70,7 @@

        /** feed match search params */
        type FeedMatchSearchParams = CommonType.RecordNullable<
            Pick<
                Api.Analy.FeedMatch,
                        | 'time'
                        | 'key'
            > &
            Api.Common.CommonSearchParams
      Pick<Api.Analy.FeedMatch, 'time' | 'key'> & Api.Common.CommonSearchParams
        >;

        /** feed match operate params */

 ruoyi-plus-soybean/src/typings/api/analy.hoister-data.api.d.ts

@@ -94,13 +94,7 @@

        /** hoister data search params */
        type HoisterDataSearchParams = CommonType.RecordNullable<
            Pick<
                Api.Qa.HoisterData,
                        | 'time'
                        | 'shift'
                        | 'equNo'
            > &
            Api.Common.CommonSearchParams
      Pick<Api.Qa.HoisterData, 'time' | 'shift' | 'equNo'> & Api.Common.CommonSearchParams
        >;

        /** hoister data operate params */

 ruoyi-plus-soybean/src/typings/api/analy.packer-data.api.d.ts

 ruoyi-plus-soybean/src/typings/api/analy.roller-data.api.d.ts

 ruoyi-plus-soybean/src/typings/api/analy.store-silk.api.d.ts

@@ -40,12 +40,7 @@
        type StoreSilkSearchParams = CommonType.RecordNullable<
            Pick<
                Api.Analy.StoreSilk,
                        | 'materialname'
                        | 'batchcode'
                        | 'actualstarttime'
                        | 'distimebegin'
                        | 'distimeend'
                        | 'siloid'
        'materialname' | 'batchcode' | 'actualstarttime' | 'distimebegin' | 'distimeend' | 'siloid'
            > &
            Api.Common.CommonSearchParams
        >;

 ruoyi-plus-soybean/src/typings/api/md.shift.api.d.ts

@@ -42,13 +42,7 @@

        /** shift search params */
        type ShiftSearchParams = CommonType.RecordNullable<
            Pick<
                Api.Md.Shift,
                        | 'code'
                        | 'name'
                        | 'enable'
            > &
            Api.Common.CommonSearchParams
      Pick<Api.Md.Shift, 'code' | 'name' | 'enable'> & Api.Common.CommonSearchParams
        >;

        /** shift operate params */

 ruoyi-plus-soybean/src/typings/api/qm.batch.api.d.ts

@@ -112,15 +112,7 @@
        type BatchSearchParams = CommonType.RecordNullable<
            Pick<
                Api.Qm.Batch,
                        | 'batchCode'
                        | 'typ'
                        | 'eqpCode'
                        | 'matCode'
                        | 'batchDate'
                        | 'flag'
                        | 'deleted'
                        | 'category'
                        | 'state'
        'batchCode' | 'typ' | 'eqpCode' | 'matCode' | 'batchDate' | 'flag' | 'deleted' | 'category' | 'state'
            > &
            Api.Common.CommonSearchParams
        >;

 ruoyi-plus-soybean/src/views/analy/feed-match/index.vue

@@ -15,7 +15,6 @@
  name: 'FeedMatchList'
});


const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();

 ruoyi-plus-soybean/src/views/analy/feed-match/modules/feed-match-operate-drawer.vue

@@ -75,15 +75,11 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'time'
  | 'key'
>;
type RuleKey = Extract<keyof Model, 'time' | 'key'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  time: createRequiredRule('时间戳不能为空'),
  key: createRequiredRule('班次+机台不能为空'),
  key: createRequiredRule('班次+机台不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -101,16 +97,100 @@
async function handleSubmit() {
  await validate();

  const { time, key, dacUpTime, fs11, fs12, fs21, fs22, fs31, fs32, fs41, fs42, pipe01, pipe02, pipe03, pipe04, pipe05, pipe06, pipe07, pipe08, pipe09, pipe10, pipe11, pipe12, wsjState, shift, equNo, remark } = model.value;
  const {
    time,
    key,
    dacUpTime,
    fs11,
    fs12,
    fs21,
    fs22,
    fs31,
    fs32,
    fs41,
    fs42,
    pipe01,
    pipe02,
    pipe03,
    pipe04,
    pipe05,
    pipe06,
    pipe07,
    pipe08,
    pipe09,
    pipe10,
    pipe11,
    pipe12,
    wsjState,
    shift,
    equNo,
    remark
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateFeedMatch({ time, key, dacUpTime, fs11, fs12, fs21, fs22, fs31, fs32, fs41, fs42, pipe01, pipe02, pipe03, pipe04, pipe05, pipe06, pipe07, pipe08, pipe09, pipe10, pipe11, pipe12, wsjState, shift, equNo, remark });
    const { error } = await fetchCreateFeedMatch({
      time,
      key,
      dacUpTime,
      fs11,
      fs12,
      fs21,
      fs22,
      fs31,
      fs32,
      fs41,
      fs42,
      pipe01,
      pipe02,
      pipe03,
      pipe04,
      pipe05,
      pipe06,
      pipe07,
      pipe08,
      pipe09,
      pipe10,
      pipe11,
      pipe12,
      wsjState,
      shift,
      equNo,
      remark
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateFeedMatch({ time, key, dacUpTime, fs11, fs12, fs21, fs22, fs31, fs32, fs41, fs42, pipe01, pipe02, pipe03, pipe04, pipe05, pipe06, pipe07, pipe08, pipe09, pipe10, pipe11, pipe12, wsjState, shift, equNo, remark });
    const { error } = await fetchUpdateFeedMatch({
      time,
      key,
      dacUpTime,
      fs11,
      fs12,
      fs21,
      fs22,
      fs31,
      fs32,
      fs41,
      fs42,
      pipe01,
      pipe02,
      pipe03,
      pipe04,
      pipe05,
      pipe06,
      pipe07,
      pipe08,
      pipe09,
      pipe10,
      pipe11,
      pipe12,
      wsjState,
      shift,
      equNo,
      remark
    });
    if (error) return;
  }

@@ -140,84 +220,34 @@
          />
        </NFormItem>
        <NFormItem label="班次+机台" path="key">
          <NInput
            v-model:value="model.key"
            :rows="3"
            type="textarea"
            placeholder="请输入班次+机台"
          />
          <NInput v-model:value="model.key" :rows="3" type="textarea" placeholder="请输入班次+机台" />
        </NFormItem>
        <NFormItem label="数据更新时间" path="dacUpTime">
          <NInput
            v-model:value="model.dacUpTime"
            :rows="3"
            type="textarea"
            placeholder="请输入数据更新时间"
          />
          <NInput v-model:value="model.dacUpTime" :rows="3" type="textarea" placeholder="请输入数据更新时间" />
        </NFormItem>
        <NFormItem label="1#喂丝机对应的第一个储丝柜" path="fs11">
          <NInput
            v-model:value="model.fs11"
            :rows="3"
            type="textarea"
            placeholder="请输入1#喂丝机对应的第一个储丝柜"
          />
          <NInput v-model:value="model.fs11" :rows="3" type="textarea" placeholder="请输入1#喂丝机对应的第一个储丝柜" />
        </NFormItem>
        <NFormItem label="1#喂丝机对应的第二个储丝柜" path="fs12">
          <NInput
            v-model:value="model.fs12"
            :rows="3"
            type="textarea"
            placeholder="请输入1#喂丝机对应的第二个储丝柜"
          />
          <NInput v-model:value="model.fs12" :rows="3" type="textarea" placeholder="请输入1#喂丝机对应的第二个储丝柜" />
        </NFormItem>
        <NFormItem label="2#喂丝机对应的第一个储丝柜" path="fs21">
          <NInput
            v-model:value="model.fs21"
            :rows="3"
            type="textarea"
            placeholder="请输入2#喂丝机对应的第一个储丝柜"
          />
          <NInput v-model:value="model.fs21" :rows="3" type="textarea" placeholder="请输入2#喂丝机对应的第一个储丝柜" />
        </NFormItem>
        <NFormItem label="2#喂丝机对应的第二个储丝柜" path="fs22">
          <NInput
            v-model:value="model.fs22"
            :rows="3"
            type="textarea"
            placeholder="请输入2#喂丝机对应的第二个储丝柜"
          />
          <NInput v-model:value="model.fs22" :rows="3" type="textarea" placeholder="请输入2#喂丝机对应的第二个储丝柜" />
        </NFormItem>
        <NFormItem label="3#喂丝机对应的第一个储丝柜" path="fs31">
          <NInput
            v-model:value="model.fs31"
            :rows="3"
            type="textarea"
            placeholder="请输入3#喂丝机对应的第一个储丝柜"
          />
          <NInput v-model:value="model.fs31" :rows="3" type="textarea" placeholder="请输入3#喂丝机对应的第一个储丝柜" />
        </NFormItem>
        <NFormItem label="3#喂丝机对应的第二个储丝柜" path="fs32">
          <NInput
            v-model:value="model.fs32"
            :rows="3"
            type="textarea"
            placeholder="请输入3#喂丝机对应的第二个储丝柜"
          />
          <NInput v-model:value="model.fs32" :rows="3" type="textarea" placeholder="请输入3#喂丝机对应的第二个储丝柜" />
        </NFormItem>
        <NFormItem label="4#喂丝机对应的第一个储丝柜" path="fs41">
          <NInput
            v-model:value="model.fs41"
            :rows="3"
            type="textarea"
            placeholder="请输入4#喂丝机对应的第一个储丝柜"
          />
          <NInput v-model:value="model.fs41" :rows="3" type="textarea" placeholder="请输入4#喂丝机对应的第一个储丝柜" />
        </NFormItem>
        <NFormItem label="4#喂丝机对应的第二个储丝柜" path="fs42">
          <NInput
            v-model:value="model.fs42"
            :rows="3"
            type="textarea"
            placeholder="请输入4#喂丝机对应的第二个储丝柜"
          />
          <NInput v-model:value="model.fs42" :rows="3" type="textarea" placeholder="请输入4#喂丝机对应的第二个储丝柜" />
        </NFormItem>
        <NFormItem label="1#机组对应的喂丝机和管道" path="pipe01">
          <NInput v-model:value="model.pipe01" placeholder="请输入1#机组对应的喂丝机和管道" />

 ruoyi-plus-soybean/src/views/analy/hoister/index.vue

@@ -15,7 +15,6 @@
  name: 'HoisterDataList'
});


const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();

 ruoyi-plus-soybean/src/views/analy/hoister/modules/hoister-data-operate-drawer.vue

@@ -1,9 +1,9 @@
<script setup lang="ts">
import { computed, ref, watch } from 'vue';
import { jsonClone } from '~/packages/utils';
import { fetchCreateHoisterData, fetchUpdateHoisterData } from '@/service/api/analy/hoister-data';
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
import { jsonClone } from '~/packages/utils';

defineOptions({
  name: 'HoisterDataOperateDrawer'
@@ -87,15 +87,11 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'time'
  | 'key'
>;
type RuleKey = Extract<keyof Model, 'time' | 'key'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  time: createRequiredRule('时间不能为空'),
  key: createRequiredRule('key不能为空'),
  key: createRequiredRule('key不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -113,16 +109,136 @@
async function handleSubmit() {
  await validate();

  const { time, key, online, qty, tState1, tState2, tState3, tState4, tState5, tState6, tState7, tState8, tState9, tState10, tState11, tState12, pState1, pState2, pState3, pState4, tQty1, tQty2, tQty3, tQty4, tQty5, tQty6, tQty7, tQty8, tQty9, tQty10, tQty11, tQty12, pQty1, pQty2, pQty3, pQty4, shift, equNo, remark } = model.value;
  const {
    time,
    key,
    online,
    qty,
    tState1,
    tState2,
    tState3,
    tState4,
    tState5,
    tState6,
    tState7,
    tState8,
    tState9,
    tState10,
    tState11,
    tState12,
    pState1,
    pState2,
    pState3,
    pState4,
    tQty1,
    tQty2,
    tQty3,
    tQty4,
    tQty5,
    tQty6,
    tQty7,
    tQty8,
    tQty9,
    tQty10,
    tQty11,
    tQty12,
    pQty1,
    pQty2,
    pQty3,
    pQty4,
    shift,
    equNo,
    remark
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateHoisterData({ time, key, online, qty, tState1, tState2, tState3, tState4, tState5, tState6, tState7, tState8, tState9, tState10, tState11, tState12, pState1, pState2, pState3, pState4, tQty1, tQty2, tQty3, tQty4, tQty5, tQty6, tQty7, tQty8, tQty9, tQty10, tQty11, tQty12, pQty1, pQty2, pQty3, pQty4, shift, equNo, remark });
    const { error } = await fetchCreateHoisterData({
      time,
      key,
      online,
      qty,
      tState1,
      tState2,
      tState3,
      tState4,
      tState5,
      tState6,
      tState7,
      tState8,
      tState9,
      tState10,
      tState11,
      tState12,
      pState1,
      pState2,
      pState3,
      pState4,
      tQty1,
      tQty2,
      tQty3,
      tQty4,
      tQty5,
      tQty6,
      tQty7,
      tQty8,
      tQty9,
      tQty10,
      tQty11,
      tQty12,
      pQty1,
      pQty2,
      pQty3,
      pQty4,
      shift,
      equNo,
      remark
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateHoisterData({ time, key, online, qty, tState1, tState2, tState3, tState4, tState5, tState6, tState7, tState8, tState9, tState10, tState11, tState12, pState1, pState2, pState3, pState4, tQty1, tQty2, tQty3, tQty4, tQty5, tQty6, tQty7, tQty8, tQty9, tQty10, tQty11, tQty12, pQty1, pQty2, pQty3, pQty4, shift, equNo, remark });
    const { error } = await fetchUpdateHoisterData({
      time,
      key,
      online,
      qty,
      tState1,
      tState2,
      tState3,
      tState4,
      tState5,
      tState6,
      tState7,
      tState8,
      tState9,
      tState10,
      tState11,
      tState12,
      pState1,
      pState2,
      pState3,
      pState4,
      tQty1,
      tQty2,
      tQty3,
      tQty4,
      tQty5,
      tQty6,
      tQty7,
      tQty8,
      tQty9,
      tQty10,
      tQty11,
      tQty12,
      pQty1,
      pQty2,
      pQty3,
      pQty4,
      shift,
      equNo,
      remark
    });
    if (error) return;
  }

@@ -153,12 +269,7 @@
          />
        </NFormItem>
        <NFormItem label="key" path="key">
          <NInput
            v-model:value="model.key"
            :rows="3"
            type="textarea"
            placeholder="请输入key"
          />
          <NInput v-model:value="model.key" :rows="3" type="textarea" placeholder="请输入key" />
        </NFormItem>
        <NFormItem label="网络状态  0异常，1正常" path="online">
          <NInput v-model:value="model.online" placeholder="请输入网络状态  0异常，1正常" />

 ruoyi-plus-soybean/src/views/analy/hoister/modules/hoister-data-search.vue

@@ -53,9 +53,7 @@
  { label: '晚班', value: 3 }
];

const equNoOptions = [
  { label: '1#提升机', value: 601 }
];
const equNoOptions = [{ label: '1#提升机', value: 601 }];

function onTimeRangeUpdate(value: [string, string] | null) {
  if (!model.value.params) {
@@ -101,25 +99,15 @@
                type="datetimerange"
                value-format="yyyy-MM-dd HH:mm:ss"
                clearable
                @update:formatted-value="onTimeRangeUpdate"
                :default-time="['00:00:00', '23:59:59']"
                @update:formatted-value="onTimeRangeUpdate"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="设备" path="equNo" class="pr-24px">
              <NSelect
                v-model:value="model.equNo"
                placeholder="请选择设备号"
                :options="equNoOptions"
                clearable
              />
              <NSelect v-model:value="model.equNo" placeholder="请选择设备号" :options="equNoOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="班次" path="shift" class="pr-24px">
              <NSelect
                v-model:value="model.shift"
                placeholder="请选择班次"
                :options="shiftOptions"
                clearable
              />
              <NSelect v-model:value="model.shift" placeholder="请选择班次" :options="shiftOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24" class="pr-24px">
              <NSpace class="w-full" justify="end">

 ruoyi-plus-soybean/src/views/analy/output-analy/index.vue

@@ -76,7 +76,8 @@
const { columns, columnChecks, data, getData, loading, scrollX } = useNaiveTable({
  api: () => fetchGetRollerSampleDataList(searchParams.value),
  transform: (response: any) => response.data || [],
  columns: () => ([
  columns: () =>
    [
    {
      key: 'index',
      title: '序号',
@@ -188,11 +189,11 @@
      render: (row: Api.Qa.RollerData) => {
        const qtyBox = Number(row.qty ?? 0) / 50;
        if (!qtyBox) return '-';
        const v = (Number(row.lvbangVal ?? 0) / 10000) / qtyBox;
          const v = Number(row.lvbangVal ?? 0) / 10000 / qtyBox;
        return v.toFixed(1);
      }
    }
  ] as any)
    ] as any
});

async function handleExport() {
@@ -202,16 +203,13 @@

<template>
  <div class="h-full min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
    <RollerDataSearch
      v-model:model="searchParams"
      @search="getData"
    />
    <RollerDataSearch v-model:model="searchParams" @search="getData" />
    <NCard
            v-if="!showTable"
            title="卷接机分析趋势图"
            :bordered="false"
            size="small"
            class="sm:flex-1-hidden card-wrapper flex flex-col"
      class="flex flex-col card-wrapper sm:flex-1-hidden"
            content-style="flex: 1; min-height: 0; overflow: hidden;"
          >
      <template #header-extra>
@@ -224,13 +222,7 @@
      </template>
      <RollerDataLineChart :data="(data as any)" class="h-full" />
    </NCard>
    <NCard
      v-else
      title="数据详情"
      :bordered="false"
      size="small"
      class="sm:flex-1-hidden card-wrapper"
    >
    <NCard v-else title="数据详情" :bordered="false" size="small" class="card-wrapper sm:flex-1-hidden">
      <template #header-extra>
        <TableHeaderOperation
          v-model:columns="columnChecks"

 ruoyi-plus-soybean/src/views/analy/output-analy/modules/roller-data-line-chart.vue

@@ -258,7 +258,7 @@

watch(
  () => props.data,
  (newData) => {
  newData => {
    if (!newData) return;

    // Process data
@@ -287,7 +287,7 @@
    const danhaoVals = sortedData.value.map(item => {
      const qtyBox = Number(item.qty ?? 0) / 50;
      if (!qtyBox) return 0;
      const v = (Number(item.lvbangVal ?? 0) / 10000) / qtyBox;
      const v = Number(item.lvbangVal ?? 0) / 10000 / qtyBox;
      return Math.round(v * 10) / 10;
    });


 ruoyi-plus-soybean/src/views/analy/output-analy/modules/roller-data-operate-drawer.vue

@@ -1,9 +1,9 @@
<script setup lang="ts">
import { computed, ref, watch } from 'vue';
import { jsonClone } from '~/packages/utils';
import { fetchCreateRollerData, fetchUpdateRollerData } from '@/service/api/analy/roller-data';
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
import { jsonClone } from '~/packages/utils';

defineOptions({
  name: 'RollerDataOperateDrawer'
@@ -67,15 +67,11 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'time'
  | 'key'
>;
type RuleKey = Extract<keyof Model, 'time' | 'key'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  time: createRequiredRule('时间不能为空'),
  key: createRequiredRule('key不能为空'),
  key: createRequiredRule('key不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -93,16 +89,76 @@
async function handleSubmit() {
  await validate();

  const { time, key, online, qty, badQty, lvbangVal, juanyanzhiVal, shuisongzhiVal, runTime, stopTime, stopTimes, speed, runStatus, cy, cyCs, cyOnline, recQty1, recQty2, tsQty } = model.value;
  const {
    time,
    key,
    online,
    qty,
    badQty,
    lvbangVal,
    juanyanzhiVal,
    shuisongzhiVal,
    runTime,
    stopTime,
    stopTimes,
    speed,
    runStatus,
    cy,
    cyCs,
    cyOnline,
    recQty1,
    recQty2,
    tsQty
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateRollerData({ time, key, online, qty, badQty, lvbangVal, juanyanzhiVal, shuisongzhiVal, runTime, stopTime, stopTimes, speed, runStatus, cy, cyCs, cyOnline, recQty1, recQty2, tsQty });
    const { error } = await fetchCreateRollerData({
      time,
      key,
      online,
      qty,
      badQty,
      lvbangVal,
      juanyanzhiVal,
      shuisongzhiVal,
      runTime,
      stopTime,
      stopTimes,
      speed,
      runStatus,
      cy,
      cyCs,
      cyOnline,
      recQty1,
      recQty2,
      tsQty
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateRollerData({ time, key, online, qty, badQty, lvbangVal, juanyanzhiVal, shuisongzhiVal, runTime, stopTime, stopTimes, speed, runStatus, cy, cyCs, cyOnline, recQty1, recQty2, tsQty });
    const { error } = await fetchUpdateRollerData({
      time,
      key,
      online,
      qty,
      badQty,
      lvbangVal,
      juanyanzhiVal,
      shuisongzhiVal,
      runTime,
      stopTime,
      stopTimes,
      speed,
      runStatus,
      cy,
      cyCs,
      cyOnline,
      recQty1,
      recQty2,
      tsQty
    });
    if (error) return;
  }

@@ -132,12 +188,7 @@
          />
        </NFormItem>
        <NFormItem label="key" path="key">
          <NInput
            v-model:value="model.key"
            :rows="3"
            type="textarea"
            placeholder="请输入key"
          />
          <NInput v-model:value="model.key" :rows="3" type="textarea" placeholder="请输入key" />
        </NFormItem>
        <NFormItem label="网络状态" path="online">
          <NInputNumber v-model:value="model.online" placeholder="请输入网络状态" class="w-full" />
@@ -186,12 +237,7 @@
          <NInputNumber v-model:value="model.cyCs" placeholder="请输入储烟设备车速" class="w-full" />
        </NFormItem>
        <NFormItem label="储烟设备网络" path="cyOnline">
          <NInput
            v-model:value="model.cyOnline"
            :rows="3"
            type="textarea"
            placeholder="请输入储烟设备网络"
          />
          <NInput v-model:value="model.cyOnline" :rows="3" type="textarea" placeholder="请输入储烟设备网络" />
        </NFormItem>
        <NFormItem label="接收机产量" path="recQty1">
          <NInputNumber v-model:value="model.recQty1" placeholder="请输入接收机产量" class="w-full" />

 ruoyi-plus-soybean/src/views/analy/output-analy/modules/roller-data-search.vue

@@ -101,25 +101,15 @@
                type="datetimerange"
                value-format="yyyy-MM-dd HH:mm:ss"
                clearable
                @update:formatted-value="onTimeRangeUpdate"
                :default-time="['00:00:00', '23:59:59']"
                @update:formatted-value="onTimeRangeUpdate"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="设备" path="equNo" class="pr-24px">
              <NSelect
                v-model:value="model.equNo"
                placeholder="请选择设备号"
                :options="equNoOptions"
                clearable
              />
              <NSelect v-model:value="model.equNo" placeholder="请选择设备号" :options="equNoOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="班次" path="shift" class="pr-24px">
              <NSelect
                v-model:value="model.shift"
                placeholder="请选择班次"
                :options="shiftOptions"
                clearable
              />
              <NSelect v-model:value="model.shift" placeholder="请选择班次" :options="shiftOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24" class="pr-24px">
              <NSpace class="w-full" justify="end">

 ruoyi-plus-soybean/src/views/analy/packer/index.vue

@@ -15,7 +15,6 @@
  name: 'PackerDataList'
});


const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();
@@ -50,7 +49,7 @@
  params: {
    beginTime: `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}-${String(new Date().getDate()).padStart(2, '0')} 00:00:00`,
    endTime: `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}-${String(new Date().getDate()).padStart(2, '0')} 23:59:59`
  },
  }
});

const { columns, columnChecks, data, getData, getDataByPage, loading, mobilePagination, scrollX } =

 ruoyi-plus-soybean/src/views/analy/packer/modules/packer-data-operate-drawer.vue

@@ -1,9 +1,9 @@
<script setup lang="ts">
import { computed, ref, watch } from 'vue';
import { jsonClone } from '~/packages/utils';
import { fetchCreatePackerData, fetchUpdatePackerData } from '@/service/api/analy/packer-data';
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
import { jsonClone } from '~/packages/utils';

defineOptions({
  name: 'PackerDataOperateDrawer'
@@ -72,12 +72,7 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'time'
  | 'shift'
  | 'equNo'
>;
type RuleKey = Extract<keyof Model, 'time' | 'shift' | 'equNo'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  time: createRequiredRule('时间不能为空'),
@@ -100,16 +95,91 @@
async function handleSubmit() {
  await validate();

  const { time, key, online, qty, badQty, xiaohemoVal, tiaohemoVal, xiaohezhiVal, tiaohezhiVal, neichenzhiVal, runTime, stopTime, stopTimes, speed, runStatus, tsQty, mainQty, mainBadQty, tbjQty, tbjGdQty, tbjBadQty, pbjQty, shift, equNo } = model.value;
  const {
    time,
    key,
    online,
    qty,
    badQty,
    xiaohemoVal,
    tiaohemoVal,
    xiaohezhiVal,
    tiaohezhiVal,
    neichenzhiVal,
    runTime,
    stopTime,
    stopTimes,
    speed,
    runStatus,
    tsQty,
    mainQty,
    mainBadQty,
    tbjQty,
    tbjGdQty,
    tbjBadQty,
    pbjQty,
    shift,
    equNo
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreatePackerData({ time, key, online, qty, badQty, xiaohemoVal, tiaohemoVal, xiaohezhiVal, tiaohezhiVal, neichenzhiVal, runTime, stopTime, stopTimes, speed, runStatus, tsQty, mainQty, mainBadQty, tbjQty, tbjGdQty, tbjBadQty, pbjQty, shift, equNo });
    const { error } = await fetchCreatePackerData({
      time,
      key,
      online,
      qty,
      badQty,
      xiaohemoVal,
      tiaohemoVal,
      xiaohezhiVal,
      tiaohezhiVal,
      neichenzhiVal,
      runTime,
      stopTime,
      stopTimes,
      speed,
      runStatus,
      tsQty,
      mainQty,
      mainBadQty,
      tbjQty,
      tbjGdQty,
      tbjBadQty,
      pbjQty,
      shift,
      equNo
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdatePackerData({ time, key, online, qty, badQty, xiaohemoVal, tiaohemoVal, xiaohezhiVal, tiaohezhiVal, neichenzhiVal, runTime, stopTime, stopTimes, speed, runStatus, tsQty, mainQty, mainBadQty, tbjQty, tbjGdQty, tbjBadQty, pbjQty, shift, equNo });
    const { error } = await fetchUpdatePackerData({
      time,
      key,
      online,
      qty,
      badQty,
      xiaohemoVal,
      tiaohemoVal,
      xiaohezhiVal,
      tiaohezhiVal,
      neichenzhiVal,
      runTime,
      stopTime,
      stopTimes,
      speed,
      runStatus,
      tsQty,
      mainQty,
      mainBadQty,
      tbjQty,
      tbjGdQty,
      tbjBadQty,
      pbjQty,
      shift,
      equNo
    });
    if (error) return;
  }

@@ -139,12 +209,7 @@
          />
        </NFormItem>
        <NFormItem label="key" path="key">
          <NInput
            v-model:value="model.key"
            :rows="3"
            type="textarea"
            placeholder="请输入key"
          />
          <NInput v-model:value="model.key" :rows="3" type="textarea" placeholder="请输入key" />
        </NFormItem>
        <NFormItem label="网络状态(0异常，1正常)" path="online">
          <NInput v-model:value="model.online" placeholder="请输入网络状态(0异常，1正常)" />

 ruoyi-plus-soybean/src/views/analy/packer/modules/packer-data-search.vue

@@ -101,25 +101,15 @@
                type="datetimerange"
                value-format="yyyy-MM-dd HH:mm:ss"
                clearable
                @update:formatted-value="onTimeRangeUpdate"
                :default-time="['00:00:00', '23:59:59']"
                @update:formatted-value="onTimeRangeUpdate"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="设备" path="equNo" class="pr-24px">
              <NSelect
                v-model:value="model.equNo"
                placeholder="请选择设备号"
                :options="equNoOptions"
                clearable
              />
              <NSelect v-model:value="model.equNo" placeholder="请选择设备号" :options="equNoOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="班次" path="shift" class="pr-24px">
              <NSelect
                v-model:value="model.shift"
                placeholder="请选择班次"
                :options="shiftOptions"
                clearable
              />
              <NSelect v-model:value="model.shift" placeholder="请选择班次" :options="shiftOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24" class="pr-24px">
              <NSpace class="w-full" justify="end">

 ruoyi-plus-soybean/src/views/analy/roller/index.vue

@@ -15,7 +15,6 @@
  name: 'RollerDataList'
});


const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();

 ruoyi-plus-soybean/src/views/analy/roller/modules/roller-data-operate-drawer.vue

@@ -1,9 +1,9 @@
<script setup lang="ts">
import { computed, ref, watch } from 'vue';
import { jsonClone } from '~/packages/utils';
import { fetchCreateRollerData, fetchUpdateRollerData } from '@/service/api/analy/roller-data';
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
import { jsonClone } from '~/packages/utils';

defineOptions({
  name: 'RollerDataOperateDrawer'
@@ -66,15 +66,11 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'time'
  | 'key'
>;
type RuleKey = Extract<keyof Model, 'time' | 'key'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  time: createRequiredRule('时间不能为空'),
  key: createRequiredRule('key不能为空'),
  key: createRequiredRule('key不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -92,16 +88,73 @@
async function handleSubmit() {
  await validate();

  const { time, key, online, qty, badQty, lvbangVal, juanyanzhiVal, shuisongzhiVal, runTime, stopTime, stopTimes, speed, runStatus, cy, cyCs, cyOnline, recQty1, recQty2 } = model.value;
  const {
    time,
    key,
    online,
    qty,
    badQty,
    lvbangVal,
    juanyanzhiVal,
    shuisongzhiVal,
    runTime,
    stopTime,
    stopTimes,
    speed,
    runStatus,
    cy,
    cyCs,
    cyOnline,
    recQty1,
    recQty2
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateRollerData({ time, key, online, qty, badQty, lvbangVal, juanyanzhiVal, shuisongzhiVal, runTime, stopTime, stopTimes, speed, runStatus, cy, cyCs, cyOnline, recQty1, recQty2 });
    const { error } = await fetchCreateRollerData({
      time,
      key,
      online,
      qty,
      badQty,
      lvbangVal,
      juanyanzhiVal,
      shuisongzhiVal,
      runTime,
      stopTime,
      stopTimes,
      speed,
      runStatus,
      cy,
      cyCs,
      cyOnline,
      recQty1,
      recQty2
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateRollerData({ time, key, online, qty, badQty, lvbangVal, juanyanzhiVal, shuisongzhiVal, runTime, stopTime, stopTimes, speed, runStatus, cy, cyCs, cyOnline, recQty1, recQty2 });
    const { error } = await fetchUpdateRollerData({
      time,
      key,
      online,
      qty,
      badQty,
      lvbangVal,
      juanyanzhiVal,
      shuisongzhiVal,
      runTime,
      stopTime,
      stopTimes,
      speed,
      runStatus,
      cy,
      cyCs,
      cyOnline,
      recQty1,
      recQty2
    });
    if (error) return;
  }

@@ -131,12 +184,7 @@
          />
        </NFormItem>
        <NFormItem label="key" path="key">
          <NInput
            v-model:value="model.key"
            :rows="3"
            type="textarea"
            placeholder="请输入key"
          />
          <NInput v-model:value="model.key" :rows="3" type="textarea" placeholder="请输入key" />
        </NFormItem>
        <NFormItem label="网络状态" path="online">
          <NInputNumber v-model:value="model.online" placeholder="请输入网络状态" class="w-full" />
@@ -182,12 +230,7 @@
          <NInputNumber v-model:value="model.cyCs" placeholder="请输入储烟设备车速" class="w-full" />
        </NFormItem>
        <NFormItem label="储烟设备网络" path="cyOnline">
          <NInput
            v-model:value="model.cyOnline"
            :rows="3"
            type="textarea"
            placeholder="请输入储烟设备网络"
          />
          <NInput v-model:value="model.cyOnline" :rows="3" type="textarea" placeholder="请输入储烟设备网络" />
        </NFormItem>
        <NFormItem label="接收机产量" path="recQty1">
          <NInputNumber v-model:value="model.recQty1" placeholder="请输入接收机产量" class="w-full" />

 ruoyi-plus-soybean/src/views/analy/roller/modules/roller-data-search.vue

@@ -101,25 +101,15 @@
                type="datetimerange"
                value-format="yyyy-MM-dd HH:mm:ss"
                clearable
                @update:formatted-value="onTimeRangeUpdate"
                :default-time="['00:00:00', '23:59:59']"
                @update:formatted-value="onTimeRangeUpdate"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="设备" path="equNo" class="pr-24px">
              <NSelect
                v-model:value="model.equNo"
                placeholder="请选择设备号"
                :options="equNoOptions"
                clearable
              />
              <NSelect v-model:value="model.equNo" placeholder="请选择设备号" :options="equNoOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:8" label="班次" path="shift" class="pr-24px">
              <NSelect
                v-model:value="model.shift"
                placeholder="请选择班次"
                :options="shiftOptions"
                clearable
              />
              <NSelect v-model:value="model.shift" placeholder="请选择班次" :options="shiftOptions" clearable />
            </NFormItemGi>
            <NFormItemGi span="24" class="pr-24px">
              <NSpace class="w-full" justify="end">

 ruoyi-plus-soybean/src/views/analy/store-silk/index.vue

@@ -15,7 +15,6 @@
  name: 'StoreSilkList'
});


const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();
@@ -252,7 +251,8 @@
        remote
        :row-key="row => row.id"
        :pagination="mobilePagination"
        :class="['sm:h-full', tableSize === 'tiny' ? 'table-size-mini' : '']"
        class="sm:h-full"
        :class="[tableSize === 'tiny' ? 'table-size-mini' : '']"
      />
      <StoreSilkOperateDrawer
        v-model:visible="drawerVisible"

 ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-operate-drawer.vue

@@ -59,17 +59,12 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'id'
  | 'materialname'
  | 'batchcode'
>;
type RuleKey = Extract<keyof Model, 'id' | 'materialname' | 'batchcode'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  id: createRequiredRule('id不能为空'),
  materialname: createRequiredRule('牌号不能为空'),
  batchcode: createRequiredRule('批次号不能为空'),
  batchcode: createRequiredRule('批次号不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -87,16 +82,51 @@
async function handleSubmit() {
  await validate();

  const { id, materialname, batchcode, actualstarttime, jobinput, weightloss, slkrate, weight, distimebegin, distimeend, siloid } = model.value;
  const {
    id,
    materialname,
    batchcode,
    actualstarttime,
    jobinput,
    weightloss,
    slkrate,
    weight,
    distimebegin,
    distimeend,
    siloid
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateStoreSilk({ materialname, batchcode, actualstarttime, jobinput, weightloss, slkrate, weight, distimebegin, distimeend, siloid });
    const { error } = await fetchCreateStoreSilk({
      materialname,
      batchcode,
      actualstarttime,
      jobinput,
      weightloss,
      slkrate,
      weight,
      distimebegin,
      distimeend,
      siloid
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateStoreSilk({ id, materialname, batchcode, actualstarttime, jobinput, weightloss, slkrate, weight, distimebegin, distimeend, siloid });
    const { error } = await fetchUpdateStoreSilk({
      id,
      materialname,
      batchcode,
      actualstarttime,
      jobinput,
      weightloss,
      slkrate,
      weight,
      distimebegin,
      distimeend,
      siloid
    });
    if (error) return;
  }


 ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue

@@ -1,5 +1,6 @@
<script setup lang="ts">
import { toRaw } from 'vue';
import { onMounted, ref, toRaw, watch } from 'vue';
import dayjs from 'dayjs';
import { jsonClone } from '@sa/utils';
import { useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
@@ -24,9 +25,50 @@
  Object.assign(model.value, defaultModel);
}

function getDefaultRange(): [string, string] {
  const end = dayjs().format('YYYY-MM-DD');
  const start = dayjs().subtract(3, 'day').format('YYYY-MM-DD');
  return [start, end];
}

const dateRange = ref<[string, string]>(getDefaultRange());

function isDateDisabled(ts: number) {
  const min = dayjs().subtract(3, 'day').startOf('day').valueOf();
  const max = dayjs().endOf('day').valueOf();
  return ts < min || ts > max;
}

onMounted(() => {
  if (!model.value.distimebegin || !model.value.distimeend) {
    dateRange.value = getDefaultRange();
    model.value.distimebegin = dateRange.value[0];
    model.value.distimeend = dateRange.value[1];
  } else {
    dateRange.value = [model.value.distimebegin as string, model.value.distimeend as string];
  }
});

watch(
  dateRange,
  val => {
    if (val && val[0] && val[1]) {
      model.value.distimebegin = val[0];
      model.value.distimeend = val[1];
    } else {
      model.value.distimebegin = null;
      model.value.distimeend = null;
    }
  },
  { deep: true }
);

async function reset() {
  await restoreValidation();
  resetModel();
  dateRange.value = getDefaultRange();
  model.value.distimebegin = dateRange.value[0];
  model.value.distimeend = dateRange.value[1];
  emit('search');
}

@@ -42,13 +84,25 @@
      <NCollapseItem :title="$t('common.search')" name="analy-store-silk-search">
        <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
          <NGrid responsive="screen" item-responsive>
            <NFormItemGi span="24 s:12 m:6" label="牌号" label-width="auto" path="materialname" class="pr-24px">
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="牌号"
              label-width="auto"
              path="materialname"
              class="pr-24px"
            >
              <NInput v-model:value="model.materialname" placeholder="请输入牌号" />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="批次号" label-width="auto" path="batchcode" class="pr-24px">
            <NFormItemGi span="24 s:12 m:8 l:8 xl:8" label="批次号" label-width="auto" path="batchcode" class="pr-24px">
              <NInput v-model:value="model.batchcode" placeholder="请输入批次号" />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="投料日期" label-width="auto" path="actualstarttime" class="pr-24px">
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="投料日期"
              label-width="auto"
              path="actualstarttime"
              class="pr-24px"
            >
              <NDatePicker
                v-model:formatted-value="model.actualstarttime"
                type="datetime"
@@ -56,23 +110,28 @@
                clearable
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="储丝柜出料开始时间" label-width="auto" path="distimebegin" class="pr-24px">
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="出料时间"
              label-width="auto"
              path="distimebegin"
              class="pr-24px"
            >
              <NDatePicker
                v-model:formatted-value="model.distimebegin"
                type="datetime"
                value-format="yyyy-MM-dd HH:mm:ss"
                v-model:formatted-value="dateRange"
                type="daterange"
                value-format="yyyy-MM-dd"
                clearable
                :is-date-disabled="isDateDisabled"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="储丝柜出料结束时间" label-width="auto" path="distimeend" class="pr-24px">
              <NDatePicker
                v-model:formatted-value="model.distimeend"
                type="datetime"
                value-format="yyyy-MM-dd HH:mm:ss"
                clearable
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="柜子号(末位)" label-width="auto" path="siloid" class="pr-24px">
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="柜子号(末位)"
              label-width="auto"
              path="siloid"
              class="pr-24px"
            >
              <NInput v-model:value="model.siloid" placeholder="请输入柜子号(末位)" />
            </NFormItemGi>
            <NFormItemGi :show-feedback="false" span="24" class="pr-24px">

 ruoyi-plus-soybean/src/views/md/shift/index.vue

@@ -15,7 +15,6 @@
  name: 'ShiftList'
});


const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();

 ruoyi-plus-soybean/src/views/md/shift/modules/shift-operate-drawer.vue

@@ -61,13 +61,10 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'id'
>;
type RuleKey = Extract<keyof Model, 'id'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  id: createRequiredRule('ud不能为空'),
  id: createRequiredRule('ud不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -85,16 +82,57 @@
async function handleSubmit() {
  await validate();

  const { id, wsId, code, name, stim, etim, seq, enable, del, createUserName, createUserTime, updateUserName, updateUserTime } = model.value;
  const {
    id,
    wsId,
    code,
    name,
    stim,
    etim,
    seq,
    enable,
    del,
    createUserName,
    createUserTime,
    updateUserName,
    updateUserTime
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateShift({ wsId, code, name, stim, etim, seq, enable, del, createUserName, createUserTime, updateUserName, updateUserTime });
    const { error } = await fetchCreateShift({
      wsId,
      code,
      name,
      stim,
      etim,
      seq,
      enable,
      del,
      createUserName,
      createUserTime,
      updateUserName,
      updateUserTime
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateShift({ id, wsId, code, name, stim, etim, seq, enable, del, createUserName, createUserTime, updateUserName, updateUserTime });
    const { error } = await fetchUpdateShift({
      id,
      wsId,
      code,
      name,
      stim,
      etim,
      seq,
      enable,
      del,
      createUserName,
      createUserTime,
      updateUserName,
      updateUserTime
    });
    if (error) return;
  }


 ruoyi-plus-soybean/src/views/qm/batch/index.vue

@@ -15,7 +15,6 @@
  name: 'BatchList'
});


const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();

 ruoyi-plus-soybean/src/views/qm/batch/modules/batch-operate-drawer.vue

@@ -117,13 +117,10 @@
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'id'
>;
type RuleKey = Extract<keyof Model, 'id'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  id: createRequiredRule('编码不能为空'),
  id: createRequiredRule('编码不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -141,16 +138,159 @@
async function handleSubmit() {
  await validate();

  const { id, batchCode, batchName, typ, eqpCode, matCode, judgeCode, batchDate, isflag, enabled, totalNum, results, approver, auditor, creater, tabDate, verName, verCode, archDate, flag, toMesDate, fromMesDate, deleted, batchDes, category, makeno, shifteqpno, boxno, pid, reviewer, rvcount, state, reviewTime, auditTime, spec, approveTime, unit, arrivalTime, storagePlace, checker, receiveTime, inspTime, storer, isverify, ischk, bak1, bak2 } = model.value;
  const {
    id,
    batchCode,
    batchName,
    typ,
    eqpCode,
    matCode,
    judgeCode,
    batchDate,
    isflag,
    enabled,
    totalNum,
    results,
    approver,
    auditor,
    creater,
    tabDate,
    verName,
    verCode,
    archDate,
    flag,
    toMesDate,
    fromMesDate,
    deleted,
    batchDes,
    category,
    makeno,
    shifteqpno,
    boxno,
    pid,
    reviewer,
    rvcount,
    state,
    reviewTime,
    auditTime,
    spec,
    approveTime,
    unit,
    arrivalTime,
    storagePlace,
    checker,
    receiveTime,
    inspTime,
    storer,
    isverify,
    ischk,
    bak1,
    bak2
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateBatch({ batchCode, batchName, typ, eqpCode, matCode, judgeCode, batchDate, isflag, enabled, totalNum, results, approver, auditor, creater, tabDate, verName, verCode, archDate, flag, toMesDate, fromMesDate, deleted, batchDes, category, makeno, shifteqpno, boxno, pid, reviewer, rvcount, state, reviewTime, auditTime, spec, approveTime, unit, arrivalTime, storagePlace, checker, receiveTime, inspTime, storer, isverify, ischk, bak1, bak2 });
    const { error } = await fetchCreateBatch({
      batchCode,
      batchName,
      typ,
      eqpCode,
      matCode,
      judgeCode,
      batchDate,
      isflag,
      enabled,
      totalNum,
      results,
      approver,
      auditor,
      creater,
      tabDate,
      verName,
      verCode,
      archDate,
      flag,
      toMesDate,
      fromMesDate,
      deleted,
      batchDes,
      category,
      makeno,
      shifteqpno,
      boxno,
      pid,
      reviewer,
      rvcount,
      state,
      reviewTime,
      auditTime,
      spec,
      approveTime,
      unit,
      arrivalTime,
      storagePlace,
      checker,
      receiveTime,
      inspTime,
      storer,
      isverify,
      ischk,
      bak1,
      bak2
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateBatch({ id, batchCode, batchName, typ, eqpCode, matCode, judgeCode, batchDate, isflag, enabled, totalNum, results, approver, auditor, creater, tabDate, verName, verCode, archDate, flag, toMesDate, fromMesDate, deleted, batchDes, category, makeno, shifteqpno, boxno, pid, reviewer, rvcount, state, reviewTime, auditTime, spec, approveTime, unit, arrivalTime, storagePlace, checker, receiveTime, inspTime, storer, isverify, ischk, bak1, bak2 });
    const { error } = await fetchUpdateBatch({
      id,
      batchCode,
      batchName,
      typ,
      eqpCode,
      matCode,
      judgeCode,
      batchDate,
      isflag,
      enabled,
      totalNum,
      results,
      approver,
      auditor,
      creater,
      tabDate,
      verName,
      verCode,
      archDate,
      flag,
      toMesDate,
      fromMesDate,
      deleted,
      batchDes,
      category,
      makeno,
      shifteqpno,
      boxno,
      pid,
      reviewer,
      rvcount,
      state,
      reviewTime,
      auditTime,
      spec,
      approveTime,
      unit,
      arrivalTime,
      storagePlace,
      checker,
      receiveTime,
      inspTime,
      storer,
      isverify,
      ischk,
      bak1,
      bak2
    });
    if (error) return;
  }