1、 查询是否除膜优化:由单选改为复选框选择

zhoushihao

3 天以前 c55387f287690dd3335e56d7749195d361803628

1、 查询是否除膜优化:由单选改为复选框选择

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

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @Author : zhoush
 * @Date: 2024/12/26 20:40
@@ -21,8 +23,8 @@
    private int totalPairQuantity;
    @ApiModelProperty(value = "配方id")
    private Long formulaId;
    @ApiModelProperty(value = "除膜膜系")
    private String filmRemove;
    @ApiModelProperty(value = "除膜膜系列表")
    private List<String> filmRemoveList;


}

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

@@ -389,7 +389,9 @@
            info.setState(Const.HOLLOW_FLOW_CARD_NEW);
            info.setTotalPairQuantity(request.getTotalPairQuantity());
            info.setFormulaId(request.getFormulaId());
            info.setFilmRemove(request.getFilmRemove());
            if (CollectionUtil.isNotEmpty(request.getFilmRemoveList())){
                info.setFilmRemove(String.join(",", request.getFilmRemoveList()));
            }
            this.save(info);
            // 查询出需要出玻璃的队列
            List<Integer> layerList = new ArrayList<>();

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowFormulaDetailsMapper.xml

@@ -17,7 +17,7 @@
        t3.formula_name,
        case
        when t3.film_remove = 0 then 0
        when  t2.filmsid = t.film_remove then 1
        when  t.film_remove like concat('%', t2.filmsid, '%') then 1
        else 0 end as film_remove,
        t3.top_remove,
        t3.bottom_remove,