#

LSH

2023-02-17 bc4c8388086c61d6515ea58d932a0a72a958ade9

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

@@ -34,9 +34,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.MelsecCrnThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -269,7 +267,8 @@
        CrnDetailVo vo = new CrnDetailVo();
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                SiemensCrnThread crnThread=(SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
//                MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                vo.setCrnNo(crnNo);
                vo.setWorkNo(crnProtocol.getTaskNo());
@@ -321,6 +320,18 @@
        }
        return R.error();
    }
    @PostMapping("/loc/detail2")
    @ManagerAuth(memo = "0101804库位数据详情")
    public R locDetail2(@RequestParam String locNo) {
        if (Cools.isEmpty(locNo)) {
            return R.parse(CodeRes.EMPTY);
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
        LocDetailVo vo = new LocDetailVo();
        vo.setChannel(locMast.getChannel());
        vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
        return R.ok().add(vo);
    }

    @Deprecated
    @PostMapping("/site/update")