修改钢化实体类，修改指定钢化接口

ZengTao

2024-07-19 05086c2aa9d05e123a86cabedae3a4d80a3bdb32

修改钢化实体类，修改指定钢化接口

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java

@@ -104,20 +104,8 @@
    private Integer state;

    /**
     * 格子
     */
    @ApiModelProperty(value = "格子", position = 17)
    private Integer slot;

    /**
     * 钢化类型
     */
    @ApiModelProperty(value = "钢化类型", position = 17)
    private Integer temperingType;

    /**
     * 工程id
     */
    @ApiModelProperty(value = "工程id", position = 17)
    private Integer engineerId;
    private String engineerId;
}

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java

@@ -78,8 +78,8 @@

    @ApiOperation("指定钢化")
    @PostMapping("/TemperingGlass")
    public Result TemperingGlass(@RequestBody String temperingLayoutId,@RequestBody String engineerId) {
        boolean result=bigStorageCageDetailsService.TemperingGlass(temperingLayoutId,engineerId);
    public Result TemperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
        boolean result=bigStorageCageDetailsService.TemperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(),bigStorageCageDetails.getEngineerId());
        if(result==true){
            return Result.build(200,"指定钢化成功",1);
        }else {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java

@@ -360,7 +360,7 @@
            LambdaQueryWrapper<BigStorageCageDetails> wrapper =new LambdaQueryWrapper<>();
            wrapper.eq(BigStorageCageDetails::getTemperingLayoutId,temperingLayoutId)
                    .eq(BigStorageCageDetails::getEngineerId,engineerId)
                    .in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL,Const.GLASS_STATE_OUT_ING);
                    .in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL);
            List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper);

            for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList