#

yxFwq

2024-11-28 0a7eeda078e85194992c4dbc543815ea977970a6

#

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

@@ -898,40 +898,40 @@
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
                            }
                        } else  if (jsonObject.getInteger("code").equals(700)){
                            SearchLocParam param2 = new SearchLocParam();
                            param2.setBarcode(barcode);
                            param2.setSourceStaNo(inSta.getStaNo());
                            param2.setLocType1(locTypeDto.getLocType1());
                            String response2 = new HttpHandler.Builder()
                                    .setUri(wmsUrl)
                                    .setPath("/rpc/pakin/yx/loc/v33")
                                    .setJson(JSON.toJSONString(param2))
                                    .build()
                                    .doPost();
                            JSONObject jsonObject2 = JSON.parseObject(response2);
                            if (jsonObject2.getInteger("code").equals(200)) {
                                log.info("大料箱自动组托成功！！");
//                        } else  if (jsonObject.getInteger("code").equals(700)){
//                            SearchLocParam param2 = new SearchLocParam();
//                            param2.setBarcode(barcode);
//                            param2.setSourceStaNo(inSta.getStaNo());
//                            param2.setLocType1(locTypeDto.getLocType1());
//                            String response2 = new HttpHandler.Builder()
//                                    .setUri(wmsUrl)
//                                    .setPath("/rpc/pakin/yx/loc/v33")
//                                    .setJson(JSON.toJSONString(param2))
//                                    .build()
//                                    .doPost();
//                            JSONObject jsonObject2 = JSON.parseObject(response2);
//                            if (jsonObject2.getInteger("code").equals(200)) {
//                                log.info("大料箱自动组托成功！！");
//                            } else {
//                                log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
//
//                                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
//
//                                if (ledThread != null) {
//                                    ErrMsg errMsg1 = new ErrMsg();
//                                    errMsg1.setErrMsg("入库失败!站点号："+inSta.getStaNo());
//                                    errMsg1.setArea("1");
//                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
//                                }
//                            }
                            } else {
                                log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);

                            String msg = jsonObject.getString("msg");
                                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

                                if (ledThread != null) {
                                    ErrMsg errMsg1 = new ErrMsg();
                                    errMsg1.setErrMsg("入库失败!站点号："+inSta.getStaNo());
                                    errMsg1.setArea("1");
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                                }
                            }
                        } else {
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);

                            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());

                            if (ledThread != null) {
                                ErrMsg errMsg1 = new ErrMsg();
                                errMsg1.setErrMsg("入库失败!站点号："+inSta.getStaNo());
                                errMsg1.setErrMsg("入库失败!站点号："+inSta.getStaNo()+"==》失败原因："+msg);
                                errMsg1.setArea("1");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
                            }
@@ -2183,6 +2183,7 @@
                log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNoOther());
                continue;
            }
            boolean signStanOther81 = false;
            if (staProtocolOther.getWorkNo()!=0){
                WrkMast wrkMastOther = wrkMastMapper.selectPakInStep3(staProtocolOther.getWorkNo());
                if (Cools.isEmpty(wrkMastOther)){
@@ -2284,9 +2285,12 @@
                            return;
                        }
                    }
                }
                return;
            }
                signStanOther81 = true;
                crnStation=2;
            }
            if (!signStanOther81){
            StaProtocol staProtocolOther1 = devpThread.getStation().get(crnStn.getStaNoOther1());
            if (staProtocolOther1 == null) {
                continue;
@@ -2294,7 +2298,7 @@
                staProtocolOther1 = staProtocolOther1.clone();
            }

            if (staProtocolOther1.isAutoing() && staProtocolOther1.getWorkNo()!=0){
                if (staProtocolOther1.isAutoing() || staProtocolOther1.getWorkNo()!=0){
                return;
            }

@@ -2305,8 +2309,9 @@
            } else {
                staProtocolOther2 = staProtocolOther2.clone();
            }
            if (staProtocolOther2.isAutoing() && staProtocolOther2.getWorkNo()!=0){
                if (staProtocolOther2.isAutoing() || staProtocolOther2.getWorkNo()!=0){
                return;
                }
            }
            crnStation = 2;
            // 命令下发区 --------------------------------------------------------------------------
@@ -8723,36 +8728,34 @@
            }
        }

        try{
            for (int idi = 1;idi<5;idi++){
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, idi);

                if (ledThread != null) {
                    ErrMsg errMsg1 = new ErrMsg();
                    errMsg1.setErrMsg("测试："+idi);
                    errMsg1.setArea("1");
                    MessageQueue.offer(SlaveType.Led, idi, new Task(5, errMsg1));
                } try {
                    Thread.sleep(500);
                } catch (Exception e){

                }
            }
            LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);

            if (ledThread3 != null) {
                ErrMsg errMsg1 = new ErrMsg();
                errMsg1.setErrMsg("测试测试测试测试测试测试测试测试测试测试测试测试测试："+3);
                errMsg1.setArea("1");
                MessageQueue.offer(SlaveType.Led, 3, new Task(5, errMsg1));
            } try {
                Thread.sleep(500);
            } catch (Exception e){

            }
        } catch (Exception e){

        }
//        try{
//            for (int idi = 1;idi<5;idi++){
//                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, idi);
//
//                if (ledThread != null) {
//                    ErrMsg errMsg1 = new ErrMsg();
//                    errMsg1.setErrMsg("测试："+idi);
//                    errMsg1.setArea("1");
//                    MessageQueue.offer(SlaveType.Led, idi, new Task(5, errMsg1));
//                } try {
//                    Thread.sleep(500);
//                } catch (Exception e){
//
//                }
//            }
//            LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
//
//            if (ledThread3 != null) {
//                ErrMsg errMsg1 = new ErrMsg();
//                errMsg1.setErrMsg("测试测试测试测试测试测试测试测试测试测试测试测试测试："+3);
//                errMsg1.setArea("1");
//                MessageQueue.offer(SlaveType.Led, 3, new Task(5, errMsg1));
//            } try {
//                Thread.sleep(500);
//            } catch (Exception e){
//
//            }
//        } catch (Exception e){ }


    }

 src/main/java/com/zy/core/MainProcess.java

@@ -48,7 +48,7 @@


                    // 间隔
                    Thread.sleep(200);
                    Thread.sleep(1000);

                    // 系统运行状态判断
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {

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

@@ -52,14 +52,32 @@
                        String substring = s.substring(1);
                        String s1 = new StringBuilder(substring).reverse().toString();
                        scale = Double.parseDouble(s1);//50.8    67.6
                        if (slave.getId()>3){
                        if (scale>60){
                            switch (slave.getId()){
                                case 1:
                                    scale = scale - 60;
                                    break;
                                case 2:
                                    scale = scale - 52;
                                    break;
                                case 3:
                                    scale = scale - 74.0;
                                    break;
                                case 4:
                            scale = scale - 50.8;
                        } else {
                                    break;
                                default:
                            scale = scale - 74.0;
                        }
                        }
//                        if (slave.getId()>3){
//                            scale = scale - 50.8;
//                        } else {
//                            scale = scale - 74.0;
//                        }

                        //将称重重量写入设备基础数据中的gross_wt字段
                        if(scale > 20) {
                        if(scale > 5) {
                            BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                            BasDevp basDevp = basDevpService.selectById(slave.getStaNo());
                            if(!Cools.isEmpty(basDevp)) {

 src/main/resources/application.yml

@@ -252,6 +252,8 @@
    inSingleSta[0]:
      staNo: 173
      barcode: ${wcs-slave.barcode[2].id}
      led: ${wcs-slave.led[2].id}

    # 小料箱 双工位单伸 空板入库口1
    emptyInSingleSta[0]:
      staNo: 104
@@ -268,10 +270,14 @@
    inLargeSta[0]:
      staNo: 292
      barcode: ${wcs-slave.barcode[1].id}
      led: ${wcs-slave.led[2].id}

    # 大料箱 双工位单伸 入库口1
    inLargeSta[1]:
      staNo: 281
      barcode: ${wcs-slave.barcode[0].id}
      led: ${wcs-slave.led[2].id}

    # 大料箱 双工位单伸 空板入库口1
    emptyInLargeSta[0]:
      staNo: 292
@@ -752,7 +758,7 @@
    ip: 10.10.10.222
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 281
    staArr: 222
  # LED4 密炼区
  led[3]:
    id: 4

 src/main/webapp/static/js/console.map21.js

@@ -87,7 +87,7 @@
        "width": 1117,
        "height": 22,
        "minBayNo": 2,
        "maxBayNo": 62
        "maxBayNo": 82
    }, {
        "type": "rack",
        "id": "rack10",
@@ -96,7 +96,7 @@
        "width": 1117,
        "height": 22,
        "minBayNo": 2,
        "maxBayNo": 62
        "maxBayNo": 82
    },{
        "type": "rack",
        "id": "rack11",
@@ -105,7 +105,7 @@
        "width": 1117,
        "height": 22,
        "minBayNo": 2,
        "maxBayNo": 62
        "maxBayNo": 82
    }, {
        "type": "rack",
        "id": "rack12",
@@ -114,7 +114,7 @@
        "width": 1117,
        "height": 22,
        "minBayNo": 2,
        "maxBayNo": 62
        "maxBayNo": 82
    }, {
        "type": "rack",
        "id": "rack13",
@@ -123,7 +123,7 @@
        "width": 1117,
        "height": 22,
        "minBayNo": 2,
        "maxBayNo": 62
        "maxBayNo": 82
    }, {
        "type": "rack",
        "id": "rack14",
@@ -132,7 +132,7 @@
        "width": 1117,
        "height": 22,
        "minBayNo": 2,
        "maxBayNo": 62
        "maxBayNo": 82
    }],
    "rackDescs": [{
        "type": "rackDescs",