#

zjj

2023-12-24 35a949829185f9f204cd83c84e8fbc298af3016a

#

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

@@ -210,6 +210,12 @@
//                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
//                            }
                            log.error(barcode + "托盘识别异常，请先进行组托！");
                            // led 异常显示
                            ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                            if (ledThread != null) {
                                String errorMsg = barcode + "托盘识别异常，请先进行组托！";
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        } else {
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        }
@@ -841,7 +847,7 @@
                            log.error("{}任务出库失败，浅库位堵塞！浅库位号:{}", wrkMast.getWrkNo(), shallowLocNo);
                            continue;
                        } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
                            if (null != waitWrkMast && (waitWrkMast.getWrkSts() == 4 || waitWrkMast.getWrkSts() == 5)) {
                                continue;
                            }
@@ -2227,40 +2233,61 @@

                // 站点条件判断
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                        && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() >= 9990
                        && staProtocol.getWorkNo() <= 9999)) {
                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                        && staProtocol.isEmptyInPalletRequire() && staProtocol.getWorkNo() == 0) {
                    List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("type_no", 10).eq("stn_no", sta.getStaNo()));
                    for (StaDesc staDesc:staDescs){

                        SearchLocParam param = new SearchLocParam();
                        param.setIoType(10);
                        param.setSourceStaNo(sta.getStaNo());
                        param.setLocType1(locTypeDto.getLocType1());
                        String response = new HttpHandler.Builder()
                                .setUri(wmsUrl)
                                .setPath("/rpc/pakin/loc/v1")
                                .setJson(JSON.toJSONString(param))
                                .build()
                                .doPost();
                        JSONObject jsonObject = JSON.parseObject(response);
                        if (jsonObject.getInteger("code").equals(200)) {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", staDesc.getCrnStn()));

                        if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")
                                && basDevp.getWrkNo() == 0 && basDevp.getCanining().equals("Y")){
                            // 更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            staProtocol.setWorkNo((short) 9997);
//                            staProtocol.setStaNo(basDevp.getDevNo().shortValue());
                            staProtocol.setStaNo((short) 1013);
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
                            }
                        } else {
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                            return;
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

                    }


//                    try {
//                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
//
//                        SearchLocParam param = new SearchLocParam();
//                        param.setIoType(10);
//                        param.setSourceStaNo(sta.getStaNo());
//                        param.setLocType1(locTypeDto.getLocType1());
//                        String response = new HttpHandler.Builder()
//                                .setUri(wmsUrl)
//                                .setPath("/rpc/pakin/loc/v1")
//                                .setJson(JSON.toJSONString(param))
//                                .build()
//                                .doPost();
//                        JSONObject jsonObject = JSON.parseObject(response);
//                        if (jsonObject.getInteger("code").equals(200)) {
//                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
//
//                            // 更新站点信息 且 下发plc命令
//                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
//                            staProtocol.setStaNo(dto.getStaNo().shortValue());
//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
//                            boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
//                            if (!result) {
//                                throw new CoolException("更新plc站点信息失败");
//                            }
//                        } else {
//                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
//                        }
//                    } catch (Exception e) {
//                        e.printStackTrace();
//                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                    }
                }
            }
        }
@@ -2282,17 +2309,23 @@

                if (staProtocol.isAutoing()  //自动
                        && !staProtocol.isLoading()  //无物
                        && staProtocol.isOutEnable()  //空托盘需求信号
                        && staProtocol.isEmptyMk()
                        && staProtocol.isEmptyOutPalletRequire()  //空托盘需求信号
//                        && staProtocol.isEmptyMk()
                        && staProtocol.getWorkNo() == 0
                ) {
                    WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(sta.getStaNo());
                    if (null != pakoutEmpty) {
                        return;
                    }
                    List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("stn_no", sta.getStaNo()));
                    for (StaDesc staDesc: staDescs){
                        BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", staDesc.getCrnNo()));
                        if (!basCrnp.getCrnSts().equals(3) || basCrnp.getCrnErr() != 0){
                            continue;
                        }
                    try {
                        HashMap<String, Object> map = new HashMap<>();
                        map.put("staNo", sta.getStaNo());//目标站
                            map.put("crnNo", staDesc.getCrnNo());//目标站
                        String response = new HttpHandler.Builder()
                                .setUri(wmsUrl)
                                .setParams(map)
@@ -2303,6 +2336,7 @@
                        if (jsonObject.getInteger("code").equals(200)) {
                            JSONObject data = (JSONObject) jsonObject.get("data");
                            log.info((String) data.get("msg"));
                                return;
                        } else {
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/auto/emptyOut/v1","", response);
                        }
@@ -2311,6 +2345,8 @@
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    }
                }

                }
            }

        }

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -56,7 +56,8 @@
    private boolean pakMk = true;

    //空托盘需求信号
    private boolean emptyPalletRequire;
    private boolean emptyOutPalletRequire;
    private boolean emptyInPalletRequire;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -288,7 +288,8 @@
                staProtocol.setFullPlt(status[5]);  // 满托盘
                staProtocol.setHigh(status[6]);     // 高库位
                staProtocol.setLow(status[7]);      // 低库位
                staProtocol.setEmptyPalletRequire(status[8]);      // 空托盘需求信号
                staProtocol.setEmptyOutPalletRequire(status[8]);      // 空托盘可出需求信号
                staProtocol.setEmptyInPalletRequire(status[9]);      // 空托盘可入需求信号

                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                    staProtocol.setPakMk(true);

 src/main/resources/application.yml

@@ -151,6 +151,12 @@
      barcode: ${wcs-slave.barcode[2].id}
      backSta: 3012
      led: ${wcs-slave.led[5].id}
    outSta[0]:
      staNo: 1006
      led: ${wcs-slave.led[1].id}
    outSta[1]:
      staNo: 1010
      led: ${wcs-slave.led[2].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 1002
@@ -266,7 +272,7 @@
    ip: 10.10.10.205
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1003
    staArr: 1002
  # LED2
  led[1]:
    id: 2
@@ -287,7 +293,7 @@
    ip: 10.10.10.206
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1013
    staArr: 4
  # LED5
  led[4]:
    id: 5