联调

dubin

2025-08-29 c597dc478f7227641583954211b6c78acad9c73c

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

@@ -8,37 +8,36 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.RgvThread2;
import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.*;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -66,6 +65,12 @@
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private BasRgvService basRgvService;
    @Autowired
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private LocMastService locMastService;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -90,6 +95,64 @@
        Thread.sleep(200L);
        SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
    }

    @PostMapping("/site/pickIn")
//    @ManagerAuth(memo = "盘点再入库")
    public R sitePickIn(@RequestParam Integer siteId, @RequestParam Integer workNo) throws InterruptedException {
        for (DevpSlave devp : slaveProperties.getDevp()) {
            for (DevpSlave.Sta inSta : devp.getPickSta()) {
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }
                //盘点入库修改工作档状态
                WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                if (wrkMast == null) {
                    // 无拣料数据
                    continue;
                }
                if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作明细档历史档失败");
                }
                // 保存工作主档历史档
                if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作主档历史档失败");
                }
                Date now = new Date();
                wrkMast.setIoTime(now);
                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                wrkMast.setStaNo(105); // 目标站
                wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                wrkMast.setSourceLocNo(""); // 源库位清空
                wrkMast.setModiTime(now);
                if (wrkMastMapper.updateById(wrkMast) == 0) {
                    throw new CoolException("更新工作档数据状态失败");
                }
                // 更新明细档io_time (历史档关联使用）
                wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
                // 修改库位状态 Q.拣料/盘点/并板再入库
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                locMast.setLocSts("Q");
                locMast.setModiTime(new Date());
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("修改库位状态失败");
                }
                staProtocol.setWorkNo(workNo);
                staProtocol.setSiteId(siteId);
//                staProtocol.setStaNo((short) 999);
                staProtocol.setStaNo((short)105);//余姚锐麒盘点后目标站105
                if(MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol))){
                    return R.ok();
                }
            }
        }
        return R.error("入库失败，请检查站点以及工作档信息");
    }

    /****************************************************************/
@@ -149,6 +212,12 @@
            /**
             * 堆垛机状态判断
             */
            if(crnProtocol.getAlarm() == 10){
                crnProtocol.setAlarm((short) 0);
            }
            if(crnProtocol.getAlarm() == 6){
                crnProtocol.setAlarm((short) 0);
            }
            if (crnProtocol.getAlarm() > 0) {
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {