From 2b118d22f058eab19bef175753517c2f65dd4418 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 21 十二月 2023 10:53:31 +0800 Subject: [PATCH] #检料盘点工作档更新 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 88 +++++++++++++++++++++++-------------------- 1 files changed, 47 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 6d0eab8..41529eb 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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; - } - - // 鏇存柊宸ヤ綔妗f暟鎹姸鎬� - 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() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�"); - continue; - } +// //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯 +// LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo())); +// if (liftStaProtocol == null) { +// News.info(wrkMast.getWrkNo() + "鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯澶辫触"); +// continue; +// } +// +// // 鏇存柊宸ヤ綔妗f暟鎹姸鎬� +// 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() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�"); +// continue; +// } } else if (code == 500) { News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", 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; - } - - // 鏇存柊宸ヤ綔妗f暟鎹姸鎬� - 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() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�"); - continue; - } +// //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯 +// LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo())); +// if (liftStaProtocol == null) { +// News.info(wrkMast.getWrkNo() + "鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯澶辫触"); +// continue; +// } +// +// // 鏇存柊宸ヤ綔妗f暟鎹姸鎬� +// 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() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�"); +// continue; +// } // staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//鍐欏叆鐩爣绔� // MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); @@ -2927,6 +2929,11 @@ }); + if (ioType == 107) { + locDetls = new ArrayList<>(); + ledCommand.setMatDtos(new ArrayList<>()); + } + if (locDetls.isEmpty()) { List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo)); wrkDetls.forEach(wrkDetl -> { @@ -2938,7 +2945,6 @@ for (WrkDetlLog wrkDetlLog : wrkDetlLogs) { ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode())); } - } } } -- Gitblit v1.9.1