#入库流程回调参数修改

zyx

2024-01-31 5b6fb24f831898d0534a67a54f273f7b89683d73

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -12,7 +12,7 @@
import com.zy.asrs.entity.ToWmsDTO;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.StaDescService;
@@ -31,7 +31,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;

@@ -53,13 +52,14 @@
    @Value("${wms.url}")
    private String wmsUrl;
    public ArrayList<String> wharfCode1 = new ArrayList<String>(){{
        add("J-1101"); add("J-1103"); add("J-1105"); add("J-1107"); add("J-1109"); add("J-1111");
        add("J-1101"); add("J-1103"); add("J-1105"); add("J-1107"); add("J-1109"); add("J-1111");add("H-1101");
        add("G-1101");
    }};



    @Override
    public void taskCreate(taskCreateParam param) {
    public R taskCreate(TaskCreateParam param) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
        if (taskWrk != null) {
            throw new CoolException(param.getTaskNo() + "任务已存在，请勿重复提交");
@@ -79,25 +79,36 @@
        taskWrk.setCrnNo(param.getCrn());
        if(param.getIoType() == 1){
            taskWrk.setWrkSts(1);
            if (!Cools.isEmpty(param.getTargetPoint())) {
                taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//终点
                taskWrk.setOriginTargetPoint(param.getTargetPoint());
            }

        } else if (param.getIoType() == 2) {
            taskWrk.setWrkSts(11);
            if (!Cools.isEmpty(param.getStartPoint())) {
                taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//起点
                taskWrk.setOriginStartPoint(param.getStartPoint());
            }
            taskWrk.setTargetPoint(param.getTargetPoint());
        }else if (param.getIoType() == 3){
            taskWrk.setWrkSts(11);
            if (!Cools.isEmpty(param.getStartPoint())) {
                taskWrk.setStartPoint(param.getStartPoint());//起点
                taskWrk.setOriginStartPoint(param.getStartPoint());
            }
        }

        if (!Cools.isEmpty(param.getStartPoint())) {
            taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//起点
            taskWrk.setOriginStartPoint(param.getStartPoint());
        }
        if (!Cools.isEmpty(param.getTargetPoint())) {
            taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//终点
            taskWrk.setOriginTargetPoint(param.getTargetPoint());
        }


        if (!Cools.isEmpty(param.getMemo())) {
            taskWrk.setMemo(param.getMemo());//备注
        }

        if (!taskWrkService.insert(taskWrk)) {
            throw new CoolException("生成任务失败，请联系管理员");
            return R.error("创建任务失败");
        }
        return R.ok();
    }

    @Override
@@ -138,7 +149,7 @@
                ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                ,null
                ,"127.0.0.1"
                ,JSON.toJSONString(param)
                ,JSON.toJSONString(toWmsDTO)
                ,response
                ,true
        );
@@ -150,7 +161,7 @@
            WMSAndAGVInterfaceParam data = JSONObject.parseObject(jsonObject.get("data").toString(), WMSAndAGVInterfaceParam.class);
            String msg = null;
            try {
                taskCreate(new taskCreateParam(data));
                taskCreate(new TaskCreateParam(data));
            }catch (Exception e){
                msg = e.getMessage();
            }
@@ -163,15 +174,22 @@
                staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("crn_no",data.getTaskTunnel())
                        .eq("type_no",1)
                        .lt("crn_stn",200));
                        .lt("stn_no",200));
            }else if (param.getWharfSource().contains("H")){
                staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("crn_no",data.getTaskTunnel())
                        .eq("type_no",1)
                        .lt("stn_no",400)
                        .gt("stn_no",200));
            }else {
                staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("crn_no",data.getTaskTunnel())
                        .eq("type_no",1)
                        .ge("crn_stn",200));
                        .lt("stn_no",500)
                        .ge("stn_no",400));
            }
            //map1.put("taskTunnel", staDesc.getStnDesc());
            map1.put("taskTunnel", "J-1104");
            map1.put("taskTunnel", staDesc.getStnDesc());
            //map1.put("taskTunnel", "J-1104");
            return R.ok(map1);
        }
        return R.error((String) jsonObject.get("msg"));
@@ -179,14 +197,6 @@

    @Override
    public void getAgvTaskOver(TaskOverParam param) {
//        Map<String,Integer> map = new HashMap<>();
//        put("J-1101",102);put("J-1102",101);
//        put("J-1103",106);put("J-1104",105);
//        put("J-1105",110);put("J-1106",109);
//        put("J-1107",114);put("J-1108",113);
//        put("J-1109",118);put("J-1110",117);
//        put("J-1111",122);put("J-1112",121);
//        put("H-1101",305);put("H-1102",300);
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
@@ -203,14 +213,22 @@
                staProtocol = staProtocol.clone();
            }
            Short workNo = staProtocol.getWorkNo();
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                if (inSta.getBackSta().equals(staDesc.getStnNo())){
                    if (wharfCode1.contains(param.getWharfCode())){
                        if (!staProtocol.isLoading() && !staProtocol.isCar()){
                            //AGV出库完成以后
                        }
            if (wharfCode1.contains(param.getWharfCode())){
                if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() >0){
                    //AGV出库完成以后
                    staProtocol.setWorkNo((short) 0);
                    staProtocol.setStaNo((short)0);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                    if (result) {

                    }else {
                    } else {
                        throw new RuntimeException("agv返回完成后，命令下发失败");
                    }
                }
            }else {
                for (DevpSlave.Sta inSta : devp.getInSta()) {
                    if (inSta.getBackSta().equals(staDesc.getStnNo())){

                        if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
                            //AGV入库完成以后
                            staProtocol.setWorkNo((short) 9999);
@@ -222,12 +240,10 @@
                                throw new RuntimeException("agv返回完成后，命令下发失败");
                            }
                        }

                    }
                }
            }



        }

    }