From 474d031dd0f9de2e8af2cb8161b711dd82624a1e Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期四, 11 四月 2024 17:02:01 +0800 Subject: [PATCH] #浅库位优先 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 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 b8b99c9..da0f484 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -407,16 +407,25 @@ continue; } log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:"+JSON.toJSONString(taskWrk)); - R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false); - JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r)); - if (jsonObject.getInteger("code").equals(200)){ +// R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false); + staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue()); + staProtocol.setStaNo(staDesc.getCrnStn().shortValue()); + boolean offer = false; + try{ + offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol)); + }catch (Exception e){ + log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:"+e); + log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:"+offer); + } +// JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r)); + if (offer){ log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:"+JSON.toJSONString(taskWrk)); taskWrk.setStatus(5); taskWrk.setWrkSts(14); taskWrkService.updateById(taskWrk); }else { log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:"+JSON.toJSONString(taskWrk)); - log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r)); +// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r)); } } }catch (Exception e){ -- Gitblit v1.9.1