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

ZengTao

2024-09-12 d035982917751f376da2c0d4b4104ed3d64f39dc

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

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java

@@ -21,6 +21,8 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeDetail;
import com.mes.pp.entity.OptimizeLayout;
@@ -54,6 +56,9 @@

    @Autowired
    UpPattenUsageMapper upPattenUsageMapper;

    @Autowired
    EngineeringMapper engineeringMapper;

    @Autowired
    OptimizeDetailMapper optimizeDetailMapper;
@@ -116,16 +121,66 @@
     */
    @Override
    public List<Map<String, Object>> selectCutTerritory() {
        //查询EdgStorageCageDetails最后一张玻璃所属版图
        List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
                .selectAll(UpPattenUsage.class)
                .distinct()
                .innerJoin(Engineering.class, on -> on
                        .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
                .innerJoin(GlassInfo.class, on -> on
                        .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
                        .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
                .leftJoin(EdgStorageCageDetails.class, on -> on
                        .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
                        .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
                .leftJoin(Damage.class, on -> on
                        .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
                        .eq(Damage::getGlassId,GlassInfo::getGlassId))
                .eq(Engineering::getState,1)
                .orderByDesc(UpPattenUsage::getState)
                .orderByDesc(UpPattenUsage::getId)
                .and(wrapper->wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
                .orderByDesc(UpPattenUsage::getLayoutSequence)
                .orderByDesc(GlassInfo::getId)
        );
        if (!upPattenUsage.isEmpty()) {
            //当前版
            UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
            //查看当前版是否存在未进笼子或破损的玻璃
            List<UpPattenUsage> upPattenUsage2=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
                    .selectAll(UpPattenUsage.class)
                    .distinct()
                    .innerJoin(GlassInfo.class, on -> on
                            .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
                            .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
                    .leftJoin(EdgStorageCageDetails.class, on -> on
                            .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
                            .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
                    .leftJoin(Damage.class, on -> on
                            .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
                            .eq(Damage::getGlassId,GlassInfo::getGlassId))
                    .eq(UpPattenUsage::getEngineeringId,upPattenUsage.get(0).getEngineeringId())
                    .eq(UpPattenUsage::getLayoutSequence,upPattenUsage.get(0).getLayoutSequence())
                    .and(wrapper->wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
                    .orderByDesc(UpPattenUsage::getLayoutSequence)
                    .orderByDesc(GlassInfo::getId)
            );
            //显示下一版  否则显示当前版图
            if(upPattenUsage2.isEmpty()){
                //剩余版图
                List<UpPattenUsage> upPattenUsage3=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
                        .selectAll(UpPattenUsage.class)
                        .distinct()
                        .innerJoin(Engineering.class, on -> on
                                .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
                        .eq(Engineering::getState,1)
                        .gt(UpPattenUsage::getLayoutSequence,upPattenUsage1.getLayoutSequence())
                        .orderByAsc(UpPattenUsage::getLayoutSequence)
                );
                if(!upPattenUsage3.isEmpty()){
                    //切换成下一版图
                    upPattenUsage1=upPattenUsage3.get(0);
                }
            }

            List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
                    .selectAll(OptimizeDetail.class)
                    .selectAs(OptimizeLayout::getWidth, "olWidth")
@@ -139,7 +194,6 @@
            Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
                    .selectAll(EdgStorageCageDetails.class)
                    .eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
                    .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
            ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));

            Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
@@ -153,11 +207,11 @@
                if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
                    log.info("优化数据中glassId存在空值-----内容：{}",cutTerritorys);
                    return new ArrayList<>();
                }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
                    cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
                }else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
                    //log.info("玻璃已破损/拿走-----内容：{}",damageMaps.get(item.get("glass_id")));
                    cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getStatus());
                    cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getType());
                }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
                    cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
                }else{
                    cutTerritory.put("glass_state",0);
                }
@@ -177,6 +231,15 @@
    @Override
    public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {

        List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
                .selectAll(Engineering.class)
                .eq(Engineering::getEngineerId,current)
                .gt(Engineering::getState,0)
        );
        if(engineering.size()==0){
            log.info("当前工程号未领取过:{}",current);
            return new ArrayList<>();
        }
        //结果
        List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
        //此工程的所有优化数据
@@ -208,7 +271,7 @@
            }
            if(damageMaps.get(item.get("glass_id"))!=null){
                //log.info("玻璃已破损/拿走-----内容：{}",damageMaps.get(item.get("glass_id")));
                item.put("glass_state",damageMaps.get(item.get("glass_id")).getStatus());
                item.put("glass_state",damageMaps.get(item.get("glass_id")).getType());
            }else if(edgMaps.get(item.get("glass_id"))!=null){
                item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
            }else{

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

@@ -2,6 +2,12 @@


import cn.hutool.json.JSONObject;



import com.mes.rawglassdetails.entity.RawGlassStorageDetails;

import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;

import com.mes.rawglassstation.entity.RawGlassStorageStation;

import com.mes.rawglassstation.service.RawGlassStorageStationService;

import com.mes.rawglasstask.entity.RawGlassStorageTask;

import com.mes.rawglasstask.service.RawGlassStorageTaskService;

import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;

import com.mes.shelfrack.service.ShelfRackService;

import com.mes.storagetask.entity.request.StorageTaskRequest;

@@ -26,20 +32,27 @@
    private StorageTaskService storageTaskService;

    @Autowired

    private ShelfRackService shelfRackService;

    @Autowired

    private RawGlassStorageDetailsService rawGlassStorageDetailsService;

    @Autowired

    private RawGlassStorageStationService rawGlassStorageStationService;

    @Autowired

    private RawGlassStorageTaskService rawGlassStorageTaskService;





    @Scheduled(fixedDelay = 2000)

    public void sendDownWorkstations() {

        log.info("发送任务信息和架子信息");

        JSONObject jsonObject = new JSONObject();



        List<RawUsageAndShelfRack> rack =  shelfRackService.selectshelf_rack();

        List<StorageTaskRequest>  tasks =  storageTaskService.Tasks();

        List<RawGlassStorageDetails> rack =  rawGlassStorageDetailsService.list();

        List<RawGlassStorageStation> state =  rawGlassStorageStationService.list();

        List<RawGlassStorageTask> tasks =  rawGlassStorageTaskService.selectTasks();



        jsonObject.append("rack",rack);

        jsonObject.append("state",state);

        jsonObject.append("tasks",tasks);

        log.info(jsonObject.toString());

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("storageTask");

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");

        if (sendwServer != null) {

            for (WebSocketServer webserver : sendwServer) {

                if (webserver != null&&webserver.session.isOpen()) {


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

New file
@@ -0,0 +1,21 @@
package com.mes.rawglassdetails.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@RestController
@RequestMapping("/raw_glass_storage_details/raw-glass-storage-details")
public class RawGlassStorageDetailsController {

}


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

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

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;

/**
 * <p>
 * 
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class RawGlassStorageDetails implements Serializable {

    private static final long serialVersionUID = 1L;

      @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 设备id
     */
    private Integer deviceId;

    /**
     * 格子id
     */
    private String slotId;

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

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

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

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

    /**
     * 创建时间
     */
    private LocalDateTime createTime;

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


}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java

New file
@@ -0,0 +1,16 @@
package com.mes.rawglassdetails.mapper;

import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
public interface RawGlassStorageDetailsMapper extends BaseMapper<RawGlassStorageDetails> {

}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml

New file
@@ -0,0 +1,5 @@
<?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="glassdetails.mapper.RawGlassStorageDetailsMapper">

</mapper>

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

New file
@@ -0,0 +1,5 @@
<?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="glassdetails.mapper.RawGlassStorageStationMapper">

</mapper>

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml

New file
@@ -0,0 +1,5 @@
<?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="glassdetails.mapper.RawGlassStorageTaskMapper">

</mapper>

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

New file
@@ -0,0 +1,30 @@
package com.mes.rawglassdetails.service;

import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
public interface RawGlassStorageDetailsService extends IService<RawGlassStorageDetails> {
    List<RawGlassStorageDetails> selectDetails();

    boolean updateRawGlassStorageDetails(String films_id);//要大写这个
    /**
     *删除表
     * @return boolean
     */
    boolean deleteRawGlassStorageDetails(String device_id);//先在这里创  然后点那个相关问题
    /**
     *新增表
     * @return boolean
     */
    boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw);
}

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

New file
@@ -0,0 +1,54 @@
package com.mes.rawglassdetails.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@Service
public abstract class RawGlassStorageDetailsServiceImpl extends ServiceImpl<RawGlassStorageDetailsMapper, RawGlassStorageDetails> implements RawGlassStorageDetailsService {

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

        return update(wrapper);//这个方法默认返回的就是bool类型 所有可以直接return这个方法，ok了，你正常创建方法去上一层创
    }

    @Override
    public boolean deleteRawGlassStorageDetails(String device_id) {
        QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("device_id", device_id);
        return  remove(queryWrapper);//remove才是删除，delete得用另外的依赖，默认方法是remove返回bool

    }

    @Override
               //返回类型                    方法名              传输值
    public List<RawGlassStorageDetails> selectDetails() {
//        QueryWrapper<RawGlassStorageDetails>queryWrapper=new QueryWrapper<>();
//         queryWrapper.eq("id",rs.getId());
//        return list(queryWrapper);
        return list();
    }
    @Override
    public boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw){
        return this.save(rw);
    }

}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java

New file
@@ -0,0 +1,21 @@
package com.mes.rawglassstation.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@RestController
@RequestMapping("/raw-glass-storage-station")
public class RawGlassStorageStationController {

}


 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java

New file
@@ -0,0 +1,52 @@
package com.mes.rawglassstation.entity;

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

/**
 * <p>
 * 
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class RawGlassStorageStation implements Serializable {

    private static final long serialVersionUID = 1L;

      @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 设备id
     */
    private Integer deviceId;

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

    /**
     * 启用标记
     */
    private String enableState;

    /**
     * 开始工位
     */
    private Integer startSlot;

    /**
     * 目标工位
     */
    private Integer endSlot;


}

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

New file
@@ -0,0 +1,16 @@
package com.mes.rawglassstation.mapper;

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

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
public interface RawGlassStorageStationMapper extends BaseMapper<RawGlassStorageStation> {

}

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

New file
@@ -0,0 +1,5 @@
<?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.raw_glass_storage_station.mapper.RawGlassStorageStationMapper">

</mapper>

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

New file
@@ -0,0 +1,22 @@
package com.mes.rawglassstation.service;

import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
public interface RawGlassStorageStationService extends IService<RawGlassStorageStation> {
    List<RawGlassStorageStation> selectStations();
    boolean updateRawGlassStorageStation(String slot);
    boolean deleteRawGlassStorageStation(String device_id);
    boolean insertRawGlassStorageStation(RawGlassStorageStation rw);
}

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

New file
@@ -0,0 +1,46 @@
package com.mes.rawglassstation.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.mapper.RawGlassStorageStationMapper;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@Service
public abstract class RawGlassStorageStationServiceImpl extends ServiceImpl<RawGlassStorageStationMapper, RawGlassStorageStation> implements RawGlassStorageStationService {
    public List<RawGlassStorageStation> selectDetails() {
        return list();
    }
    @Override
    public boolean updateRawGlassStorageStation(String slot) {
        UpdateWrapper<RawGlassStorageStation> wrapper = new UpdateWrapper<>();  //这个类型定义错了，不应该是tasking
        wrapper.set("slot","105")
                .eq( "slot",slot);
        return update(wrapper);
    }

    @Override
    public boolean deleteRawGlassStorageStation(String device_id) {
        QueryWrapper<RawGlassStorageStation> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("device_id", device_id);
        return  remove(queryWrapper);
    }

    @Override
    public boolean insertRawGlassStorageStation(RawGlassStorageStation rw) {
        return this.save(rw);
    }
}

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

New file
@@ -0,0 +1,21 @@
package com.mes.rawglasstask.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@RestController
@RequestMapping("/raw_glass_storage_task/raw-glass-storage-task")
public class RawGlassStorageTaskController {

}


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

New file
@@ -0,0 +1,43 @@
package com.mes.rawglasstask.entity;

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;

/**
 * <p>
 * 
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class RawGlassStorageTask implements Serializable {

    private static final long serialVersionUID = 1L;

      @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 起始格子
     */
    private Integer originateSlot;

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

    /**
     * 创建时间
     */
    private LocalDateTime createTime;


}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/RawGlassStorageTaskMapper.java

New file
@@ -0,0 +1,16 @@
package com.mes.rawglasstask.mapper;

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

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
public interface RawGlassStorageTaskMapper extends BaseMapper<RawGlassStorageTask> {

}

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/mapper/xml/RawGlassStorageTaskMapper.xml

New file
@@ -0,0 +1,5 @@
<?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.raw_glass_storage_task.mapper.RawGlassStorageTaskMapper">

</mapper>

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

New file
@@ -0,0 +1,22 @@
package com.mes.rawglasstask.service;

import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
public interface RawGlassStorageTaskService extends IService<RawGlassStorageTask> {
    List<RawGlassStorageTask> selectTasks();
    boolean updateRawGlassStorageTask(String originate_slot);
    boolean deleteRawGlassStorageTask(String id);
    boolean insertRawGlassStorageTask(RawGlassStorageTask rw);
}

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

New file
@@ -0,0 +1,47 @@
package com.mes.rawglasstask.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author wf
 * @since 2024-09-10
 */
@Service
public abstract class RawGlassStorageTaskServiceImpl extends ServiceImpl<RawGlassStorageTaskMapper, RawGlassStorageTask> implements RawGlassStorageTaskService {

    public List<RawGlassStorageTask> selectDetails() {
        return list();
    }
    @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/application.yml

@@ -3,7 +3,7 @@

spring:
  profiles:
    active: dev
    active: prod
  application:
    name: glassStorage
  liquibase:

 hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java

@@ -1,11 +1,11 @@
package mes;

import com.mes.GlassStorageApplication;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawusage.entity.RawUsage;
import com.mes.rawusage.service.RawUsageService;
import com.mes.shelfrack.entity.ShelfRack;
import com.mes.shelfrack.service.ShelfRackService;
import com.mes.storagetask.entity.StorageTask;
import com.mes.storagetask.service.StorageTaskService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -15,6 +15,7 @@
import org.springframework.test.context.junit4.SpringRunner;

import java.util.Arrays;
import java.util.List;

/**
 * @Author : zhoush
@@ -35,6 +36,8 @@
    private ShelfRackService shelfRackService;
    @Autowired
    private RawUsageService rawUsageService;
    @Autowired
    private RawGlassStorageDetailsService  rawGlassStorageDetailsService;


    @Test
@@ -69,6 +72,13 @@
        raw.setId(null);
        rawUsageService.updateRawPackageAndStorageRack(raw);
    }
    @Test
    public void txt() {
        RawGlassStorageDetails rs=new RawGlassStorageDetails();
        rs.setId(105L);
        List<RawGlassStorageDetails> aa=rawGlassStorageDetailsService.selectDetails();
        log.info(String.valueOf(aa));
    }