Junjie
2023-12-21 ff5a9031ccded9ef2d4c0d58e3fbcfb21a0e2113
#检料盘点工作档更新
1个文件已修改
82 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 82 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -480,6 +480,7 @@
                            param.setBarcode(wrkMast.getBarcode());
                            param.setIoType(wrkMast.getIoType());
                            param.setSourceStaNo(pickSta.getStaNo());
                            param.setLiftNo(pickSta.getLiftNo());
                            param.setLocType1(locMast.getLocType1());
                            String response = new HttpHandler.Builder()
                                    .setUri(wmsUrl)
@@ -492,26 +493,26 @@
                            if (code.equals(200)) {
                                StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                                //获取回库提升机目标站
                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
                                if (liftStaProtocol == null) {
                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");
                                    continue;
                                }
                                // 更新工作档数据状态
                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54
                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站
                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位
                                wrkMast.setShuttleNo(null); // 穿梭车清空
                                wrkMast.setLiftNo(null);// 提升机清空
                                wrkMast.setModiTime(new Date());
                                if (wrkMastMapper.updateById(wrkMast) == 0) {
                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
                                    continue;
                                }
//                                //获取回库提升机目标站
//                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
//                                if (liftStaProtocol == null) {
//                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");
//                                    continue;
//                                }
//
//                                // 更新工作档数据状态
//                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54
//                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
//                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站
//                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
//                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位
//                                wrkMast.setShuttleNo(null); // 穿梭车清空
//                                wrkMast.setLiftNo(null);// 提升机清空
//                                wrkMast.setModiTime(new Date());
//                                if (wrkMastMapper.updateById(wrkMast) == 0) {
//                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
//                                    continue;
//                                }
                            } else if (code == 500) {
                                News.error("请求接口失败!!!url:{};request:{};response:{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                            }
@@ -630,6 +631,7 @@
                            param.setBarcode(wrkMast.getBarcode());
                            param.setIoType(107);//盘点
                            param.setSourceStaNo(pickSta.getStaNo());
                            param.setLiftNo(pickSta.getLiftNo());
                            param.setLocType1(locMast.getLocType1());
                            String response = new HttpHandler.Builder()
                                    .setUri(wmsUrl)
@@ -642,26 +644,26 @@
                            if (code.equals(200)) {
                                StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                                //获取回库提升机目标站
                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
                                if (liftStaProtocol == null) {
                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");
                                    continue;
                                }
                                // 更新工作档数据状态
                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57
                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站
                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位
                                wrkMast.setShuttleNo(null); // 穿梭车清空
                                wrkMast.setLiftNo(null);// 提升机清空
                                wrkMast.setModiTime(new Date());
                                if (wrkMastMapper.updateById(wrkMast) == 0) {
                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
                                    continue;
                                }
//                                //获取回库提升机目标站
//                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
//                                if (liftStaProtocol == null) {
//                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");
//                                    continue;
//                                }
//
//                                // 更新工作档数据状态
//                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57
//                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
//                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站
//                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
//                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位
//                                wrkMast.setShuttleNo(null); // 穿梭车清空
//                                wrkMast.setLiftNo(null);// 提升机清空
//                                wrkMast.setModiTime(new Date());
//                                if (wrkMastMapper.updateById(wrkMast) == 0) {
//                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
//                                    continue;
//                                }
//                                staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//写入目标站
//                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));