#

yxFwq

2024-11-24 a7f0ee46f5a1b0ec8cf7bd3d0701bde6c09de24f

 src/main/java/com/zy/asrs/controller/BasJarController.java

@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasJar;
import com.zy.asrs.entity.BasJarMast;
import com.zy.asrs.entity.vo.JarStateTableVo;
import com.zy.asrs.service.BasJarMastService;
import com.zy.asrs.service.BasJarService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -24,6 +26,8 @@

    @Autowired
    private BasJarService basJarService;
    @Autowired
    private BasJarMastService basJarMastService;

    @RequestMapping(value = "/basJar/{id}/auth")
    @ManagerAuth
@@ -77,6 +81,25 @@
        return R.ok();
    }

    @RequestMapping(value = "/basJar/update/uodate/jar/count/auth")
    @ManagerAuth(memo = "更新硫化罐最大储量")
    public R updateJarCount(Integer jarCount,Integer jarNo){
        if (jarCount > 0 && jarCount < 8 && jarNo == 0){
            return R.error("修改数量不合法");
        }
        List<BasJarMast> basJarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", jarNo));
        if (basJarMasts.size()>jarCount){
            return R.error("硫化罐当前存在储量大于修改目标储量，不允许修改！！！");
        }
        BasJar basJar = basJarService.selectById(jarNo);
        if (basJar.getJarStatus() == 2 || basJar.getJarStatus()>3){
            return R.error("硫化罐处于当前状态时，不允许修改！！！");
        }
        basJar.setJarCount(jarCount);
        basJarService.updateById(basJar);
        return R.ok();
    }

    @RequestMapping(value = "/basJar/delete/auth")
    @ManagerAuth(memo = "删除硫化罐")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
@@ -126,7 +149,7 @@


    @PostMapping("/table/jar/state")
    @ManagerAuth(memo = "RGV信息表")
//    @ManagerAuth(memo = "JAR信息表")
    public R rgvStateTable(){
        List<JarStateTableVo> list = new ArrayList<>();
        List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
@@ -136,12 +159,59 @@
            vo.setJarNo(basJar.getJarNo());   //  RGV号
            list.add(vo);

            vo.setJarMode(basJar.getJarMode() == 1?"联机":"脱机" );   //  模式状态
            vo.setJarStatus(JarStatusType.get(basJar.getJarMode()).desc);     //  状态
            vo.setJarMode(basJar.getJarMode$());   //  模式状态
            vo.setJarStatus(JarStatusType.get(basJar.getJarStatus()).desc);     //  状态
            vo.setJarNo(basJar.getJarNo());  //  工位1任务号
            vo.setRegion(basJar.getRegion());
            vo.setJarCode(basJar.getJarCode());
            vo.setJarErr(basJar.getJarErr());
            vo.setJarErr(basJar.getJarErr$());

            vo.setJarTemperature(basJar.getJarTemperature());
            vo.setJarTemperature$(basJar.getJarTemperature().toString()+"℃");
            vo.setJarPressure(basJar.getJarPressure());
            vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
            vo.setJarCount(basJar.getJarCount());//最大储量
            vo.setJarCount$(basJar.getJarCount().toString()+"托");//最大储量

            vo.setHoldingTime(DateUtils.convert(basJar.getHoldingTime()));//保温时间
            vo.setOpenTime(DateUtils.convert(basJar.getOpenTime()));//开门时间
            vo.setCloseTime(DateUtils.convert(basJar.getCloseTime()));//关门时间

            vo.setLeftDoorOpen(basJar.getLeftDoorOpen());
            vo.setLeftDoorClose(basJar.getLeftDoorClose());
            vo.setRightDoorOpen(basJar.getRightDoorOpen());
            vo.setRightDoorClose(basJar.getRightDoorClose());

            /**
             * 左门(checkBox)
             */
            vo.setLeftDoor(basJar.getLeftDoor().equals("N")? "关闭":"打开");

            /**
             * 右门(checkBox)
             */
            vo.setRightDoor(basJar.getRightDoor().equals("N")? "关闭":"打开");

            /**
             * 左门可开(checkBox)
             */
            vo.setLeftInEnable(basJar.getLeftInEnable());

            /**
             * 左门可关(checkBox)
             */
            vo.setLeftOutEnable(basJar.getLeftOutEnable());


            /**
             * 右门可开(checkBox)
             */
            vo.setRightInEnable(basJar.getRightInEnable());

            /**
             * 右门可关(checkBox)
             */
            vo.setRightOutEnable(basJar.getRightOutEnable());

        }
        return R.ok().add(list);