第三版

zwl

1 天以前 757f103f37d83dfb55bb49b3df0b805cb520d4f7

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

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.LocMast;
import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.asrs.service.impl.WrkMastServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -36,6 +39,8 @@
    private OpenService openService;
    @Autowired
    private LocMastServiceImpl locMastService;
    @Autowired
    private WrkMastServiceImpl wrkMastService;

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -243,13 +248,127 @@
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", param.getChannel()));
        Integer channel = 0;
        if(param.getGroup().equals("192.168.1.101")){
            switch (param.getChannel()){
                case 1: channel = 24;
                break;
                case 2: channel = 23;
                break;
                case 3: channel = 22;
                break;
                case 4: channel = 21;
                break;
            }
        }else if(param.getGroup().equals("192.168.1.102")){
            switch (param.getChannel()){
                case 1: channel = 20;
                break;
                case 2: channel = 19;
                break;
                case 3: channel = 18;
                break;
                case 4: channel = 17;
                break;
            }
        }else if(param.getGroup().equals("192.168.1.103")){
            switch (param.getChannel()){
                case 1: channel = 16;
                    break;
                case 2: channel = 15;
                    break;
                case 3: channel = 14;
                    break;
                case 4: channel = 13;
                    break;
            }
        }else if(param.getGroup().equals("192.168.1.104")){
            switch (param.getChannel()){
                case 1: channel = 1;
                    break;
                case 2: channel = 2;
                    break;
                case 3: channel = 3;
                    break;
                case 4: channel = 4;
                    break;
            }
        }else if(param.getGroup().equals("192.168.1.105")){
            switch (param.getChannel()){
                case 1: channel = 5;
                    break;
                case 2: channel = 6;
                    break;
                case 3: channel = 7;
                    break;
                case 4: channel = 8;
                    break;
            }
        }else if(param.getGroup().equals("192.168.1.106")){
            switch (param.getChannel()){
                case 1: channel = 9;
                    break;
                case 2: channel = 10;
                    break;
                case 3: channel = 11;
                    break;
                case 4: channel = 12;
                    break;
            }
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("channel", channel)
                .eq("loc_sts","F"));
        if (Cools.isEmpty(locMast)) {
            return R.error("没有找到该通道----"+param.getChannel());
            return R.error("没有找到该通道----"+channel);
        }
//        产品状态{0:无,1:待测,2:测试中;3.测试完成;4.测试失败;5.静置中;6:静置完成;7:暂停测试;8:紧急出库;}
        locMast.setPackStatus(param.getPackSts());
        locMast.setPackStatus(param.getStatus());
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);
        return R.ok();
    }

    /**
     * 获取agv状态
     * @param param
     * @return
     * 0：已验证 1：等待分配 2：已分配 3：取货中 4：已取
     * 货 5：放货中 6：已放货 7：完成 8.任务失败 9.任务取消 10.任务异常
     * 只接受7.完成的任务状态
     * 9.任务取消重新发送移动任务
     */
    @PostMapping("/rbrainrobot/post_task_state")
//    @AppAuth(memo = "PACK信息下发")
    public synchronized R postTaskState(@RequestBody(required = false) RCSTaskStatusParam param) {
        log.info("AGV任务反馈={}",param);
        if(Cools.isEmpty(param.getData().getTask_id())) {
            return R.error("RCS任务号不能为空");
        }
        if(Cools.isEmpty(param.getData().getTask_state())) {
            return R.error("RCS工作状态不能为空");
        }
        //任务完成更新补空板完成任务
        //任务完成更新出库完成任务
        if(param.getData().getTask_state()==7) {
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("packed", param.getData().getTask_id()));

            if(Cools.isEmpty(wrkMast)) {
                return R.ok();
            }

            if(wrkMast.getIoType()==110) {
                wrkMast.setWrkSts(15L);//出库任务转历史档
                wrkMastService.updateById(wrkMast);
            }else if(wrkMast.getIoType()==101) {
                wrkMast.setWrkSts(34L);//AGV搬运空托盘回库完成,等待空板入库后转历史档、
                wrkMastService.updateById(wrkMast);
            }

        }else if (param.getData().getTask_state()==9){

        }

        return R.ok();
    }