From 6aa8f23171b3c881da774123f1c079d7d0b88691 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 13:07:04 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 126 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 0b8e774..b804446 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -123,4 +123,130 @@
}
}
+ /**
+ * 鍥涘悜绌挎杞︾數閲忔娴� ===>> 鍙戣捣鍏呯數
+ */
+ public synchronized void loopShuttleCharge() {
+// ShuttleChargeType shuttleCharge = ShuttleChargeType.CHARGE_1;
+// for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
+// // 鍒ゆ柇鍏呯數浣嶆槸鍚﹁鍗犵敤
+// if (wrkChargeService.hasShuttleInChargeLoc(shuttleCharge.locNo, shuttle.getId())) {
+// continue;
+// }
+//
+// //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
+// ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
+// ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+// if (shuttleProtocol == null) {
+// continue;
+// }
+// if (motionService.selectCount(new EntityWrapper<Motion>()
+// .eq("device_ctg", DeviceCtgType.SHUTTLE.val())
+// .eq("device", shuttle.getId())
+// .eq("motion_sts", MotionStsType.EXECUTING.val())) > 0) {
+// continue;
+// }
+//
+// //鍒ゆ柇褰撳墠灏忚溅鏄惁婊¤冻闇�瑕佸厖鐢佃姹�
+// if (!shuttleProtocol.isRequireCharge()) {
+// continue;
+// }
+//
+// WrkCharge wrkCharge = wrkChargeService.selectWorking(null);
+// if (wrkCharge != null) {//宸叉湁鍏呯數浠诲姟
+// continue;
+// }
+//
+// String chargeLocNo = shuttleCharge.locNo;
+// wrkCharge = new WrkCharge();
+// wrkCharge.setShuttleNo(shuttle.getId());
+// wrkCharge.setCharge(shuttleCharge.id);
+// wrkCharge.setWrkNo(commonService.getChargeWorkNo(4));
+// wrkCharge.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+// wrkCharge.setWrkSts(WrkMastStsType.NEW_CHARGE.sts); // 鍏呯數浠诲姟
+// wrkCharge.setIoType(WrkIoTypeType.CHARGE.sts);
+// wrkCharge.setIoPri((double) 10);
+// wrkCharge.setLocNo(chargeLocNo);
+// wrkCharge.setMemo("charge");
+// wrkCharge.setAppeTime(new Date());
+//
+// // generate motion list
+// List<Motion> motionList = analyzeService.generateChargeMotion(wrkCharge);
+// if (Cools.isEmpty(motionList)) {
+// News.error("淇濆瓨{}鍙峰洓鍚戠┛姊溅鍏呯數浠诲姟澶辫触!!!", shuttle.getId());
+// continue;
+// }
+// motionService.batchInsert(motionList, wrkCharge.getUuid(), wrkCharge.getWrkNo());
+//
+// wrkCharge.setWrkSts(WrkMastStsType.ANALYZE_CHARGE.sts);
+//
+// if (!wrkChargeService.insert(wrkCharge)) {
+// News.error("淇濆瓨{}鍙峰洓鍚戠┛姊溅鍏呯數浠诲姟澶辫触!!!", shuttle.getId());
+// continue;
+// }
+//
+// News.info("淇濆瓨{}鍙峰洓鍚戠┛姊溅鍏呯數浠诲姟鎴愬姛!!!", shuttle.getId());
+// }
+ }
+
+ /**
+ * 鍥涘悜绌挎杞︾數閲忔娴� ===>> 婊＄數鍚庡洖鍒板緟鏈轰綅
+ */
+ public synchronized void loopShuttleToStandbyCauseCharge() {
+// ShuttleChargeType shuttleCharge = ShuttleChargeType.CHARGE_1;
+// Integer enoughPower = 90;
+// Config config = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "chargeMaxValue")
+// .eq("status", 1));
+// if (config != null) {
+// enoughPower = Integer.parseInt(config.getValue());
+// }
+//
+// for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
+// //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
+// ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
+// ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+// if (shuttleProtocol == null) {
+// continue;
+// }
+// // 鏄惁瀛樺湪鍏呯數浠诲姟
+// WrkCharge wrkCharge = wrkChargeService.selectWorking(shuttle.getId());
+// if (wrkCharge == null) {
+// continue;
+// }
+//
+// if (motionService.selectCount(new EntityWrapper<Motion>()
+// .eq("device_ctg", DeviceCtgType.SHUTTLE.val())
+// .eq("device", shuttle.getId())
+// .eq("motion_sts", MotionStsType.EXECUTING.val())) > 0) {
+// continue;
+// }
+// // 涓嶅浜庡厖鐢典腑
+// if (!shuttleProtocol.getPlcOutputCharge()) {
+// continue;
+// }
+// // 鍦ㄥ厖鐢典綅
+// if (!shuttleProtocol.getCurrentLocNo().equals(shuttleCharge.locNo)) {
+// continue;
+// }
+// // 鐢甸噺鏄惁杈惧埌婊＄數瑕佹眰
+// if (shuttleProtocol.getBatteryPower$().intValue() < enoughPower) {
+// continue;
+// }
+// // 宸叉湁杩佺Щ浠诲姟
+// if (wrkChargeService.selectMoveWorking(shuttle.getId()) != null) {
+// continue;
+// }
+//
+// // 寰呮満浣�
+// String standByLocNo = ShuttleTempLocType.query(shuttleProtocol.getShuttleNo().intValue(), 2, Utils.getLev(shuttleCharge.locNo)).locNo;
+//
+// shuttleDispatcher.generateShuttleChargeWrkComplete(shuttleProtocol.getShuttleNo().intValue(), standByLocNo);
+//
+// wrkCharge.setWrkSts(WrkMastStsType.COMPLETE_CHARGE.sts);
+// wrkCharge.setIoTime(new Date());
+// wrkChargeMapper.updateById(wrkCharge);
+// }
+ }
+
}
--
Gitblit v1.9.1