From 7799b4f8c962ca4b5dbb9a6a58fb9a855b833e03 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期六, 28 六月 2025 15:17:42 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++++++- src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java | 16 ++++++++++------ src/main/java/com/zy/asrs/entity/wms/StorageEscalationParam.java | 3 +++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/wms/StorageEscalationParam.java b/src/main/java/com/zy/asrs/entity/wms/StorageEscalationParam.java index f6d718d..a91420c 100644 --- a/src/main/java/com/zy/asrs/entity/wms/StorageEscalationParam.java +++ b/src/main/java/com/zy/asrs/entity/wms/StorageEscalationParam.java @@ -15,6 +15,9 @@ //閿欒淇℃伅 鍏蜂綋鐨勯敊璇俊鎭紙瓒呴珮锛岃秴閲嶇瓑锛� private String WCSErrorMessage = ""; + //鏄惁婊℃澘 + private Integer fullPlt; + // 鐗╂枡鍙峰垪琛� private List<String> matIdList; } 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 4c9d443..230fdc4 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -181,17 +181,22 @@ } storageEscalationParam.setBarcode(BoxNo); storageEscalationParam.setMatIdList(staProtocol.getMatIdList()); + storageEscalationParam.setFullPlt(staProtocol.isFullPlt() ? 1 : 0); log.info("缁勬墭鍏ュ簱={}", storageEscalationParam); TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam); if (taskWrk == null) { log.error("鍏ュ簱璇锋眰wms鍒涘缓浠诲姟宸ヤ綔妗d负绌猴細{}", storageEscalationParam); continue; + } else { + if (-1 == taskWrk.getWrkNo()) { + back = true; + } } if (back) { staProtocol.setStaNo(inSta.getBackSta().shortValue()); devpThread.setPakMk(staProtocol.getSiteId(), false); MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); - log.info("缁勬墭鍏ュ簱鎵樼洏閫�鍥炲懡浠ゆ帹閫佽緭閫佺嚎闃熷垪鎴愬姛==>{}锛寋}", BoxNo, errMsg); + log.info("缁勬墭鍏ュ簱鎵樼洏閫�鍥炲懡浠ゆ帹閫佽緭閫佺嚎闃熷垪鎴愬姛==>{}锛寋}锛寋}", BoxNo, errMsg, taskWrk.getWrkNo()); } else { StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId())); diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java index de2b4cd..86b6fff 100644 --- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java @@ -112,14 +112,18 @@ .doPost(); if (!Cools.isEmpty(response)) { JSONObject jsonObject = JSON.parseObject(response); - if (successCode.equals(jsonObject.get(code).toString())) { + if ("700".equals(jsonObject.get(code).toString())) { + TaskWrk taskWrk=new TaskWrk(); + taskWrk.setWrkNo(-1); + return taskWrk; + } else if (successCode.equals(jsonObject.get(code).toString())) { WmsResult result = JSON.parseObject(jsonObject.get(data).toString(), WmsResult.class); return createInTask(result, wmsParam.getBarcode(), wmsParam.getStationCode()); } } } catch (Exception e) { e.printStackTrace(); - log.info("璇锋眰wms鎶ラ敊锛屽叆鍙傦細{},寮傚父锛歿}",JSON.toJSONString(wmsParam), e.getMessage()); + log.info("璇锋眰wms鎶ラ敊锛屽叆鍙傦細{},寮傚父锛歿}", JSON.toJSONString(wmsParam), e.getMessage()); } finally { addApiLog("鍏ュ簱浠诲姟璇锋眰鑾峰彇搴撲綅", wmsUrl + inboundTaskApplyPath, JSON.toJSONString(wmsParam), response, success); } @@ -132,9 +136,9 @@ boolean bool = false; JSONObject param = new JSONObject(); try { - log.info("浠诲姟鎵ц鐘舵�佷笂鎶ワ紝浠诲姟鍙凤細{}锛屾墽琛岀姸鎬侊細{}", taskNo,wrkSts); - param.put("taskNo",taskNo); - param.put("wrkSts",wrkSts); + log.info("浠诲姟鎵ц鐘舵�佷笂鎶ワ紝浠诲姟鍙凤細{}锛屾墽琛岀姸鎬侊細{}", taskNo, wrkSts); + param.put("taskNo", taskNo); + param.put("wrkSts", wrkSts); response = new HttpHandler.Builder() // .setHeaders(headParam) .setUri(wmsUrl) @@ -147,7 +151,7 @@ } } catch (Exception e) { - log.error("浠诲姟鎵ц鐘舵�佷笂鎶ュ紓甯�" + e); + log.error("浠诲姟鎵ц鐘舵�佷笂鎶ュ紓甯�" + e); } finally { apiLogService.save("浠诲姟鐘舵�佷笂鎶�" , wmsUrl + executionStatusReport -- Gitblit v1.9.1