Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-09-23 c2a11183357181439060456f6d33b50438d25c5b

Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

 UI-Project/src/views/Identify/identify.vue

@@ -35,10 +35,10 @@
   </div>
  </el-scrollbar>
  <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
        <el-button :disabled="currentGlassRect?.glass_state === 8" type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)"  style="width: 140px;margin-left: 10px;">
        <el-button :disabled="currentGlassRect?.glass_state === 8 || currentGlassRect?.glass_state === 9" type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)"  style="width: 140px;margin-left: 10px;">
          {{ $t('order.dilapidation') }}
        </el-button>
        <el-button :disabled="currentGlassRect?.glass_state === 9" type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
        <el-button :disabled="currentGlassRect?.glass_state === 9 || currentGlassRect?.glass_state === 8" type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
          <el-icon class="el-icon--right"><Upload /></el-icon>
          {{ $t('order.takeaway') }}</el-button>
  </el-dialog> 
@@ -66,7 +66,7 @@
let webSocket: WebSocket | null = null;  
const totalPages = ref(0);
const pageSize = ref(1);
const currentPage = ref(1);
const currentPage = ref('');
const disabled = false;
const size = 'small';
const rawData = ref([]);
@@ -74,7 +74,7 @@
//   blind.value = true; // 打开绑定架子对话框
// };
// 显示对话框并设置当前 glass_id  
const currentGlassRect = computed(() => {  
const currentGlassRect = computed(() => {
  return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);  
}); 
function showDialog(glassId: number) {
@@ -93,9 +93,6 @@
// 破损
const handleDamage = async () => {
  try  {
    // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
    //   console.log(url);
    //   const response = await request.post(url)
  const response = await request.post('/cacheGlass/taskCache/identControls', {
    glassId: currentGlassId.value,
    state: 8,
@@ -107,7 +104,8 @@
      // window.location.reload() 
      blind.value = false;
      updateRectStatus(currentGlassId.value, 8); 
  } else {
      findEngineering()
    } else {
      // 请求失败，显示错误消息
      ElMessage.error(response.msg);
    }
@@ -135,6 +133,7 @@
      // window.location.reload() 
      blind.value = false;
      updateRectStatus(currentGlassId.value, 9); 
      findEngineering()
  } else {
      // 请求失败，显示错误消息
      ElMessage.error(response.msg);
@@ -145,7 +144,7 @@
    console.error(error);
  }
}
const handleBlur = async () => {  
const handleBlur = async () => {
  if (inputValue.value) {  
    var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
    const response = await request.post(url)
@@ -170,14 +169,26 @@
        webSocket.close();  
        webSocket = null;
      }  
       currentPage.value = 1;  
       currentPage.value = 1;
    }  
  } else{
    connectWebSocket();
  } 
}; 
const findEngineering = async () => {
  if (inputValue.value) {  
    var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
    const response = await request.post(url)
    if (response.code === 200) {
      rawData.value = response.data;
    }  
  } else{
  } 
}; 

const handleCurrentChange = (val: number) => {  
  currentPage.value = val;
  // window.localStorage.setItem('pagenumber', currentPage.value).
  const page = currentPage.value - 1
      const scaleFactor =  1621.78/6000; 
      const scaleFactory =  750/3300; 

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java

@@ -7,11 +7,9 @@
import com.mes.rawglassstation.service.RawGlassStorageStationService;

import com.mes.rawglasstask.entity.RawGlassStorageTask;

import com.mes.rawglasstask.service.RawGlassStorageTaskService;

import com.mes.shelfrack.service.ShelfRackService;

import com.mes.storagetask.service.StorageTaskService;

import com.mes.tools.WebSocketServer;

import org.springframework.beans.factory.annotation.Autowired;

import lombok.extern.slf4j.Slf4j;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



@@ -23,13 +21,10 @@
public class push {



    @Autowired

    private StorageTaskService storageTaskService;

    @Autowired

    private ShelfRackService shelfRackService;

    @Autowired

    private RawGlassStorageDetailsService rawGlassStorageDetailsService;

    @Autowired

    private RawGlassStorageStationService rawGlassStorageStationService;



    @Autowired

    private RawGlassStorageTaskService rawGlassStorageTaskService;




 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java

@@ -1,10 +1,12 @@
package com.mes.rawglassdetails.controller;


import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

/**
@@ -20,7 +22,6 @@
public class RawGlassStorageDetailsController {

    @Autowired
//    RawGlassStorageDetailsService rawGlassStorageDetailsService;
    private RawGlassStorageDetailsService rawGlassStorageDetailsService;
    @ApiOperation("工位状态")
    @PostMapping("/updateEnableState")
@@ -34,6 +35,13 @@
        }
    }

    @ApiOperation("原片入库")
    @PostMapping("/patternWarehousing")
    public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {

        return Result.build(200, "入库已完成，等待任务执行", rawGlassStorageDetailsService.patternWarehousing(request));

    }

}


 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java

@@ -2,12 +2,11 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;

import lombok.Data;
import lombok.EqualsAndHashCode;

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

/**
 * <p>
@@ -67,4 +66,10 @@
    private String remainQuantity;


    /**
     * 状态
     */
    private int state;


}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java

New file
@@ -0,0 +1,42 @@
package com.mes.rawglassdetails.entity.request;

import lombok.Data;

/**
 * @Author : zhoush
 * @Date: 2024/9/20 16:31
 * @Description:
 */
@Data
public class RawGlassRequest {

    /**
     * 原片宽
     */
    private Double patternWidth;

    /**
     * 原片高
     */
    private Double patternHeight;

    /**
     * 原片厚度
     */
    private Double patternThickness;

    /**
     * 膜系
     */
    private String filmsId;

    /**
     * 剩余数量
     */
    private String remainQuantity;

    /**
     * 栅格号
     */
    private Integer slot;
}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;

import java.util.List;

@@ -11,16 +11,37 @@
 * @since 2024-07-09 14:51:27
 */
public interface RawGlassStorageDetailsService extends IService<RawGlassStorageDetails> {

    List<RawGlassStorageDetails> selectDetails();
    boolean updateRawGlassStorageDetails(String films_id);//要大写这个

    /**
     *删除表
     * 要大写这个
     *
     * @param films_id
     * @return
     */
    boolean updateRawGlassStorageDetails(String films_id);

    /**
     * 删除表  先在这里创  然后点那个相关问题
     *
     * @return boolean
     */
    boolean deleteRawGlassStorageDetails(String device_id);//先在这里创  然后点那个相关问题
    boolean deleteRawGlassStorageDetails(String device_id);

    /**
     *新增表
     * 新增表
     *
     * @return boolean
     */
    boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw);


    /**
     * 原片入库
     *
     * @param request
     * @return
     */
    String patternWarehousing(RawGlassRequest request);
}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java

@@ -3,16 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
@@ -26,8 +25,8 @@
    @Override
    public boolean updateRawGlassStorageDetails(String films_id) {
        UpdateWrapper<RawGlassStorageDetails> wrapper = new UpdateWrapper<>();  //这个类型定义错了，不应该是tasking
        wrapper.set("films_id","1005")
                .eq( "films_id",films_id);
        wrapper.set("films_id", "1005")
                .eq("films_id", films_id);

        return update(wrapper);//这个方法默认返回的就是bool类型 所有可以直接return这个方法，ok了，你正常创建方法去上一层创
    }
@@ -36,7 +35,7 @@
    public boolean deleteRawGlassStorageDetails(String device_id) {
        QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("device_id", device_id);
        return  remove(queryWrapper);//remove才是删除，delete得用另外的依赖，默认方法是remove返回bool
        return remove(queryWrapper);//remove才是删除，delete得用另外的依赖，默认方法是remove返回bool
    }

    @Override
@@ -47,9 +46,20 @@
//        return list(queryWrapper);
        return list();
    }

    @Override
    public boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw){
    public boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw) {
        return this.save(rw);
    }

    @Override
    public String patternWarehousing(RawGlassRequest request) {
        //todo:原片信息存入详情表
        RawGlassStorageDetails details = new RawGlassStorageDetails();
        BeanUtils.copyProperties(request, details);
        details.setState(Const.GLASS_STATE_IN);
        save(details);
        return null;
    }

}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java

@@ -1,7 +1,10 @@
package com.mes.rawglassstation.mapper;

import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglasstask.entity.RawGlassStorageTask;

import java.util.List;

/**
 * <p>
@@ -13,4 +16,5 @@
 */
public interface RawGlassStorageStationMapper extends BaseMapper<RawGlassStorageStation> {

    List<RawGlassStorageTask> listRawGlassDetails();
}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml

File was deleted

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java

@@ -12,7 +12,12 @@
 */
public interface RawGlassStorageStationService extends IService<RawGlassStorageStation> {
    List<RawGlassStorageStation> selectStations();

    boolean updateRawGlassStorageStation(String slot);

    boolean deleteRawGlassStorageStation(String device_id);

    boolean insertRawGlassStorageStation(RawGlassStorageStation rw);

    List<RawGlassStorageTask> listRawGlassDetails();
}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java

@@ -6,10 +6,10 @@
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.mapper.RawGlassStorageStationMapper;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
@@ -35,7 +35,7 @@
    public boolean deleteRawGlassStorageStation(String device_id) {
        QueryWrapper<RawGlassStorageStation> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("device_id", device_id);
        return  remove(queryWrapper);
        return remove(queryWrapper);
    }

    @Override
@@ -43,6 +43,10 @@
        return this.save(rw);
    }

    @Override
    public List<RawGlassStorageTask> listRawGlassDetails() {
        return baseMapper.listRawGlassDetails();
    }


}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java

@@ -1,7 +1,6 @@
package com.mes.rawglasstask.controller;


import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.utils.Result;
@@ -14,21 +13,24 @@

/**
 * <p>
 *  前端控制器
 * 原片任务控制器
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@RestController
@RequestMapping("/raw_glass_storage_task")
@RequestMapping("/rawGlassStorageTask")
public class RawGlassStorageTaskController {

    @Autowired
    private RawGlassStorageTaskService rwService; //这里是你定义调用的service，这个是报工的
    @ApiOperation("原片仓储数据查询")
    @PostMapping("/selectRawglasstask")
    public Result selectDamage(@RequestBody RawGlassTaskRequest rw) {
        return Result.build(200,"查询成功", rwService.setRawGlassTaskRequest(rw));
    private RawGlassStorageTaskService rawGlassStorageTaskService;

    @ApiOperation("设置原片仓储查询条件")
    @PostMapping("/setRawGlassTaskRequest")
    public Result setRawGlassTaskRequest(@RequestBody RawGlassTaskRequest request) {
        return Result.build(200, "查询成功", rawGlassStorageTaskService.setRawGlassTaskRequest(request));
    }

}


 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java

@@ -2,10 +2,10 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;

/**
 * <p>
@@ -26,11 +26,6 @@
    private Long id;

    /**
     * 任务ID
     */
    private Integer enableId;

    /**
     * 起始格子
     */
    private Integer originateSlot;
@@ -48,12 +43,12 @@
    /**
     * 任务类型
     */
    private Integer enableType;
    private Integer taskType;

    /**
     * 任务状态
     */
    private Integer enableState;
    private Integer taskState;

    /**
     * 创建时间

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java

@@ -1,9 +1,6 @@
package com.mes.rawglasstask.entity.request;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

@@ -16,24 +13,23 @@
    /**
     * 任务类型   1 入库    2 出库    3 调度
     */
    private List<Integer> enableState;
    private List<Integer> taskState;
    /**
     * 任务状态   1 新建  2 执行中   3 完成
     */
    private List<Integer> enableType;
    private List<Integer> taskType;

    /**
     * 开始时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date beginDate;

    /**
     * 结束时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date patternQuantity;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endDate;
}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java

@@ -5,7 +5,6 @@
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;

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

/**
 * @author system
@@ -13,12 +12,18 @@
 */
public interface RawGlassStorageTaskService extends IService<RawGlassStorageTask> {

    List<RawGlassStorageTask> findAll();
    String setRawGlassTaskRequest(RawGlassTaskRequest request);
    /**
     * 查询原片仓储任务详情
     *
     * @return
     */
    List<RawGlassStorageTask> listRawGlassTask();

    List<RawGlassStorageTask> selectTask();
    List<RawGlassStorageTask> selectTasking(RawGlassStorageTask rawGlassStorageTask);
    boolean updateRawGlassStorageTask(String originate_slot);
    boolean deleteRawGlassStorageTask(String id);
    boolean insertRawGlassStorageTask(RawGlassStorageTask rw);
    /**
     * 设置原片仓储查询条件
     *
     * @param request
     * @return
     */
    String setRawGlassTaskRequest(RawGlassTaskRequest request);
}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java

@@ -1,25 +1,19 @@
package com.mes.rawglasstask.service.impl;

import com.baomidou.mybatisplus.core.assist.ISqlRunner;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.utils.RedisUtil;
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.tools.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * @author system
@@ -29,42 +23,31 @@
@Slf4j
public class RawGlassRawGlassStorageTaskServiceImpl extends ServiceImpl<RawGlassStorageTaskMapper, RawGlassStorageTask> implements RawGlassStorageTaskService {


    @Autowired
    RedisUtil redisUtil;

    @Override
    public List<RawGlassStorageTask> findAll() {
    public List<RawGlassStorageTask> listRawGlassTask() {
        RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
        if (null == request) {
            request = new RawGlassTaskRequest();
        }
        if (request.getBeginDate() == null) {
            //设置默认时间    startDate：开始时间   endDate：结束时间
            DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
            Date startDate=null;
            Date endDate=null;
            try {
                startDate= df.parse("2022-01-01");
                endDate= df.parse("2025-01-01");
            }catch (ParseException e){
                e.printStackTrace();
            }
            request.setCreateTime(startDate);//
            request.setPatternQuantity(endDate);
            //return null;
            request.setBeginDate(DateUtil.getBeginDate());
            request.setEndDate(DateUtil.getEndDate());
        }
        return list(new LambdaQueryWrapper<RawGlassStorageTask>()
                .between(RawGlassStorageTask::getCreateTime, request.getBeginDate(), request.getEndDate())
                .in(CollectionUtil.isNotEmpty(request.getTaskState()), RawGlassStorageTask::getTaskState, request.getTaskState())
                .in(CollectionUtil.isNotEmpty(request.getTaskType()), RawGlassStorageTask::getTaskType, request.getTaskType())
                .orderByDesc(RawGlassStorageTask::getCreateTime));

        QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
        //下面这个列是查询字段，不要可以删掉默认查询全部
        queryWrapper.ge("create_time", request.getCreateTime())//大于时间
                .le("create_time",request.getPatternQuantity());//小于时间
//                .orderByDesc("enable_id");//排序字段
        if(!request.getEnableType().isEmpty()&&request.getEnableType().size()>0){
            queryWrapper.eq("enable_type", request.getEnableType().get(0));
        }if(!request.getEnableState().isEmpty()&&request.getEnableState().size()>0){
            queryWrapper.eq("enable_state", request.getEnableState().get(0));
        }

        return baseMapper.selectList(queryWrapper);
//        return list(new QueryWrapper<RawGlassStorageTask>()
//                .in(CollectionUtil.isNotEmpty(request.getTaskState()), "task_state", request.getTaskState())
//                .in(CollectionUtil.isNotEmpty(request.getTaskType()), "task_type", request.getTaskType())
//                .between("create_time", request.getBeginDate(), request.getEndDate())
//                .orderByDesc("create_time"));
    }

    @Override
@@ -74,49 +57,7 @@
        } else {
            redisUtil.setCacheObject("rawGlassTaskRequest", request);
        }
        log.info("前端传入参数：{}",request);
        log.info("前端传入参数：{}", request);
        return "success";
    }

    @Override
    public List<RawGlassStorageTask> selectTask() {
        return list();
    }

    @Override
    public List<RawGlassStorageTask> selectTasking(RawGlassStorageTask rw) {
        QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
        //下面这个列是查询字段，不要可以删掉默认查询全部
        queryWrapper.ge("create_time", rw.getCreateTime())//大于时间
                .le("create_time",rw.getPatternQuantity())//小于时间
                .groupBy("enable_id");//排序字段
        if(rw.getEnableType()!=null){
            queryWrapper.eq("enable_type", rw.getEnableType());
        }if(rw.getEnableState()!=null){
            queryWrapper.eq("enable_state", rw.getEnableState());
        }
        return baseMapper.selectList(queryWrapper);
//        return  list(queryWrapper);
    }
    @Override
    public boolean insertRawGlassStorageTask(RawGlassStorageTask rw) {
        return this.save(rw);
    }
    @Override
    public boolean updateRawGlassStorageTask(String originate_slot) {
        UpdateWrapper<RawGlassStorageTask> wrapper = new UpdateWrapper<>();
        wrapper.set("originate_slot","1005")
                .eq( "originate_slot",originate_slot);
        return update(wrapper);
    }

    @Override
    public boolean deleteRawGlassStorageTask(String id) {
        QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id", id);
        return  remove(queryWrapper);
    }



}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml

New file
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mes.rawglassstation.mapper.RawGlassStorageStationMapper">

    <resultMap id="baseMap" type="com.mes.rawglassdetails.entity.RawGlassStorageDetails">
        <result column="device_id" property="deviceId"/>
        <result column="slot" property="slotId"/>
        <result column="pattern_width" property="patternWidth"/>
        <result column="pattern_height" property="patternHeight"/>
        <result column="pattern_thickness" property="patternThickness"/>
        <result column="films_id" property="filmsId"/>
        <result column="create_time" property="createTime"/>
        <result column="remain_quantity" property="remainQuantity"/>
    </resultMap>


    <select id="listRawGlassDetails" resultMap="baseMap">
        SELECT T.DEVICE_ID,
               T.SLOT,
               T1.PATTERN_WIDTH,
               T1.PATTERN_HEIGHT,
               T1.PATTERN_THICKNESS,
               T1.FILMS_ID,
               T1.CREATE_TIME,
               T1.REMAIN_QUANTITY
        FROM RAW_GLASS_STORAGE_STATION T
                 LEFT JOIN RAW_GLASS_STORAGE_DETAILS T1 ON T.DEVICE_ID = T1.DEVICE_ID
            AND T.SLOT = T1.SLOT_ID
            AND T1.STATE = 100
    </select>
</mapper>

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql

@@ -2,7 +2,7 @@

-- changeset zsh:20240904001
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_type';
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_type' and table_schema = 'hangzhoumes';
CREATE TABLE sys_dict_type
(
    dict_id     INT AUTO_INCREMENT PRIMARY KEY,
@@ -17,7 +17,7 @@

-- changeset zsh:20240904002
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_data';
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sys_dict_data' and table_schema = 'hangzhoumes';
CREATE TABLE sys_dict_data
(
    dict_id         INT AUTO_INCREMENT PRIMARY KEY,
@@ -155,27 +155,25 @@

-- changeset wangfei:20240918001
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_details';
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_details' and table_schema = 'hangzhoumes';
CREATE TABLE raw_glass_storage_details
(
    id            bigint NOT NULL AUTO_INCREMENT,
    device_id     int NULL DEFAULT NULL COMMENT '设备id',
    slot_id       varchar(255) NULL DEFAULT NULL COMMENT '格子id',
    pattern_width double(8, 2
) NULL DEFAULT NULL COMMENT '原片宽',
    pattern_height double(8, 2) NULL DEFAULT NULL COMMENT '原片高',
    id                bigint       NOT NULL AUTO_INCREMENT,
    device_id         int          NULL DEFAULT NULL COMMENT '设备id',
    slot_id           varchar(255) NULL DEFAULT NULL COMMENT '格子id',
    pattern_width     double(8, 2) NULL DEFAULT NULL COMMENT '原片宽',
    pattern_height    double(8, 2) NULL DEFAULT NULL COMMENT '原片高',
    pattern_thickness double(8, 2) NULL DEFAULT NULL COMMENT '原片厚度',
    films_id varchar(255)  NULL DEFAULT NULL COMMENT '膜系',
    create_time datetime NOT NULL COMMENT '创建时间',
    remain_quantity varchar(255)  NULL DEFAULT NULL COMMENT '剩余数量',
    films_id          varchar(255) NULL DEFAULT NULL COMMENT '膜系',
    create_time       datetime     NOT NULL COMMENT '创建时间',
    remain_quantity   varchar(255) NULL DEFAULT NULL COMMENT '剩余数量',
    PRIMARY KEY (id) USING BTREE
);
-- rollback DROP TABLE raw_glass_storage_details;


-- changeset wangfei:20240918002
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station';
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station' and table_schema = 'hangzhoumes';
CREATE TABLE raw_glass_storage_station
(
    id           bigint NOT NULL AUTO_INCREMENT,
@@ -191,7 +189,7 @@

-- changeset wangfei:20240918003
-- preconditions onFail:CONTINUE onError:CONTINUE
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_task';
-- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_task' and table_schema = 'hangzhoumes';
CREATE TABLE raw_glass_storage_task
(
    id               bigint NOT NULL AUTO_INCREMENT,