From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001 From: ynhfasrs <ynhfasrs@qq.com> Date: 星期五, 27 六月 2025 14:23:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 68 ++++++++++++++-------------------- 1 files changed, 28 insertions(+), 40 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 f46ce75..196d4f0 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -150,9 +150,9 @@ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() - && !staProtocol.isEmptyMk() +// && !staProtocol.isEmptyMk() && staProtocol.isPakMk() - && staProtocol.getWorkNo() == 9999 + && (staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9998) ) { // 鑾峰彇鏉$爜鎵弿浠俊鎭� BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode()); @@ -183,10 +183,10 @@ requestParam.put("wcsStatus", 0);//鎴愬姛 } - String response = ""; + String response = "None"; Boolean success = false; try { - Object object = redisUtil.get(RedisKeyType.IN_TASK_LOCK.key); + Object object = redisUtil.get(RedisKeyType.IN_TASK_LOCK.key + inSta.getStaNo()); if(object != null) { continue; } @@ -198,15 +198,16 @@ .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); - redisUtil.set(RedisKeyType.IN_TASK_LOCK.key, "lock", 5); + log.info(response); + redisUtil.set(RedisKeyType.IN_TASK_LOCK.key + inSta.getStaNo(), "lock", 5); if (jsonObject.getInteger("code") == 200) { } else if (jsonObject.getInteger("code") == 500) { News.watchInfo(String.valueOf(staProtocol.getSiteId()), "鏉$爜锛�" + barcode + "鐢宠WMS澶辫触,绯荤粺鍥為��,response=" + JSON.toJSONString(jsonObject)); - staProtocol.setWorkNo(9997); - staProtocol.setStaNo(inSta.getBackSta().shortValue()); - MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); +// staProtocol.setWorkNo(9997); +// staProtocol.setStaNo(inSta.getBackSta().shortValue()); +// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); continue; }else { News.watchInfo(String.valueOf(staProtocol.getSiteId()), "鏉$爜锛�" + barcode + "鐢宠WMS澶辫触,response=" + JSON.toJSONString(jsonObject)); @@ -248,7 +249,7 @@ taskWrk.setBarcode(barcode);//鏉$爜 taskWrk.setCrnNo(locMast.getCrnNo()); taskWrk.setTargetPoint(resultLocNo); - taskWrk.setStartPoint(String.valueOf(staProtocol.getStaNo())); + taskWrk.setStartPoint(String.valueOf(inSta.getStaNo())); if (!Cools.isEmpty(taskWrk.getTargetPoint())) { taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint()); } @@ -456,7 +457,7 @@ flag = true; } if (!flag) { - News.watchError(crnStn.getStaNo() + "绔欑偣", "鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐圭姸鎬佹娴嬪け璐ワ紝绔欑偣闇�瑕佹弧瓒筹細鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙枫�佺珯鐐瑰彲鍏�"); +// News.watchError(crnStn.getStaNo() + "绔欑偣", "鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐圭姸鎬佹娴嬪け璐ワ紝绔欑偣闇�瑕佹弧瓒筹細鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙枫�佺珯鐐瑰彲鍏�"); continue; } @@ -695,37 +696,24 @@ if (taskWrkMapper.updateById(taskWrk) == 0) { log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo()); } - String response = ""; - Boolean bool=false; - HashMap<String, Object> headParam = new HashMap<>(); - headParam.put("TaskNo", taskWrk.getTaskNo()); - try { - response = new HttpHandler.Builder() - // .setHeaders(headParam) - .setUri(wmsUrl) - .setPath(taskExecCallback) - .setJson(JSON.toJSONString(headParam)) - .build() - .doPost(); - JSONObject jsonObject = JSON.parseObject(response); - if(jsonObject.get("ReturnStatus").equals(0)){ - bool = true; - taskWrk.setStatus(2); - taskWrkMapper.updateById(taskWrk); - } - } catch (Exception e) { - log.error("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触", taskWrk); -// throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触"); - }finally { - apiLogService.save("wcs娲惧彂绉诲簱浠诲姟涓婃姤wms" - , wmsUrl + taskExecCallback - , null - , "127.0.0.1" - , JSON.toJSONString(headParam) - , response - , bool - ); + //涓婃姤-绉诲簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm"); + HashMap<String, Object> hashMap = new HashMap<>(); + hashMap.put("taskNo", taskWrk.getTaskNo()); + hashMap.put("status", TaskStatusType.DISTRIBUTE.id); + hashMap.put("ioType", 3); + hashMap.put("barcode", taskWrk.getBarcode()); + hashMap.put("reportTime", format.format(new Date())); + + NotifyCustomDataDto customDataDto = new NotifyCustomDataDto(); + customDataDto.setUri(wmsUrl); + customDataDto.setPath(taskExecCallback); + customDataDto.setData(JSON.toJSONString(hashMap)); + boolean notifyResult = notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), NotifyMsgType.TASK_START, JSON.toJSONString(taskWrk), true, customDataDto); + if(notifyResult) { + taskWrk.setStatus(2); + taskWrkService.updateById(taskWrk); } } -- Gitblit v1.9.1