From 6c679ea7d1acdd67c7c2d4c7302b6420bd3fbcd5 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期四, 22 五月 2025 13:09:03 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 98 +++++++++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 43 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 90d7515..5f596f5 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -115,17 +115,24 @@ // 鑾峰彇鍏ュ簱绔欎俊鎭� DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo()); - if (staProtocol == null) { + if (staProtocol == null || !staProtocol.isLoading()) { continue; } else { staProtocol = staProtocol.clone(); } Integer workNo = staProtocol.getWorkNo(); + if (workNo!=9998){ + continue; + } Integer stano = staProtocol.getStaNo(); // 灏哄妫�娴嬪紓甯� boolean back = false; String errMsg = ""; + if (staProtocol.getGrossWt()>=600){ + errMsg = "瓒呴噸"; + back = true; + } if (staProtocol.isFrontErr()) { errMsg = "鍓嶈秴闄�"; back = true; @@ -165,8 +172,9 @@ if (!staProtocol.isPakMk()) { continue; } + System.out.println("鎵爜鍏ュ簱澶辫触锛寋"+inSta.getStaNo()+"}鍏ュ簱绔欏洜{"+errMsg+"}寮傚父锛屾墭鐩樺凡琚��鍥�"); // News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg); - staProtocol.setWorkNo(workNo); + staProtocol.setWorkNo(9999); staProtocol.setStaNo(inSta.getBackSta()); devpThread.setPakMk(staProtocol.getSiteId(), false); MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); @@ -181,7 +189,7 @@ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() - && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo>9000 && workNo<10000)) + && workNo == 9998 && staProtocol.isPakMk() && staProtocol.isPakMkWalk() ) { @@ -306,12 +314,15 @@ // 鑾峰彇鍏ュ簱绔欎俊鎭� DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo()); - if (staProtocol == null) { + if (staProtocol == null || !staProtocol.isLoading()) { continue; } else { staProtocol = staProtocol.clone(); } Integer workNo = staProtocol.getWorkNo(); + if (workNo!=9997){ + continue; + } Integer stano = staProtocol.getStaNo(); // 灏哄妫�娴嬪紓甯� @@ -352,8 +363,9 @@ if (!staProtocol.isPakMk()) { continue; } + System.out.println("鎵爜鍏ュ簱澶辫触锛寋"+inSta.getStaNo()+"}鍏ュ簱绔欏洜{"+errMsg+"}寮傚父锛屾墭鐩樺凡琚��鍥�"); // News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg); - staProtocol.setWorkNo(workNo); + staProtocol.setWorkNo(9999); staProtocol.setStaNo(inSta.getStaNo()); devpThread.setPakMk(staProtocol.getSiteId(), false); MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); @@ -368,7 +380,7 @@ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() - && staProtocol.isEmptyMk() && (workNo == 0 || (workNo>9000 && workNo<10000)) + && (workNo == 9997) && staProtocol.isPakMk() && staProtocol.isPakMkWalk() ) { @@ -1161,43 +1173,43 @@ taskWrkService.updateById(taskWrk); - try { - HashMap<String, Object> headParam = new HashMap<>(); - headParam.put("taskNo",taskWrk.getTaskNo()); - headParam.put("taskStatus",taskWrk.getStatusWms()); - headParam.put("ioType",taskWrk.getIoTypeWms()); - headParam.put("barCode",taskWrk.getBarcode()); - headParam.put("reportTime", LocalDateTime.now()); - headParam.put("weight",taskWrk.getScWeight().doubleValue()); - - String response; - log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", headParam); - - response = new HttpHandler.Builder() - // .setHeaders(headParam) - .setUri(wmsUrl) - .setPath(taskStatusFeedbackPath) - .setJson(JSON.toJSONString(headParam)) - .build() - .doPost(); - log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", response); - -// JSONObject jsonObject = JSON.parseObject(response); -// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", jsonObject); - - apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms" - , wmsUrl + taskStatusFeedbackPath - , null - , "127.0.0.1" - , JSON.toJSONString(headParam) - , response - , true - ); - } catch (Exception e) { - log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触", taskWrk); - log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触,鎶ラ敊淇℃伅锛�", e); -// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触"); - } +// try { +// HashMap<String, Object> headParam = new HashMap<>(); +// headParam.put("taskNo",taskWrk.getTaskNo()); +// headParam.put("taskStatus",taskWrk.getStatusWms()); +// headParam.put("ioType",taskWrk.getIoTypeWms()); +// headParam.put("barCode",taskWrk.getBarcode()); +// headParam.put("reportTime", LocalDateTime.now()); +// headParam.put("weight",taskWrk.getScWeight().doubleValue()); +// +// String response; +// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", headParam); +// +// response = new HttpHandler.Builder() +// // .setHeaders(headParam) +// .setUri(wmsUrl) +// .setPath(taskStatusFeedbackPath) +// .setJson(JSON.toJSONString(headParam)) +// .build() +// .doPost(); +// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", response); +// +//// JSONObject jsonObject = JSON.parseObject(response); +//// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", jsonObject); +// +// apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms" +// , wmsUrl + taskStatusFeedbackPath +// , null +// , "127.0.0.1" +// , JSON.toJSONString(headParam) +// , response +// , true +// ); +// } catch (Exception e) { +// log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触", taskWrk); +// log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触,鎶ラ敊淇℃伅锛�", e); +//// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触"); +// } } } -- Gitblit v1.9.1