#

yxFwq

2024-07-29 33cb8b070c31a96bc514d07e3d1d9f6514a057d9

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

@@ -1,15 +1,23 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasJar;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.entity.result.LocDetlMesVo;
import com.zy.asrs.entity.vo.JarStateTableVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.model.enums.JarStatusType;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -32,6 +40,14 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private BasJarService basJarService;
    @Autowired
    private LocDetlService locDetlService;

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -291,7 +307,7 @@
     * 亳州煜星任务下发  //  小料箱投料完成组托
     */
    @PostMapping("/small/containers/auth/v1")
    @AppAuth(memo = "小料箱投料完成组托")
    @AppAuth(memo = "MES任务下发")
    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
                                          @RequestBody SmallCompleteParam param,
                                          HttpServletRequest request) {
@@ -326,6 +342,61 @@
//        return R.ok();
//    }

    //设备状态查询接口
    @PostMapping("/deviceStatus")
    @AppAuth(memo = "设备状态查询接口")
    @Transactional
    public R deviceStatus(@RequestHeader String appkey,
                          HttpServletRequest request) {
        auth(appkey, "设备状态查询接口", request);
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        List<Object> list = new ArrayList<>();
        for (BasDevp basDevp:basDevps){
            list.add(basDevp);
        }
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
        for (BasCrnp basCrnp:basCrnps){
            list.add(basCrnp);
        }
        return R.ok(list);
    }

    //设备状态查询接口
    @PostMapping("/jarStatus")
    @AppAuth(memo = "硫化罐状态查询接口")
    @Transactional
    public R jarStatus(@RequestHeader String appkey,
                          HttpServletRequest request) {
        auth(appkey, "硫化罐状态查询接口", request);
        List<JarStateTableVo> list = new ArrayList<>();
        List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
        for (BasJar basJar : jars) {
            // 表格行
            JarStateTableVo vo = new JarStateTableVo();
            vo.setJarNo(basJar.getJarNo());   //  JAR号
            list.add(vo);

            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.setJarMastTableVoList(openService.getJatIdList(vo.getJarNo()));
        }
        return R.ok().add(list);
    }

    //设备状态查询接口
    @PostMapping("/mesLocStatus")
    @AppAuth(memo = "库存信息查询接口")
    @Transactional
    public R mesLocStatus(@RequestHeader String appkey,
                       HttpServletRequest request) {
        auth(appkey, "库存信息查询接口", request);
        List<LocDetlMesVo> list = locDetlService.selectLocDetlMesAll();
        return R.ok().add(list);
    }
    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

}