Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

whycq

2023-03-15 f0d2defd354a3d6fbaf77338f0c42fe133f019fd

Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -32,6 +32,8 @@

    LocMast queryDemoLoc(@Param("crnNo") Integer crnNo);

    LocMast queryDemoLoc0(@Param("crnNo") Integer crnNo, @Param("locType1") short locType1);

    @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
    Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);


 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -39,6 +39,14 @@
    LocMast queryDemoLoc(Integer crn);

    /**
     * 堆垛机演示获取目标库位
     * @param crn
     * @param locType1
     * @return
     */
    LocMast queryDemoLoc0(Integer crn, short locType1);

    /**
     * 检查当前库位所属巷道的空库位数量
     * @param locMast
     * @return

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

@@ -45,6 +45,11 @@
    }

    @Override
    public LocMast queryDemoLoc0(Integer crn, short locType1) {
        return this.baseMapper.queryDemoLoc0(crn,locType1);
    }

    @Override
    public Boolean checkEmptyCount(LocMast locMast) {
        if (locMast == null) {
            return false;

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

@@ -229,8 +229,8 @@
                                .build()
                                .doPost();
                        JSONObject jsonObject = JSON.parseObject(response);
                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                        Integer code = jsonObject.getInteger("code");
//                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
//                        Integer code = jsonObject.getInteger("code");
                        if (jsonObject.getInteger("code").equals(200)) {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);

@@ -238,33 +238,47 @@
                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);

                            ledThread.errorReset();

                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
                            }
                        } else if(code == 500){
                            if (ledThread != null) {
                                String errorMsg = jsonObject.getString("msg");
                                if (!Cools.isEmpty(errorMsg)) {
                                    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);
                        } else if (code == 700) {
                            staProtocol.setWorkNo((short) 9995);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

                            // led 异常显示
                            if (ledThread != null) {
                                String errorMsg = barcode + "托盘识别异常，请先进行组托！";
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        }
//                        if (jsonObject.getInteger("code").equals(200)) {
//                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
//
//                            barcodeThread.setBarcode("");
//                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
//                            staProtocol.setStaNo(dto.getStaNo().shortValue());
//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
//
//                            ledThread.errorReset();
//
//                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                            if (!result) {
//                                throw new CoolException("更新plc站点信息失败");
//                            }
//                        } else if(code == 500){
//                            if (ledThread != null) {
//                                String errorMsg = jsonObject.getString("msg");
//                                if (!Cools.isEmpty(errorMsg)) {
//                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
//                                }
//                            }
//                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
//                        } else if (code == 700) {
//                            staProtocol.setWorkNo((short) 9995);
//                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
//                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//
//                            // led 异常显示
//                            if (ledThread != null) {
//                                String errorMsg = barcode + "托盘识别异常，请先进行组托！";
//                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
//                            }
//                        }


//                        // 检索库位
@@ -449,7 +463,7 @@
                    }
                }

                if (!Cools.isEmpty(barcode) && "NoRead".equals(barcode)) {
                if (!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
//                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        continue;
@@ -1844,8 +1858,11 @@
                    }

                    LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
                    LocMast loc = locMastService.queryDemoLoc(crn.getId());
                    if (null == sourceLoc || null == loc) {
                    if (null == sourceLoc ) {
                        continue;
                    }
                    LocMast loc = locMastService.queryDemoLoc0(crn.getId(),sourceLoc.getLocType1());
                    if ( null == loc) {
                        continue;
                    }


 src/main/resources/mapper/LocMastMapper.xml

@@ -59,4 +59,8 @@
        ORDER BY NEWID()
    </select>

    <select id="queryDemoLoc0" resultMap="BaseResultMap">
        select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'and loc_type1 = #{locType1}
        ORDER BY NEWID()
    </select>
</mapper>