#

1

2025-05-11 7993b50ce6d99ba6abc6f979b3fece2490795fde

#

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

@@ -54,10 +54,10 @@
@RestController
public class CrnController {

    @Value("${wms.url}")
    private String wmsUrl;
    @Value("${wms.movePath}")
    private String movePath;
//    @Value("${wms.url}")
//    private String wmsUrl;
//    @Value("${wms.movePath}")
//    private String movePath;




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

@@ -491,6 +491,7 @@
        auth(appkey, "设备状态查询接口", request);
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        List<Object> list = new ArrayList<>();
        WcsStatusResponseModel wcsStatusResponseModel = new WcsStatusResponseModel();
        for (BasDevp basDevp:basDevps){
            BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
            basDevpWmsParam.setDevNo(basDevp.getDevNo());
@@ -501,7 +502,8 @@
            basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
            basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
            basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
            list.add(basDevpWmsParam);
//            list.add(basDevpWmsParam);
            wcsStatusResponseModel.getChainList().add(basDevpWmsParam);
        }
        List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
        for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -518,7 +520,6 @@
            basCrnpWmsParam.sync(basCrnp);

            basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
            basCrnpWmsParamList.add(basCrnpWmsParam);

            try{
                BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
@@ -526,9 +527,11 @@
            } catch (Exception e){
                basCrnpWmsParam.setCrnErrM("未知异常");
            }
            basCrnpWmsParamList.add(basCrnpWmsParam);

            list.add(basCrnpWmsParam);
//            list.add(basCrnpWmsParam);
        }
        wcsStatusResponseModel.setPilingCarList(basCrnpWmsParamList);
        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
            RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
            if (Cools.isEmpty(rgvStatus)){
@@ -547,13 +550,15 @@
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            }
            list.add(basRgvWmsParam);
//            list.add(basRgvWmsParam);
            wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);

        }
//        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
//        for (BasCrnp basCrnp:basCrnps){
//            list.add(basCrnp);
//        }
        return R.ok(list);
        return R.ok(wcsStatusResponseModel);
    }



 src/main/java/com/zy/asrs/entity/param/WcsStatusResponseModel.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.entity.param;
import lombok.Data;

import java.util.ArrayList;
import java.util.List;

@Data
public class WcsStatusResponseModel {
    private List<BasDevpWmsParam> chainList = new ArrayList<>();
    private List<BasCrnpWmsParam> pilingCarList = new ArrayList<>();
    private List<BasRgvWmsParam> rgvList = new ArrayList<>();
}

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

@@ -463,7 +463,7 @@
                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing() && staProtocol.isLoading()
//                            && staProtocol.isInEnable()
                            && (workNo == 0 || (workNo>9000 && workNo<10000))
//                            && (workNo == 0 || (workNo>9000 && workNo<10000))
                            && staProtocol.isPakMkWalk()
                    ) {
                        if (inSta.isBarcodeSign()){
@@ -1372,6 +1372,32 @@
        }
        return true;
    }
    public boolean rgvOtherIDLE(RgvSlave slave) {
        RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());

        if (rgvProtocol == null || rgvTaskProtocol == null) {
            return false;
        }
        if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1
                || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
            return false;
        }
        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
        RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());

        if (rgvProtocolOther == null) {
            return true;
        }
        if (rgvProtocolOther.statusEnable) {
            if (rgvProtocolOther.getModeType().equals(RgvModeType.AUTO)
                    && rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)
                    && rgvProtocolOther.getLoaded()==0) {
                return false;
            }
        }
        return true;
    }

    public TaskWrk deviceDetection(RgvSlave.RgvStn inSta) {

@@ -1482,6 +1508,12 @@
                            }
                        }

                        if (!sign){
                            if (!rgvOtherIDLE(rgvSlave)){
                                sign=true;
                            }
                        }

                        if (!sign) {
                            for (Integer staNoNow : rangeList) {
                                for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {

 src/main/resources/application.yml

@@ -12,7 +12,8 @@
#    username: sa
#    password: sa@123
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://10.10.10.201:5236/SOURCE
#    url: jdbc:dm://10.10.10.201:5236/SOURCE
    url: jdbc:dm://127.0.0.1:5236/SOURCE
    username: SYSDBA
    password: Zy@12345
  mvc:
@@ -73,6 +74,7 @@
  # 任务状态反馈接口
  taskStatusFeedbackPath: external/wcs/taskStatusFeedback
  # 货位状态更新接口
  locationUpdatePath: api/InterFace/get_InterFace_TestStorage
#  locationUpdatePath: api/InterFace/get_InterFace_TestStorage
  # 移库申请接口
  movePath: api/InterFace/get_InterFace_TestStorage
#  movePath: api/InterFace/get_InterFace_TestStorage
  wmsHeartBeat: external/wcs/wmsHeartBeat