1、中空理片笼新增配方相关功能，用于用户自定义保存中空线相关参数，避免重复输入相同的参数 2、领取任务/强制出片改造：在流程卡、路线、数量基础上新增配...

zhoushihao

2024-12-27 cb921a68fe5f01012125fb522086acea2aa255ba

1、中空理片笼新增配方相关功能，用于用户自定义保存中空线相关参数，避免重复输入相同的参数
2、领取任务/强制出片改造：在流程卡、路线、数量基础上新增配方id，用于关联本地流程卡的中空的参数配方
3、增加限制：同一条线路的同个流程卡仅能存在一个未完成的任务
4、卧式理片笼新增日期格式

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@@ -52,10 +54,14 @@
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    /**
     * 更新时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    /**

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowBigStorageCageDetailsController.java

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


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -10,6 +11,7 @@
 * @author makejava
 * @since 2024-11-21 09:23:12
 */
@Api(tags = "中空理片笼子详情")
@RestController
@RequestMapping("hollowBigStorageCageDetails")
public class HollowBigStorageCageDetailsController {

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowFormulaDetailsController.java

New file
@@ -0,0 +1,73 @@
package com.mes.hollow.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.hollow.entity.HollowFormulaDetails;
import com.mes.hollow.service.HollowFormulaDetailsService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * (HollowFormulaDetails)表控制层
 *
 * @author makejava
 * @since 2024-12-27 13:34:59
 */
@Api(tags = "中空配方详情信息")
@RestController
@RequestMapping("hollowFormulaDetails")
public class HollowFormulaDetailsController {
    /**
     * 服务对象
     */
    @Resource
    private HollowFormulaDetailsService hollowFormulaDetailsService;

    @ApiOperation("获取配方信息（分页）")
    @PostMapping("/pageFormulaDetails")
    public Result<Page<HollowFormulaDetails>> pageFormulaDetails(Integer pageNo, Integer pageSize, String keyword) {
        Page<HollowFormulaDetails> page = new Page<>(pageNo, pageSize);
        LambdaQueryWrapper<HollowFormulaDetails> wrapper = new LambdaQueryWrapper<HollowFormulaDetails>().like(StringUtils.isNotBlank(keyword)
                , HollowFormulaDetails::getFormulaName, keyword);
        return Result.success(hollowFormulaDetailsService.page(page, wrapper));
    }

    @ApiOperation("获取配方信息（列表）")
    @PostMapping("/listFormulaDetails")
    public Result<List<HollowFormulaDetails>> listFormulaDetails(String keyword) {
        LambdaQueryWrapper<HollowFormulaDetails> wrapper = new LambdaQueryWrapper<HollowFormulaDetails>().like(StringUtils.isNotBlank(keyword)
                , HollowFormulaDetails::getFormulaName, keyword);
        return Result.success(hollowFormulaDetailsService.list(wrapper));
    }

    @ApiOperation("通过主键查询单条数据")
    @GetMapping("/getFormulaDetailsById")
    public Result getFormulaDetailsById(Long id) {
        return Result.success(hollowFormulaDetailsService.getById(id));
    }

    @ApiOperation("新增数据")
    @PostMapping("/saveFormulaDetails")
    public Result saveFormulaDetails(@RequestBody HollowFormulaDetails hollowFormulaDetails) {
        return Result.success(hollowFormulaDetailsService.save(hollowFormulaDetails));
    }

    @ApiOperation("修改数据")
    @PostMapping("updateFormulaDetails")
    public Result updateFormulaDetails(@RequestBody HollowFormulaDetails hollowFormulaDetails) {
        return Result.success(this.hollowFormulaDetailsService.updateById(hollowFormulaDetails));
    }

    @ApiOperation("删除数据")
    @PostMapping("deleteFormulaDetails")
    public Result deleteFormulaDetails(@RequestParam("idList") List<Long> idList) {
        return Result.success(this.hollowFormulaDetailsService.removeByIds(idList));
    }
}


 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java

@@ -6,6 +6,7 @@
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,7 @@
 * @author makejava
 * @since 2024-11-30 13:57:28
 */
@Api(tags = "中空任务关系")
@RestController
@RequestMapping("hollowGlassOutRelationInfo")
public class HollowGlassOutRelationInfoController {
@@ -32,7 +34,7 @@
    public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) {
        HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.receiveTask(request);
        if (null == hollowGlassOutRelationInfo) {
            return Result.error(500, "有正在执行的任务，请先确保任务完成后，再次领取任务");
            return Result.error(500, "当前流程卡有未完成的任务，请先确保任务完成后，再次领取任务");
        } else {
            return Result.success(hollowGlassOutRelationInfo);
        }
@@ -43,7 +45,7 @@
    public Result<HollowGlassOutRelationInfo> forceOutGlass(HollowTaskRequest request) {
        HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.forceOutGlass(request);
        if (null == hollowGlassOutRelationInfo) {
            return Result.error(500, "有正在执行的任务，请先确保任务完成后，再次强制执行任务");
            return Result.error(500, "当前流程卡有未完成的任务，请先确保任务完成后，再次强制执行任务");
        } else {
            return Result.success(hollowGlassOutRelationInfo);
        }

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java

@@ -5,6 +5,7 @@
import com.mes.hollow.entity.dto.LackDetailsDTO;
import com.mes.hollow.service.HollowGlassRelationInfoService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,7 @@
 * @author makejava
 * @since 2024-11-23 15:59:27
 */
@Api(tags = "流程卡关系")
@RestController
@RequestMapping("hollowGlassRelationInfo")
public class HollowGlassRelationInfoController {

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java

New file
@@ -0,0 +1,70 @@
package com.mes.hollow.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * (HollowFormulaDetails)表实体类
 *
 * @author makejava
 * @since 2024-12-27 13:35:03
 */
@Data
public class HollowFormulaDetails {

    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    @ApiModelProperty(value = "配方名 930 931")
    private String formulaName;
    @ApiModelProperty(value = "除膜方式 930 931")
    private Integer filmRemove;
    @ApiModelProperty(value = "上侧除膜量 930 931")
    private Integer topRemove;
    @ApiModelProperty(value = "下侧除膜量 930 931")
    private Integer bottomRemove;
    @ApiModelProperty(value = "左侧除膜量 930 931")
    private Integer leftRemove;
    @ApiModelProperty(value = "右侧除膜量 930 931")
    private Integer rightRemove;
    /**
     * 分割线
     */
    @ApiModelProperty(value = "间隔板1代码 930专用")
    private Integer frameOne;
    @ApiModelProperty(value = "间隔板2代码 930专用")
    private Integer frameTwo;
    @ApiModelProperty(value = "间隔板3代码 930专用")
    private Integer frameThree;
    @ApiModelProperty(value = "间隔板4代码 930专用")
    private Integer frameFour;
    @ApiModelProperty(value = "密封嵌入 930专用")
    private Integer sealInsert;
    @ApiModelProperty(value = "气体1(0无 1有) 930专用")
    private Integer casOne;
    @ApiModelProperty(value = "气体2(0无 1有) 930专用")
    private Integer casTwo;
    @ApiModelProperty(value = "气体3(0无 1有) 930专用")
    private Integer casThree;
    @ApiModelProperty(value = "气体4(0无 1有) 930专用")
    private Integer casFour;
    @ApiModelProperty(value = "间隔框类型（tps胶为05 铝间隔条01） 930专用")
    private Integer intervalFrameType;
    @ApiModelProperty(value = "间隔框宽度 930专用")
    private Integer intervalFrameWidth;
    @ApiModelProperty(value = "间隔框高度 930专用")
    private Integer intervalFrameHeight;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
     * 更新时间
     */
    private Date updateTime;

}


 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowGlassOutRelationInfo.java

@@ -48,6 +48,11 @@
     * 是否强制
     */
    private Integer isForce;

    /**
     * 是否强制
     */
    private Long formulaId;
    /**
     * /*创建时间
     */

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowGlassOutRelationTaskDetails.java

File was deleted

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java

@@ -17,46 +17,10 @@
    private String flowCardId;
    @ApiModelProperty(value = "路线：930（李赛克，界面需要输入相关数据） 931")
    private int cell;
    @ApiModelProperty(value = "配对数量 930 931")
    @ApiModelProperty(value = "配对数量")
    private int totalPairQuantity;
    @ApiModelProperty(value = "除膜方式 930 931")
    private Integer filmRemove;
    @ApiModelProperty(value = "上侧除膜量 930 931")
    private Integer topRemove;
    @ApiModelProperty(value = "下侧除膜量 930 931")
    private Integer bottomRemove;
    @ApiModelProperty(value = "左侧除膜量 930 931")
    private Integer leftRemove;
    @ApiModelProperty(value = "右侧除膜量 930 931")
    private Integer rightRemove;

    /**
     * 分割线
     */
    @ApiModelProperty(value = "间隔板1代码 930专用")
    private Integer frameOne;
    @ApiModelProperty(value = "间隔板2代码 930专用")
    private Integer frameTwo;
    @ApiModelProperty(value = "间隔板3代码 930专用")
    private Integer frameThree;
    @ApiModelProperty(value = "间隔板4代码 930专用")
    private Integer frameFour;
    @ApiModelProperty(value = "密封嵌入 930专用")
    private Integer sealInsert;
    @ApiModelProperty(value = "气体1(0无 1有) 930专用")
    private Integer casOne;
    @ApiModelProperty(value = "气体2(0无 1有) 930专用")
    private Integer casTwo;
    @ApiModelProperty(value = "气体3(0无 1有) 930专用")
    private Integer casThree;
    @ApiModelProperty(value = "气体4(0无 1有) 930专用")
    private Integer casFour;
    @ApiModelProperty(value = "间隔框类型（tps胶为05 铝间隔条01） 930专用")
    private Integer intervalFrameType;
    @ApiModelProperty(value = "间隔框宽度 930专用")
    private Integer intervalFrameWidth;
    @ApiModelProperty(value = "间隔框高度 930专用")
    private Integer intervalFrameHeight;
    @ApiModelProperty(value = "配方id")
    private Long formulaId;


}

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/mapper/HollowFormulaDetailsMapper.java

New file
@@ -0,0 +1,15 @@
package com.mes.hollow.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.hollow.entity.HollowFormulaDetails;

/**
 * (HollowFormulaDetails)表数据库访问层
 *
 * @author makejava
 * @since 2024-12-27 13:34:59
 */
public interface HollowFormulaDetailsMapper extends BaseMapper<HollowFormulaDetails> {

}


 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassOutRelationTaskDetailsMapper.java

File was deleted

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowFormulaDetailsService.java

New file
@@ -0,0 +1,15 @@
package com.mes.hollow.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.hollow.entity.HollowFormulaDetails;

/**
 * (HollowFormulaDetails)表服务接口
 *
 * @author makejava
 * @since 2024-12-27 13:35:03
 */
public interface HollowFormulaDetailsService extends IService<HollowFormulaDetails> {

}


 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassOutRelationTaskDetailsService.java

File was deleted

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowFormulaDetailsServiceImpl.java

New file
@@ -0,0 +1,19 @@
package com.mes.hollow.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.hollow.entity.HollowFormulaDetails;
import com.mes.hollow.mapper.HollowFormulaDetailsMapper;
import com.mes.hollow.service.HollowFormulaDetailsService;
import org.springframework.stereotype.Service;

/**
 * (HollowFormulaDetails)表服务实现类
 *
 * @author makejava
 * @since 2024-12-27 13:35:03
 */
@Service
public class HollowFormulaDetailsServiceImpl extends ServiceImpl<HollowFormulaDetailsMapper, HollowFormulaDetails> implements HollowFormulaDetailsService {

}


 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java

@@ -9,12 +9,10 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.hollow.entity.HollowBigStorageCageDetails;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
import com.mes.hollow.entity.HollowGlassOutRelationTaskDetails;
import com.mes.hollow.entity.request.HollowTaskRequest;
import com.mes.hollow.mapper.HollowGlassOutRelationInfoMapper;
import com.mes.hollow.service.HollowBigStorageCageDetailsService;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollow.service.HollowGlassOutRelationTaskDetailsService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
import com.mes.utils.RedisUtil;
@@ -44,8 +42,6 @@
    HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;
    @Resource
    HollowGlassQueueInfoService hollowGlassQueueInfoService;
    @Resource
    HollowGlassOutRelationTaskDetailsService hollowGlassOutRelationTaskDetailsService;

    @Resource
    RedisUtil redisUtil;
@@ -149,9 +145,10 @@
        }
        List<HollowGlassOutRelationInfo> outRelationInfos = this.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
                .eq(HollowGlassOutRelationInfo::getCell, request.getCell())
                .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START));
                .eq(HollowGlassOutRelationInfo::getFlowCardId, request.getFlowCardId())
                .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_NEW, Const.HOLLOW_FLOW_CARD_START, Const.HOLLOW_FLOW_CARD_PAUSE));
        if (CollectionUtil.isNotEmpty(outRelationInfos)) {
            log.info("有正在执行的任务");
            log.info("当前流程卡在本条线有未完成的任务");
            return null;
        }
        //保存任务关系主表
@@ -161,12 +158,8 @@
        info.setTotalLayer(glassInfo.getTotalLayer());
        info.setState(Const.HOLLOW_FLOW_CARD_NEW);
        info.setTotalPairQuantity(request.getTotalPairQuantity());
        info.setFormulaId(request.getFormulaId());
        this.save(info);
        //保存任务详情表
        HollowGlassOutRelationTaskDetails taskDetails = new HollowGlassOutRelationTaskDetails();
        BeanUtils.copyProperties(request, taskDetails);
        taskDetails.setRelationId(info.getId());
        hollowGlassOutRelationTaskDetailsService.save(taskDetails);
        // 查询出需要出玻璃的队列
        List<HollowBigStorageCageDetails> hollowBigStorageCageDetailsList = hollowBigStorageCageDetailsService
                .queryOutGlassList(request.getFlowCardId(), request.getCell());

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationTaskDetailsServiceImpl.java

File was deleted