Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

1 天以前 52ef10033d82393443d8b73faa88a863834a4c8f

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

@@ -1,10 +1,12 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -16,6 +18,8 @@
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +62,12 @@
    private BasArmMastService basArmMastService;
    @Autowired
    private BasArmMastSignService basArmMastSignService;
    @Autowired
    private BasAgvMastService basAgvMastService;
    @Autowired
    private LocOwnerService locOwnerService;
    @Autowired
    private CommonService commonService;

    @Override
    @Transactional
@@ -68,6 +78,12 @@
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        Date now = new Date();
        LocOwner locOwner = null;
        if (!Cools.isEmpty(param.getOwnerId())) {
            locOwner = locOwnerService.selectById(param.getOwnerId());
        } else {
            locOwner = locOwnerService.selectById(1);
        }
        // 单据主档
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
@@ -75,12 +91,12 @@
                DateUtils.convert(now),    // 单据日期
                docType.getDocId(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getStandby1(),    //项目名称 客户PO号
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                locOwner.getOwner(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -136,6 +152,9 @@
            orderDetl.setStandby1(detlDto.getStandby1());
            orderDetl.setStandby2(detlDto.getStandby2());
            orderDetl.setStandby3(detlDto.getStandby3());
            orderDetl.setBoxType1(detlDto.getBoxType1());
            orderDetl.setBoxType2(detlDto.getBoxType2());
            orderDetl.setBoxType3(detlDto.getBoxType3());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
@@ -228,6 +247,12 @@
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        Date now = new Date();
        LocOwner locOwner = null;
        if (!Cools.isEmpty(param.getOwnerId())) {
            locOwner = locOwnerService.selectById(param.getOwnerId());
        } else {
            locOwner = locOwnerService.selectById(1);
        }
        // 单据主档
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
@@ -235,12 +260,12 @@
                DateUtils.convert(now),    // 单据日期
                docType.getDocId(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getStandby1(),    //项目名称 客户PO号
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                locOwner.getOwner(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -298,6 +323,9 @@
            orderDetl.setStandby1(detlDto.getStandby1());
            orderDetl.setStandby2(detlDto.getStandby2());
            orderDetl.setStandby3(detlDto.getStandby3());
            orderDetl.setBoxType1(detlDto.getBoxType1());
            orderDetl.setBoxType2(detlDto.getBoxType2());
            orderDetl.setBoxType3(detlDto.getBoxType3());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
@@ -620,7 +648,7 @@
        if (Cools.isEmpty(basArmMastOld)){
            basArmMastService.insert(basArmMast);
        } else {
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
            throw new CoolException("等待前边货物抓取！！！"+ JSON.toJSONString(param));
        }
    }

@@ -629,12 +657,42 @@
    public void taskArmCycleResult(TaskArmCycleResultParam param) {
        BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
                .eq("arm_no", param.getArm_no())
                .eq("sta_no", Integer.parseInt(param.getStaNo()))
                .eq("sorting_line", Integer.parseInt(param.getStaNo()))
                .eq("status", 1)
        );
        if (Cools.isEmpty(basArm)){
            throw new CoolException("机械臂配置异常，查询不到机械臂数据！！！"+ JSON.toJSONString(param));
        }

        try{
            BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
                    new EntityWrapper<BasArmMastSign>()
                            .eq("matnr", param.getMatnr())
                            .eq("order_no", param.getOrderNo())
                            .eq("create_time", param.getBindingTags())
            );
            if (!Cools.isEmpty(basArmMastSign)){
                basArmMastSign.setStatus(1);
                basArmMastSignService.updateById(basArmMastSign);
            }
        } catch (Exception e){
        }

        BasArmMast basArmMastListError = basArmMastService.selectOne(
                new EntityWrapper<BasArmMast>()
                        .eq("sorting_line", basArm.getSortingLineSou())
                        .eq("arm_no", param.getArm_no())
                        .eq("status", 9)
        );
        if (!Cools.isEmpty(basArmMastListError)){
            if (Integer.parseInt(param.getPick_num()) ==1){
                basArmMastListError.setStatus(2);
                basArmMastService.updateById(basArmMastListError);
            }
            return;
        }


        BasArmMast basArmMast = basArmMastService.selectOne(
                new EntityWrapper<BasArmMast>()
                        .eq("sorting_line", basArm.getSortingLineSou())
@@ -644,9 +702,13 @@
        if (Cools.isEmpty(basArmMast)){
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }

        basArmMast.setStatus(2);
        basArmMastService.updateById(basArmMast);
        if (Integer.parseInt(param.getPick_num()) !=1){
            basArmMast.setStatus(9);
            basArmMastService.updateById(basArmMast);
        } else {
            basArmMast.setStatus(2);
            basArmMastService.updateById(basArmMast);
        }
    }

    @Override
@@ -677,7 +739,7 @@
    public void taskArmWorkOrderStatus(OrderArmEndParam param) {
        BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
                .eq("arm_no", param.getArm_no())
                .eq("sta_no", Integer.parseInt(param.getStaNo()))
                .eq("sorting_line", Integer.parseInt(param.getStaNo()))
                .eq("status", 1)
        );
        if (Cools.isEmpty(basArm)){
@@ -697,20 +759,10 @@
    @Override
    @Transactional
    public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
        BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
                new EntityWrapper<BasArmMastSign>()
                        .eq("matnr", param.getSku())
                        .eq("order_no", param.getOrderNo())
        );
        if (Cools.isEmpty(basArmMastSign)){
//            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
            return false;
        }
        BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
                new EntityWrapper<BasArmMastSign>()
                        .eq("matnr", param.getSku())
                        .eq("order_no", param.getOrderNo())
                        .eq("create_time", basArmMastSign.getCreateTime())
                        .eq("create_time", param.getBindingTags())
                        .eq("status", 0)
        );
        if (Cools.isEmpty(basArmMastSignNew)){
@@ -719,4 +771,138 @@
        return true;
    }

    @Override
    @Transactional
    public boolean TaskAgvReport(TaskAgvReportParam param) {
        BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", param.getTaskNo()));
        if (Cools.isEmpty(basAgvMast)){
            return false;
        }
        basAgvMast.setStatus(2);
        basAgvMastService.updateById(basAgvMast);
        return true;
    }

    @Override
    @Transactional
    public boolean taskAgvCreate(TaskAgvCreateParam param) {
        // 参数检查
        if (param == null) {
            throw new CoolException("参数不能为空");
        }
        Integer devpId = 1;
        // 创建对象（构造函数中已生成 timestamp）
        BasAgvMast basAgvMast = new BasAgvMast();
        // 生成 WMS 任务号（如无外部传入，可以使用雪花ID 或自增）
        basAgvMast.setTaskNo(commonService.getWorkNo(0));
        // 赋值参数
        basAgvMast.setSourceStaNo(param.getSourceStaNo());
        basAgvMast.setStaNo(param.getStaNo());
        basAgvMast.setSourceLocNo(param.getSourceLocNo());
        basAgvMast.setLocNo(param.getLocNo());
        // 默认值
        basAgvMast.setPriority(1L);          // 默认优先级
        basAgvMast.setStatus(0);             // 初始状态
        basAgvMast.setAppeTime(new Date());  // 添加时间
        basAgvMast.setModiTime(new Date());  // 修改时间
        basAgvMast.setIoType(param.getIoType());// 任务类型
        basAgvMast.setDevpId(devpId);

        // 插入数据库
        basAgvMastService.insert(basAgvMast);

        return true;
    }

    @Override
    @Transactional
    public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param){

        if (param == null || Cools.isEmpty(param.getLocNoList())) {
            throw new CoolException("库位号不能为空");
        }

        List<String> locNos = param.getLocNoList();

        List<AgvLocListDetlParam> result = new ArrayList<>();

        for (String locNo : locNos) {

            // 查询该库位 detail
            List<LocDetl> detlList = locDetlService.selectList(
                    new EntityWrapper<LocDetl>().eq("loc_no", locNo)
            );

            AgvLocListDetlParam dto = new AgvLocListDetlParam();
            dto.setLocNo(locNo);
            dto.setAgvDetlList(detlList);
            result.add(dto);
        }

        return result;
    }


    @Override
    @Transactional
    public boolean bindCtnrAndBin(bindCtnrAndBinParam param) {
        // 参数检查
        if (param == null) {
            throw new CoolException("参数不能为空");
        }
        AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
        BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
        BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
        BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
        agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
        agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
        agvBindCtnrAndBinParam.setCtnrTyp("1");
        agvBindCtnrAndBinParam.setPositionCode(
                basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null
                        ? basAgvLocNoSou.getAgvLocNo()
                        : ""
        );
        agvBindCtnrAndBinParam.setStgBinCode(
                basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null
                        ? basAgvLocNoEnd.getAgvLocNo()
                        : ""
        );
        agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
        try {
            String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV接口地址
            String mesPath = "bindCtnrAndBin"; // 接口路径
            String response = "";
            boolean success = false;

            try {
                log.info("AGV绑定容器接口请求参数: {}", JSON.toJSONString(agvBindCtnrAndBinParam));

                response = new HttpHandler.Builder()
                        .setUri(URL)
                        .setPath(mesPath)
                        .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
                        .build()
                        .doPost();

                log.info("AGV绑定容器接口响应: {}", response);
                JSONObject jsonObject = JSON.parseObject(response);

                if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
                    success = true;
                } else {
                    log.error("AGV绑定容器失败！！！url：{}；request：{}；response：{}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
                    throw new CoolException("AGV绑定容器失败: " + jsonObject.getString("msg"));
                }
            } catch (Exception e) {
                log.error("AGV绑定容器接口调用异常！！！url：{}；request：{}；response：{}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
                throw new CoolException("AGV绑定容器接口调用异常: " + e.getMessage());
            }
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
        return true;
    }



}