From f75ab7eb69a218aa79ccc77c092887f009d16f90 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 07 二月 2025 08:20:10 +0800
Subject: [PATCH] 米多泉州wcs初始配置完成
---
/dev/null | 143 ---
src/main/webapp/views/crn.html | 4
src/main/webapp/views/index.html | 2
src/main/webapp/static/js/console.js | 2
src/main/java/com/zy/service/impl/MainServiceImpl.java | 1672 --------------------------------------
src/main/webapp/static/js/console.map.js | 532 +++++------
src/main/java/com/zy/core/MainProcess.java | 71 -
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2
src/main/resources/application.yml | 121 ++
11 files changed, 375 insertions(+), 2,178 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9754fdc..6fce120 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>ghlnwcs</finalName>
+ <finalName>mdqzwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/common/task/GhlnWcsScheduler.java b/src/main/java/com/zy/common/task/GhlnWcsScheduler.java
deleted file mode 100644
index 2fb4b71..0000000
--- a/src/main/java/com/zy/common/task/GhlnWcsScheduler.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.zy.common.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
-import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.thread.SiemensDevpThread;
-import com.zy.entity.BasDevp;
-import com.zy.entity.WrkDetl;
-import com.zy.entity.WrkMast;
-import com.zy.enums.AgvApi;
-import com.zy.service.BasDevpService;
-import com.zy.service.WrkDetlService;
-import com.zy.service.WrkMastService;
-import com.zy.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author pang.jiabao
- * @description 鍐犻缚榫欏崡涓撶敤瀹氭椂浠诲姟
- * @createDate 2024/7/10 9:20
- */
-@Slf4j
-@Component
-public class GhlnWcsScheduler {
-
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private WrkMastService wrkMastService;
-
- @Resource
- private WrkDetlService wrkDetlService;
-
- /**
- * wcs寮�闂ㄥ畬鎴愶紝閫氱煡agv鍙栬揣鏀捐揣
- */
- @Scheduled(cron = "0/5 * * * * ?")
- private void wcsOpenComplete() {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol305 = devpThread.getStation().get(305);
- if (staProtocol305!= null && staProtocol305.getIfOpenDoor()) {
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
- if (basDevp.getWrkNo() != 0) {
- WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
- if (wrkMast == null || wrkMast.getWhsType() == null || wrkMast.getWhsType() == 3){
- return;
- }
- if (wrkMast.getWhsType() == 4) {
- return;
- }
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- // 鍒ゆ柇寮�闂ㄥ畬鎴愶紝鍒欓�氱煡agv鍙互鏀捐揣
- // 璋冪敤缁撴灉
- boolean success = false;
- // 鏋勯�犺姹傚ご
- Map<String, Object> headers = new HashMap<>();
- headers.put("Content-Type", "application/json;charset=UTF-8");
- // 鏋勯�犺姹備綋
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("matnr",wrkDetl.getMatnr());
- jsonObject.put("batch",wrkDetl.getBatch());
- jsonObject.put("flag",wrkMast.getIoType() > 100 ? "0" : "1");
- String body = jsonObject.toJSONString();
- String response = "";
- try {
- response = new HttpHandler.Builder()
- .setUri(AgvApi.OPEN_COMPLETE_PUSH.getURI())
- .setPath(AgvApi.OPEN_COMPLETE_PUSH.getPath())
- .setHeaders(headers)
- .setJson(body)
- .build()
- .doPost();
- if (!Cools.isEmpty(response)) {
- JSONObject jsonObject1 = JSONObject.parseObject(response);
- if ((Integer) jsonObject1.get("code") == 200) {
- success = true;
- wrkMast.setWhsType(3);
- wrkMastService.updateById(wrkMast);
- }
- } else {
- log.error("wcs寮�闂ㄥ畬鎴愰�氱煡agv鎺ュ彛寮傚父鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", "", body, response);
- }
- } catch (Exception e) {
- log.error("wcs寮�闂ㄥ畬鎴愰�氱煡agv鎺ュ彛寮傚父锛歿}", e.getMessage());
- } finally {
- log.error("wcs寮�闂ㄥ畬鎴愰�氱煡agv鎺ュ彛锛歿}", success);
- }
- }
- }
- }
-
- /**
- * 璇诲凡鍏抽棬
- */
- @Scheduled(cron = "0/5 * * * * ?")
- private void wcsCloseComplete() {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol = devpThread.getStation().get(305);
- if (staProtocol == null) {
- return;
- } else {
- staProtocol = staProtocol.clone();
- }
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
- if (basDevp.getWrkNo() != 0 && basDevp.getWrkNo() != 9999) {
- WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
- if (wrkMast == null || wrkMast.getWhsType() == null ||wrkMast.getWhsType() != 4) {
- return;
- }
- if (wrkMast.getIoType() == 1 && wrkMast.getWrkSts() == 1) {
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- if(!MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol))){
- log.error("鍏ュ簱鍏抽棬瀹屾垚澶辫触");
- }
- wrkMast.setWrkSts(2L);
- wrkMastService.updateById(wrkMast);
- basDevp.setWrkNo(staProtocol.getWorkNo());
- basDevpService.updateById(basDevp);
- } else if (wrkMast.getIoType() == 101) {
- staProtocol.setWorkNo(9999);
- staProtocol.setStaNo(wrkMast.getSourceStaNo().shortValue());
- if(!MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol))){
- log.error("鍑哄簱鍏抽棬瀹屾垚澶辫触");
- }
- basDevp.setWrkNo(staProtocol.getWorkNo());
- basDevpService.updateById(basDevp);
- }
- }
- }
-}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4a11259..c58dabc 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -34,7 +34,6 @@
while (!Thread.currentThread().isInterrupted()) {
try {
- // 闂撮殧
Thread.sleep(1000);
// 绯荤粺杩愯鐘舵�佸垽鏂�
@@ -42,86 +41,32 @@
continue;
}
- // 婕旂ず
-// mainService.crnDemoOfLocMove1();
- //鍒锋柊RGV鍦板浘
-// mainService.refreshRgvMap();
-
- // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-// mainService.ioConvert();
-
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-// mainService.stnToCrnStnPick(3);
-// mainService.stnToCrnStnPick2();
-
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(1); // 缁勬墭
-// mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
Thread.sleep(500);
+
+ // 鐢熸垚 绌哄瓙/姣嶆墭鐩樹换鍔�
+ mainService.generateEmptyPalletStoreWrk();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn(4);
+
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute(5);
- // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-// mainService.crnIoWrkMast();
+
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished(6);
+
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr(7);
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt(8);
+
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute(9);
+
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
mainService.outOfDevp(11);
-
- // 106鐢熸垚杞Щ浠诲姟
- mainService.autoMoveLoc();
-
- // 缁檖lc鍐欏紑闂ㄤ俊鍙�
- mainService.writePlc305();
-
- // 305鍏ュ簱璋冪敤搴曞骇鍒�305
- mainService.invokingBase();
-
-// if (i>10){
-// //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-// mainService.autoEmptyOut();
-// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-// mainService.autoEmptyIn();
-// i=0;
-// }
-// i++;
-
- // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-// i++;
-// if (i > 1) {
-// mainService.ioConvert();
-// i = 0;
-// }
-
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-//
- //瀹屾垚灏忚溅浠诲姟
-// mainService.rgvCompleteWrkMastSta();
-
-// //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-// mainService.rgvRunWrkMastEmptyStaPut();//鏀�
-// mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-// if (rgcWrk){
-// //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-// mainService.rgvRunWrkMastFullSta();
-// rgcWrk = false;
-// }else {
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-// rgcWrk = true;
-// }
-
-
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d884e92..9fe3d21 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,7 +43,7 @@
private short heartBeatVal = 1;
private StaError1 staError1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);
+ add(1002);add(1020);add(1035);add(103);
add(104);add(105);add(106);add(107);
add(200);add(201);add(202);add(203);add(210);
add(300);add(301);add(302);add(303);add(304);add(305);
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 07aa65a..5598bf5 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
@@ -23,14 +22,11 @@
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.LedCommand;
-import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.CrnProtocol;
-import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
-import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.entity.*;
import com.zy.mapper.*;
@@ -56,6 +52,14 @@
public class MainServiceImpl {
public static final long COMMAND_TIMEOUT = 5 * 1000;
+
+ // 绌烘嫋鍑哄簱绔欑偣
+ public static final Map<Integer,String> emptyPalletSiteMap = new HashMap<>();
+
+ // 鍒濆鍖栫┖鎵樼洏鍑哄簱绔欑偣 M绌烘瘝鎵樼洏锛孼绌哄瓙鎵樼洏
+ static {
+ emptyPalletSiteMap.put(1002,"M");emptyPalletSiteMap.put(1020,"M");emptyPalletSiteMap.put(1035,"Z");
+ }
@Autowired
private CommonService commonService;
@@ -481,166 +485,6 @@
// News.infoNoLog(""+mark+" - 0"+" - 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 ===銆嬫墽琛屽畬鎴�");
}
-
- //鐩樼偣鍐嶅叆搴�
- public synchronized void stnToCrnStnPick2(){
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
- for (DevpSlave.Sta pickSta : devp.getPickSta()) {
- // 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing()
- && staProtocol.isLoading()
- && staProtocol.isInEnable()
- && !staProtocol.isEmptyMk()
-// && staProtocol.getWorkNo() > 0
- && staProtocol.isPakMk()){
-
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
- if(!Cools.isEmpty(barcode)) {
-// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
- if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
- staProtocol.setWorkNo(wrkNo);
- staProtocol.setStaNo(pickSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-
- // led 寮傚父鏄剧ず
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
- if (ledThread != null) {
- String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
- MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
- }
- continue;
- }
- } else {
- staProtocol.setWorkNo(wrkNo);
- staProtocol.setStaNo(pickSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-
- // led 寮傚父鏄剧ず
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
- if (ledThread != null) {
- String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
- MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
- }
- continue;
- }
-
- WrkMast wrkMast = wrkMastMapper.selectPickStep2(barcode);
- if (wrkMast == null) {
- // 鏃犵洏鐐规暟鎹�
- continue;
- }
-
- // 鍑哄簱纭淇″彿浣�
-// if ((Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N")) && wrkMast.getIoType() != 107) {
-// continue;
-// }
-// if ( wrkMast.getIoType() != 107 || Cools.isEmpty(wrkMast.getStaNo())
-// || Cools.isEmpty(wrkMast.getSourceStaNo())) {
-// continue;
-// }
-
- // 鑾峰彇搴撲綅鍙�
- try {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
- SearchLocParam param = new SearchLocParam();
- param.setBarcode(barcode);
- param.setIoType(107);
- param.setSourceStaNo(pickSta.getStaNo()); //浣滀笟绔欑偣
- if (!Cools.isEmpty(locMast)){
- param.setLocType1(locMast.getLocType1());
- }else {
- param.setLocType1(locTypeDto.getLocType1());
- }
-
- String response = "";
- log.info("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS===>>鍙傛暟锛�" + param);
- try {
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/pakin2/loc/v1")
- .setJson(JSON.toJSONString(param))
-// .setTimeout(15, TimeUnit.SECONDS)
- .build()
- .doPost();
- } catch(Exception e){
- log.error("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS===>>鍙傛暟锛�" + param);
- log.error("stnToCrnStnPick2===>>鐩樼偣鏌ュ簱浣嶅叆搴撴帴鍙ｅけ璐�", e);
- e.printStackTrace();
- continue;
- }
- log.info("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS===>>鍙傛暟锛�" + param);
- log.info("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"涓嬪彂鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS杩斿洖缁撴灉===>>" + response);
- if(response.equals("")) {
- continue;
- }
- JSONObject jsonObject = JSON.parseObject(response);
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
- Integer code = jsonObject.getInteger("code");
- if (code == 200) {
- StartupDto dto = jsonObject.getObject("data", StartupDto.class);
- if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getStaNo())) {
- log.error("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅け璐�===>>" + jsonObject.toJSONString());
- } else {
- log.info("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶆垚鍔�===>>" + jsonObject.toJSONString());
- try {
- // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo((short)161);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- ledThread.errorReset();
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (!result) {
- log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
- }
- log.info("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣鍐嶅叆搴撲换鍔′笅鍙戞垚鍔�===>>" + staProtocol);
- } catch (Exception e) {
- log.error("鐩樼偣鍐嶅叆搴撳け璐�===>>" + e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
- } else {
- staProtocol.setWorkNo(wrkNo);
- staProtocol.setStaNo(pickSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (ledThread != null) {
- String errorMsg = jsonObject.getString("msg");
- if (!Cools.isEmpty(errorMsg)) {
- MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
- }
- }
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin2/loc/v1", JSON.toJSONString(param), response);
- }
- } catch (Exception e) {
- log.error("stnToCrnStnPick2===>>fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
-
- }
-
- }
-
- }
- }
-
/**
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
*/
@@ -790,62 +634,6 @@
}
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
- }
-
- /**
- * 鍥炲師鐐癸紝鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
- */
- public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread) {
-// for (CrnSlave crn : slaveProperties.getCrn()) {
-// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
-// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
-// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-// if (crnProtocol == null) {
-// continue;
-// }
-// BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
-// if (basCrnp == null) {
-// log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
-// continue;
-// }
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
- if (crnProtocol.getBay() == 1 && crnProtocol.getLevel() == 1) {
- return;
- }
-
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�3,12
- if (wrkMastMapper.selectWorking(crnProtocol.getCrnNo()) != null) {
- return;
- }
-
- //鍫嗗灈鏈烘湁鎵ц涓换鍔★紝杩囨护3,4,11,12
- if (wrkMastMapper.selectCrnWorking(crnProtocol.getCrnNo()) != null) {
- return;
- }
-
- //杈撻�佺嚎娌℃湁鍏ュ簱浠诲姟锛岃繃婊�2
- if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
- return;
- }
- News.info("鍫嗗灈鏈哄彫鍥炲師鐐�==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満鏈夊叆搴撲换鍔�,鍙洖鍘熺偣");
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡: 鍥炲師鐐�
- crnCommand.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
- News.error("鍫嗗灈鏈哄洖鍘熺偣鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
- }
- crnThread.setBackHpFlag(true);
- }
-// }
}
/**
@@ -1162,123 +950,6 @@
News.infoNoLog(""+mark+" - 2"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 锛� 鍑哄簱鎵ц瀹屾瘯");
}
-// /**
-// * 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
-// */
-// public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
-// for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
-// // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
-// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
-// if (wrkMast == null) {
-// continue;
-// }
-// // 宸ヤ綔妗ｇ姸鎬佸垽鏂�
-// if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null){
-// log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
-// continue;
-// }
-// // 鑾峰彇婧愬簱浣嶄俊鎭�
-// LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
-// if (!sourceSta.getLocSts().equals("R") &&!sourceSta.getLocSts().equals("P")) {
-// log.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts());
-// continue;
-// }
-// // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
-// SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
-// StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
-// if (staProtocol == null) {
-// continue;
-// } else {
-// staProtocol = staProtocol.clone();
-// }
-//
-//// // 鍏ュ嚭搴撴ā寮忓垽鏂�
-//// if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
-//
-//
-// // 鏌ヨ绔欑偣璇︾粏淇℃伅
-// BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
-// if (staDetl == null) {
-// log.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
-// continue;
-// }
-// // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
-// if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
-// && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-//
-// // 鍫嗗灈鏈烘帶鍒惰繃婊�
-// if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
-// continue;
-// }
-//
-// // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
-// if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
-// String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
-// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
-// // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
-// if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
-// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
-// if (null == waitWrkMast) {
-// log.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
-// } else {
-// if(waitWrkMast.getWrkSts() == 11) {
-// waitWrkMast.setIoPri(15D);
-// waitWrkMast.setModiTime(new Date());
-// if (wrkMastMapper.updateById(waitWrkMast) == 0) {
-// log.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
-// }
-// continue;
-// } else {
-//
-// }
-// }
-// } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
-// // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
-// if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
-// wrkMast.setUpdMk("Y");
-// wrkMastMapper.updateById(wrkMast);
-// // 鐢熸垚宸ヤ綔妗ｃ�佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵�併�佷笅鍙戝爢鍨涙満鍛戒护锛堢珛椹墽琛�)
-// moveLocForDeepLoc(slave, shallowLoc);
-// }
-// log.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛�", wrkMast.getWrkNo());
-// continue;
-// }
-// }
-//
-// // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
-// if (wrkMastMapper.selectWorking(slave.getId()) != null) {
-// return;
-// }
-//
-// // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
-// CrnCommand crnCommand = new CrnCommand();
-// crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
-// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 婧愬簱浣嶆帓
-// crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 婧愬簱浣嶅垪
-// crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰
-// crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
-// crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
-// crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
-// if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
-// log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
-// } else {
-// // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
-// Date now = new Date();
-// wrkMast.setWrkSts(12L);
-// wrkMast.setCrnStrTime(now);
-// wrkMast.setModiTime(now);
-// if (wrkMastMapper.updateById(wrkMast) == 0) {
-// log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
-// }
-// }
-// }
-// }
-// }
-
/**
* 搴撲綅绉昏浆
*/
@@ -1527,120 +1198,6 @@
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄紓甯镐俊鎭褰曟墽琛屽畬鎴�");
}
-
- // -------------------------------------------------------------------------------
-
- /**
- * 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- */
- public synchronized void storeEmptyPlt(Integer mark) {
-
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 閬嶅巻绌烘澘鍏ュ簱鍙�
- for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
- // 鑾峰彇绌烘澘鍏ュ簱绔欎俊鎭�
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(emptyInSta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
-
- LedThread ledThread = null;
- if (!Cools.isEmpty(emptyInSta.getLed())) {
- ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, emptyInSta.getLed());
- }
-
- if (!staProtocol.isLoading()){
- continue;
- }
-
- // 绔欑偣鏉′欢鍒ゆ柇
- if (staProtocol.isAutoing()
- && staProtocol.isLoading()
- && staProtocol.isInEnable()
- && staProtocol.isEmptyMk()
- && staProtocol.isPakMk()
- && (staProtocol.getWorkNo() !=0 && staProtocol.getWorkNo() > 9700)
- ) {
- News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
-
- try {
- LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
-
- SearchLocParam param = new SearchLocParam();
- param.setIoType(10);
- param.setSourceStaNo(emptyInSta.getStaNo());
- param.setLocType1(locTypeDto.getLocType1());
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/pakin/loc/v1")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
- // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(dto.getWorkNo());
- staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
- if (!result) {
- News.errorNoLog(""+mark+" - 1"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
- }
-
- if (ledThread != null) {
- // 鍛戒护闆嗗悎
- List<LedCommand> commands = new ArrayList<>();
- // 缁勮鍛戒护
- LedCommand ledCommand = new LedCommand();
- ledCommand.setWorkNo(dto.getWorkNo());
- ledCommand.setIoType(1);
- ledCommand.setTitle("鍏ㄦ澘鍏ュ簱");
- ledCommand.setLocNo(dto.getLocNo());
- ledCommand.setStaNo(dto.getStaNo());
- commands.add(ledCommand);
- MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
-// ledThread.errorReset();
- }
- } else {
-// staProtocol.setWorkNo(wrkNo++);
-// staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// if (!result) {
-// News.errorNoLog(""+mark+" - 2"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
-// throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
-// }
-//
- if (ledThread != null) {
- String errorMsg = jsonObject.getString("msg");
- if (!Cools.isEmpty(errorMsg)) {
- MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, errorMsg));
- }
- }
-// News.error(""+mark+" - 3"+" - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
-
- } else {
- News.errorNoLog(""+mark+" - 4"+" - 绔欑偣淇℃伅涓嶇鍚堝叆搴撴潯浠讹紒锛侊紒"+" 鑷姩淇″彿锛�"+staProtocol.isAutoing()+"銆佸彲鍏ヤ俊鍙凤細" + staProtocol.isInEnable()
- +"銆佺┖鏉夸俊鍙凤細"+ staProtocol.isEmptyMk()+"銆佸伐浣滃彿锛�" + staProtocol.getWorkNo()
- +"銆侀攣瀹氭爣璁�"+ staProtocol.isPakMk());
- }
- }
- }
-// News.infoNoLog(""+mark+" - 0"+" - 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐ф墽琛屽畬鎴�");
- }
-
/**
* 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
*/
@@ -1795,82 +1352,6 @@
}
/**
- * 鍥犲弻娣卞簱浣嶉樆濉烇紝瀵规祬搴撲綅杩涜绉昏浆锛堝叆搴撶増)
- * tip锛氬悓姝�
- */
- @Transactional
- public synchronized void moveLocForDeepLocPakin(CrnSlave crn, LocMast shallowLoc, WrkMast pakinWrkMast) {
- LocMast loc = locMastService.selectById(pakinWrkMast.getLocNo());
-
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
- Date now = new Date();
- // 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(15D);
- wrkMast.setCrnNo(crn.getId());
- wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 婧愬簱浣�
- wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 婊℃澘
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
- wrkMast.setBarcode(shallowLoc.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setCtnNo("Y"); // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- int res = wrkMastMapper.insert(wrkMast);
- if (res == 0) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- if (shallowLoc.getLocSts().equals("F")) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
- for (LocDetl locDetl : locDetls) {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- wrkDetl.setAnfme(locDetl.getAnfme());
- VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- }
- }
- // 淇敼婧愬簱浣嶇姸鎬�
- if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
- shallowLoc.setLocSts("S"); // S.鍏ュ簱棰勭害锛屽叆搴撻樆濉炲簱浣嶇Щ杞�
- shallowLoc.setModiTime(now);
- if (!locMastService.updateById(shallowLoc)) {
- throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
- }
- } else {
- throw new CoolException("婧愬簱浣嶅嚭搴撳け璐�");
- }
-// // 淇敼鐩爣搴撲綅鐘舵��
-// if (loc.getLocSts().equals("O")) {
-// loc.setLocSts("S"); // S.鍏ュ簱棰勭害
-// loc.setModiTime(new Date());
-// if (!locMastService.updateById(loc)) {
-// throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
-// }
-// } else {
-// throw new CoolException("绉昏浆澶辫触");
-// }
- wrkMast.setLocNo(shallowLoc.getLocNo());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- throw new CoolException("淇敼闃诲鍏ュ簱浠诲姟澶辫触");
- }
- }
-
- /**
* 鍥犲弻娣卞簱浣嶉樆濉烇紝瀵规祬搴撲綅杩涜绉昏浆锛堢珛鍗虫墽琛岀増)
* tip锛氬悓姝�
*/
@@ -1998,234 +1479,6 @@
}
/**
- * 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
- */
- public synchronized void crnDemoOfLocMove1() {
- try {
- for (CrnSlave crn : slaveProperties.getCrn()) {
- if (!crn.getDemo()) {
- continue;
- } // 蹇呴』涓烘紨绀虹姸鎬�
-
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
- }
-
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
- // 鑾峰彇绉诲簱宸ヤ綔妗ｄ俊鎭�
- WrkMast wrkMast = wrkMastMapper.selectLocMove(crn.getId());
- if (null != wrkMast) {
- continue;
- }
-
- LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
- LocMast loc = locMastService.queryDemoLoc(crn.getId());
- if (null == sourceLoc || null == loc) {
- continue;
- }
-
- String sourceLocNo = sourceLoc.getLocNo();
- String locNo = loc.getLocNo();
-
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
- // 淇濆瓨宸ヤ綔妗�
- wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(13D);
- wrkMast.setCrnNo(crn.getId());
- wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
- wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
- wrkMast.setFullPlt("N"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
- wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setAppeTime(new Date());
- wrkMast.setModiTime(new Date());
- int res = wrkMastMapper.insert(wrkMast);
- if (res == 0) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
-// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
-// for (LocDetl locDetl : locDetls) {
-// WrkDetl wrkDetl = new WrkDetl();
-// wrkDetl.setWrkNo(workNo);
-// wrkDetl.setIoTime(new Date());
-// wrkDetl.setAnfme(locDetl.getAnfme());
-// VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
-// wrkDetl.setAppeTime(new Date());
-// wrkDetl.setModiTime(new Date());
-// if (!wrkDetlService.insert(wrkDetl)) {
-// throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
-// }
-// }
- // 淇敼婧愬簱浣嶇姸鎬�
- if (sourceLoc.getLocSts().equals("D")) {
- sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
- sourceLoc.setModiTime(new Date());
- if (!locMastService.updateById(sourceLoc)) {
- throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
- }
- } else {
- throw new CoolException("婧愬簱浣嶅嚭搴撳け璐�");
- }
- // 淇敼鐩爣搴撲綅鐘舵��
- if (loc.getLocSts().equals("O")) {
- loc.setLocSts("S"); // S.鍏ュ簱棰勭害
- loc.setModiTime(new Date());
- if (!locMastService.updateById(loc)) {
- throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException("绉昏浆澶辫触");
- }
-
- }
- }
- } catch (Exception e) {
- News.error("鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆澶辫触", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
-
- /**
- * 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
- */
- public synchronized void crnIoWrkMast() {
- for (CrnSlave crn : slaveProperties.getCrn()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
- }
- Date now = new Date();
- // 鍫嗗灈鏈烘鍦ㄨ繍琛�
- if (crnProtocol.getStatusType() != CrnStatusType.IDLE && crnProtocol.getTaskNo() != 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
- // 鑾峰彇宸ヤ綔妗�
- WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
- if (wrkMast == null) {
- continue;
- }
- // 鍏ュ簱
- if (wrkMast.getWrkSts() == 1 || wrkMast.getWrkSts() == 2) {
- News.warn("鍫嗗灈鏈洪潪绌洪棽鎯呭喌涓嬶紝寮�濮嬩慨鏀瑰伐浣滄。鐘舵�併�俒id:{},鏃堕棿锛歿}] >>>>> 鍫嗗灈鏈哄綋鍓嶇姸鎬佷负锛歿}銆備换鍔″彿:{}", crn.getId(), DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), crnProtocol.getStatusType().desc, crnProtocol.getTaskNo());
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
- wrkMast.setWrkSts(3L);
- wrkMast.setCrnStrTime(now);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
- }
- // 鍑哄簱銆佺Щ搴�
- if (wrkMast.getWrkSts() == 11) {
- News.warn("鍫嗗灈鏈洪潪绌洪棽鎯呭喌涓嬶紝寮�濮嬩慨鏀瑰伐浣滄。鐘舵�併�俒id:{},鏃堕棿锛歿}] >>>>> 鍫嗗灈鏈哄綋鍓嶇姸鎬佷负锛歿}銆備换鍔″彿:{}", crn.getId(), DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), crnProtocol.getStatusType().desc, crnProtocol.getTaskNo());
- // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
- wrkMast.setWrkSts(12L);
- wrkMast.setCrnStrTime(now);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
- }
-
-
- }
-
- }
- }
-
- /**
- * 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
- */
- public synchronized void ioConvert() {
- try {
- // 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- Integer[] staNos;
- if (devp.getId() == 1) {
- staNos = new Integer[]{101, 103};
- }else {
- staNos = new Integer[]{305};
- }
- for (Integer staNo : staNos) {
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(staNo);
- switch (staNo) {
- case 101://1F
- if (pakout != null) {
- if (devpThread.ioModeOf101 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf101 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(staNo);
- if (pakin == null) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf101 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf101 = IoModeType.PAKIN_MODE;
- }
- break;
- case 103://1F
- if (pakout != null) {
- if (devpThread.ioModeOf103 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf103 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(staNo);
- if (pakin == null) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf103 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf103 = IoModeType.PAKIN_MODE;
- }
- break;
- case 305://1F
- if (pakout != null) {
- if (devpThread.ioModeOf305 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf305 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(staNo);
- if (pakin == null) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf305 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf305 = IoModeType.PAKIN_MODE;
- }
- break;
- }
- }
-
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-
- }
-
- /**
* 骞舵澘锛屾嫞鏂欙紝鐩樼偣鍑哄簱锛岀姸鎬佷负14.宸插嚭搴撴湭纭锛屾洿鏂癱tnNo涓篩
* @param mark 鏍囪瘑
*/
@@ -2246,907 +1499,48 @@
// News.infoNoLog(""+mark+" - 0"+" - outOfDevp鎵ц瀹屾垚");
}
-
- public synchronized void autoEmptyOut() {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- List<Integer> list = new ArrayList<>();
- list.add(101);list.add(112);
- Map<Integer,Integer> map = new HashMap<>();
- map.put(101,102);map.put(112,111);
- for (Integer site:list){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no", map.get(site)));
- if (!Cools.isEmpty(wrkMast)){
- continue;
- }
- //濡傛灉绔欑偣鍙嚭绂佺敤锛屽垯涓嶇敓鎴愮┖鐩樺嚭搴撲换鍔�
- StaProtocol staProtocol = devpThread.getStation().get(site);
+ /**
+ * 鐢熸垚 绌哄瓙/姣嶆墭鐩樹换鍔�
+ */
+ public synchronized void generateEmptyPalletStoreWrk() {
+ Integer devpId = 1;
+ for (Map.Entry<Integer, String> entry : emptyPalletSiteMap.entrySet()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devpId);
+ StaProtocol staProtocol = devpThread.getStation().get(entry.getKey());
if (staProtocol == null) {
- return;
+ continue;
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() //鑷姩
- && !staProtocol.isLoading() //鏃犵墿
- && staProtocol.isOutEnable() //鍙嚭淇″彿
- && staProtocol.getWorkNo() == 0
- ) {
- WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(site);
- if (null != pakoutEmpty) {
- return;
+
+ // 鑷姩&鏃犵墿&鍙嚭
+ if (staProtocol.isAutoing() && !staProtocol.isLoading() && staProtocol.isOutEnable()) {
+ // 鍒ゆ柇鏄惁宸茬粡鐢熸垚浠诲姟
+ if (wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", entry.getKey())).size() > 0) {
+ log.warn("{}绔欑偣宸茬粡瀛樺湪绌烘澘鍑哄簱浠诲姟", entry.getKey());
+ continue;
}
- Short loctype1 = 1;
- if (site == 101){
- loctype1 = 2;
- }
- LocTypeDto locTypeDto = new LocTypeDto(loctype1, (short) 1, (short) 1);
- locTypeDto.setSiteId(site);
+ Map<String, String> map = new HashMap<>();
+ map.put("site", String.valueOf(entry.getKey()));
+ map.put("flag", entry.getValue());
+ String response = "";
try {
- String response = new HttpHandler.Builder()
+ response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/auto/emptyOut/v1")
- .setJson(JSON.toJSONString(locTypeDto))
+ .setJson(JSON.toJSONString(map))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- String data = jsonObject.get("data").toString();
- News.info((String) jsonObject.get("msg")+","+data);
+ log.info("绌烘墭鍑哄簱璇锋眰鎴愬姛锛氳姹傚弬鏁皗}锛岃繑鍥炲��:{}", map, response);
} else {
- News.warnNoLog("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyOut/v1","", response);
+ log.error("绌烘嫋鍑哄簱璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyOut/v1", map, response);
}
} catch (Exception e) {
+ log.error("绌烘嫋鍑哄簱璇锋眰鎺ュ彛寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyOut/v1", map, response);
e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
- }
- }
-
- }
-
- public synchronized void autoEmptyIn() {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- List<Integer> list = new ArrayList<>();
- list.add(153);list.add(157);
- for (Integer site:list){
- StaProtocol staProtocol = devpThread.getStation().get(site);
- if (staProtocol == null) {
- return;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() //鑷姩
- && staProtocol.isLoading() //鏈夌墿
- && staProtocol.isInEnable() //鍙叆淇″彿
- && staProtocol.isPakMk()
- && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990) //宸ヤ綔鍙蜂负0鎴栬�呭伐浣滃彿鏄�9991~9999锛堣緭閫佹満鐣欑敤锛�
- ) {
-
- try {
- Short loctype1 = 1;
- if (site == 153){
- loctype1 = 2;
- }
- LocTypeDto locTypeDto = new LocTypeDto(loctype1, (short) 1, (short) 1);
- locTypeDto.setSiteId(site);
-
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/auto/emptyIn/v1")
- .setJson(JSON.toJSONString(locTypeDto))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- News.info((String) jsonObject.get("msg"));
- staProtocol.setWorkNo(jsonObject.get("data").hashCode());
- staProtocol.setStaNo(site.shortValue());
- devpThread.setPakMk(site,false);
- MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- } else {
- News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyIn/v1", JSON.toJSONString(locTypeDto), response);
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
-
- }
-
- }
-
- /*
- * 灏忚溅鍦板浘鏇存柊 鏇存柊閿�
- * */
- public synchronized boolean rgvMapUpdate(BasRgvMap basRgvMapCurrent,Integer staStart,Integer staEnd,String sign){
-
-// List<Integer> integers = RouteUtils.RouteMapCurrentFar(basRgvMapCurrent.getNowRoute(),staStart,staEnd, basRgvMapCurrent.getLockStartRoute());
- //鏇存柊褰撳墠灏忚溅閿�
- try{
- Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getNowRoute(), staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//鑾峰彇鏈�杩滅珯鐐�
- Integer fallMerge = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getRgvNo(), farCurrentStaNo); //鑾峰彇鍚堝苟骞叉秹椤�
- basRgvMapCurrent.setLockEndRoute(fallMerge);
- Integer i = basRgvMapMapper.updateById(basRgvMapCurrent);
-// if (i>0){
- log.error("{}:==>{}:{}鍙疯溅鏇存柊缁撴潫閿�,{}",sign,new Date(),basRgvMapCurrent.getRgvNo(),JSON.toJSONString(basRgvMapCurrent));
-// }
-
- //鏇存柊鍙︿竴鍙板皬杞﹀湴鍥�
- Integer rgvNoOther = basRgvMapCurrent.getRgvNoOther(basRgvMapCurrent.getRgvNo());
- BasRgvMap basRgvMapOther = basRgvMapMapper.selectById(rgvNoOther);
- List<Integer> integers = RouteUtils.RouteMapCurrentFar(fallMerge, basRgvMapCurrent.getLockStartRoute());
- Integer lockEndRoute = RouteUtils.RouteMapOtherFarStnNo(integers, basRgvMapCurrent.getLockStartRoute());//鍙︿竴鍙板皬杞﹀彲娲诲姩鏈�杩滀綅缃�
- basRgvMapOther.setEndRoute(lockEndRoute);
- Integer i1 = basRgvMapMapper.updateById(basRgvMapOther);
-// if (i1>0){
- log.error("{}:==>{}:{}鍙疯溅鏇存柊缁撴潫浣嶇疆,{}",sign,new Date(),basRgvMapOther.getRgvNo(),JSON.toJSONString(basRgvMapOther));
-// }
- return true;
- }catch (Exception e){
- log.error("灏忚溅鍦板浘鏇存柊鍑洪敊锛�");
- return false;
- }
- }
-
- /*
- * 鍒锋柊鍦板浘鏁版嵁
- * */
- public synchronized void refreshRgvMap() {
- try{
- List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
- for (BasRgvMap rgvSlave:basRgvMaps) {
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }else {
- rgvProtocol = rgvProtocol.clone();
- }
- BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
- if (basRgv == null) {
- log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�2", rgvSlave.getRgvNo());
- continue;
- }
-
- // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅涓�鏃犵墿//rgv鍙敤
- if (rgvProtocol.getStatusType() == RgvStatusType.IDLE &&
- rgvProtocol.getModeType() == RgvModeType.AUTO
- && rgvProtocol.getLoaded1()==0 //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
- && (rgvProtocol.getTaskNo1()==0)
- &&rgvThread.isPakMk()
- ) {
- BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
-
- Integer rgvNoOther = basRgvMap.getRgvNoOther(rgvProtocol.getRgvNo());
- RgvThread rgvThreadOther = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNoOther);
- RgvProtocol rgvProtocolOther = rgvThreadOther.getRgvProtocol();
- if (rgvProtocolOther == null) {
- continue;
- }else {
- rgvProtocolOther = rgvProtocolOther.clone();
- }
- if (rgvProtocolOther.getStatusType() == RgvStatusType.IDLE
- && rgvProtocolOther.getModeType() == RgvModeType.AUTO
- && rgvProtocolOther.getLoaded1()==0
- && (rgvProtocolOther.getTaskNo1()==0)
- &&rgvThreadOther.isPakMk()
- ){
- //瀵瑰伐浣滄。杩涜鍒ゆ柇
- basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
- if (rgvProtocol.getTaskNo1() >0 && rgvProtocol.getTaskNo1()<=9000){
- WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(rgvProtocol.getTaskNo1().intValue());
- rgvMapUpdate(basRgvMap, wrkMastSta.getStaStart(), wrkMastSta.getStaEnd(),"2366");
- }else if (rgvProtocol.getTaskNo1() == 0){
- rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute(),"2366");
- }
-
- }
-
-
-
- }
- }
- }catch (Exception e){
- log.error("4109琛屾墽琛屽皬杞﹀垵濮嬪寲浠诲姟涓嬪彂澶辫触");
- log.error("4109琛�"+e);
- }
- }
-
-
- /**
- * 瀹屾垚灏忚溅浠诲姟
- */
- public synchronized void rgvCompleteWrkMastSta() {
- try{
- for (DevpSlave devp : slaveProperties.getDevp()) {
- List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
- for (BasRgvMap rgvSlave:basRgvMaps) {
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }else {
- rgvProtocol = rgvProtocol.clone();
- }
- BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
- if (basRgv == null) {
- log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�3", rgvSlave.getRgvNo());
- continue;
- }
-
- // 鍙湁褰揜GV绛夊緟WCS纭銆佽嚜鍔�
- if ((rgvProtocol.getStatusType1() == RgvStatusType.WAITING || rgvProtocol.getStatusType1()==RgvStatusType.FETCHWAITING)
- && rgvProtocol.getModeType() == RgvModeType.AUTO
- && (rgvProtocol.getStatusType() == RgvStatusType.WORKING1)
- ){
- log.info("{}鍙峰皬杞︾瓑寰厀cs纭锛岀姸鎬亄}锛屽弬鏁皗}",rgvProtocol.getRgvNo(),rgvProtocol.getStatusType(),rgvProtocol);
- if (rgvProtocol.getTaskNo1()!=0){
- if (rgvProtocol.getTaskNo1()==32222){
- boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
- if (!rgvComplete){
- log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�",rgvProtocol.getRgvNo());
- }
- BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
- basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
- rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute(),"2415");
- rgvThread.setPakMk(true);
- break;
- }
- WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(rgvProtocol.getTaskNo1().intValue());
- if (Cools.isEmpty(wrkMastSta) || wrkMastSta.getWrkSts()!=1){
- log.error("鏈煡鍒板皬杞︽墽琛屼换鍔℃垨鑰呮墽琛屼换鍔＄姸鎬佷笉绗﹀悎锛�"+wrkMastSta);
- continue;
- }
-
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(wrkMastSta.getStaEnd());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (!staProtocol.isAutoing() || !staProtocol.isLoading()){
- continue;
- }
- WrkMast wrkMast = wrkMastMapper.selectPakInStep3(wrkMastSta.getWrkNo().intValue());
- if (!Cools.isEmpty(wrkMast)){
- if (!staProtocol.isPakMk()){
- continue;
- }
- // 涓嬪彂绔欑偣淇℃伅
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- log.error("rgv浠诲姟瀹屾垚缁欒緭閫佺嚎涓嬪彂鍛戒护锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
- if (!MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol))) {
- continue;
- }
- }else {
- log.error("rgv浠诲姟瀹屾垚缁欒緭閫佺嚎涓嬪彂鍛戒护,浣嗘湭鏌ヨ鍒板伐浣滄。");
- // 涓嬪彂绔欑偣淇℃伅
- Map<Integer,Integer> map = new HashMap<>();
- map.put(101,102);map.put(112,111);
- map.put(100,100);
- staProtocol.setWorkNo(rgvProtocol.getTaskNo1().intValue());
- staProtocol.setStaNo(map.get(rgvProtocol.getRgvPosI()).shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
-// log.error("rgv浠诲姟瀹屾垚缁欒緭閫佺嚎涓嬪彂鍛戒护锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
- if (!MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol))) {
- continue;
- }
- }
- boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
-// boolean rgvComplete = true;
- if (!rgvComplete){
- log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�",rgvProtocol.getRgvNo());
- break;
- }
- WrkMast wrkMast1 = wrkMastService.selectByWrkNo(rgvProtocol.getTaskNo1().intValue());
- wrkMast1.setUpdMk("Y");
-
- wrkMastService.updateById(wrkMast1);
-
- wrkMastSta.setWrkSts(3);
- wrkMastStaMapper.updateById(wrkMastSta);
- BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
- basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
- rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute(),"2471");
- rgvThread.setPakMk(true);
- }
-
- else {
- log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{},绛夊緟wcs纭浣嗘槸娌℃湁宸ヤ綔鍙凤紒",rgvProtocol.getRgvNo());
- }
- }
- }
- }
- }catch (Exception e){
- log.error("灏忚溅澶嶄綅绾跨▼鎶ラ敊锛�"+e);
- }
- }
- /**
- * 鎵ц灏忚溅鎼繍浠诲姟
- */
- public synchronized void rgvRunWrkMastFullSta() {
- boolean wrkEnable = false;
- try{
- List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
- for (BasRgvMap rgvSlave:basRgvMaps) {
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }else {
- rgvProtocol = rgvProtocol.clone();
- }
- BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
- if (basRgv == null) {
- log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�4", rgvSlave.getRgvNo());
- continue;
- }
-
- // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅涓�鏃犵墿//rgv鍙敤
- if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
- && rgvProtocol.getModeType() == RgvModeType.AUTO
- && rgvProtocol.getLoaded1()==0
- && rgvProtocol.getTaskNo1() == 0
- ) {
- BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
- if (basRgvMap == null) {
- log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱鍦板浘涓繘琛岀淮鎶わ紒", rgvProtocol.getRgvNo());
- continue;
- }
- List<Integer> route = RouteUtils.getRoute(basRgvMap.getStartRoute(), basRgvMap.getEndRoute());
- basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
- List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectNoInterfereList(route, route);
- for (WrkMastSta wrkMastSta : wrkMastStaList){
- if (wrkMastSta.getType()!=0 || wrkMastSta.getWrkType()!=3){//1:婊＄増 3锛氬彇鏀�
- continue;
- }
- boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
- wrkEnable = true;
- if (sign){
- rgvThread.setPakMk(false);
- boolean signMap = rgvMapUpdate(basRgvMap, wrkMastSta.getStaStart(), wrkMastSta.getStaEnd(),"2526");
- if (signMap){
- Thread.sleep(300);
- wrkMastSta.setWrkSts(1);
- try{
- wrkMastStaMapper.updateById(wrkMastSta);
- return;
- }catch (Exception e){
- log.error("鏇存柊灏忚溅浠诲姟澶辫触");
- }
- break;
- }else {
- log.error("3864琛岋紝璐х墿鎼繍浠诲姟锛氬伐浣滃彿{}鎵�灞炰换鍔′笅鍙戝悗鍦板浘鍚屾澶辫触",wrkMastSta.getWrkNo());
- }
- } else {
- log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
- }
- break;
- }
- }
-
- }
- if (!wrkEnable){
- rgvRunWrkMastEmptyStaAvoidance();
- }
- }catch (Exception e){
- log.error("3875琛屾墽琛屽皬杞︽惉杩愪换鍔′笅鍙戝け璐�");
- log.error("3875琛�"+e);
- }
- }
- /**
- * 鎵ц灏忚溅鎼繍浠诲姟
- */
-// public synchronized void rgvRunWrkMastEmptyStaPut() {//鏀�
-// try{
-// for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
-// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
-// RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
-// if (rgvProtocol == null) {
-// continue;
-// }
-// BasRgv basRgv = basRgvService.selectById(rgvSlave.getId());
-// if (basRgv == null) {
-// log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�5", rgvSlave.getId());
-// continue;
-// }
-//
-// // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅浜屾湁鐗�//rgv鍙敤
-// if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
-// && rgvProtocol.getModeType() == RgvModeType.AUTO
-// && rgvProtocol.getLoaded1()==1 //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
-// ) {
-// BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
-// if (basRgvMap == null) {
-// log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱鍦板浘涓繘琛岀淮鎶わ紒", rgvProtocol.getRgvNo());
-// continue;
-// }
-// basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
-// List<Integer> route = RouteUtils.getRoute(basRgvMap.getStartRoute(), basRgvMap.getEndRoute());//鑾峰彇娲诲姩鑼冨洿
-// List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectNoInterfereList(route, route);//鏌ヨ鍙墽琛屼换鍔�
-// for (WrkMastSta wrkMastSta : wrkMastStaList){
-// if (wrkMastSta.getType()!=2 || (wrkMastSta.getWrkType()!=2 && wrkMastSta.getWrkType()!=4)){// 2:绌烘澘 2:鏀� 4锛氭媶鐩�
-// continue;
-// }
-// boolean sign = false;
-// if (wrkMastSta.getStaStart()==0 && wrkMastSta.getStaEnd()!=0){//鏀�
-// sign = rgvPutEmpty(rgvProtocol.getRgvNo(),wrkMastSta);
-// }else {
-// continue;
-// }
-// if (sign){
-// boolean signMap = rgvMapUpdate(basRgvMap, basRgvMap.getStartRoute(), wrkMastSta.getStaEnd());
-// if (signMap){
-// wrkMastSta.setWrkSts(2);
-// try{
-// wrkMastStaMapper.updateById(wrkMastSta);
-// }catch (Exception e){
-// log.error("鏇存柊灏忚溅浠诲姟澶辫触");
-// }
-// return;
-// }else {
-// log.error("3857琛岋紝璐х墿鎼繍浠诲姟锛氬伐浣滃彿{}鎵�灞炰换鍔′笅鍙戝悗鍦板浘鍚屾澶辫触",wrkMastSta.getWrkNo());
-// }
-// }else {
-// log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
-// }
-// break;
-// }
-// }
-// }
-// }catch (Exception e){
-// log.error("3933琛屾墽琛屽皬杞︽斁绌烘澘浠诲姟涓嬪彂澶辫触");
-// log.error("3933琛�"+e);
-// }
-// }
-
-// public synchronized void rgvRunWrkMastEmptyStaTake() {//鍙�
-// try{
-// for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
-// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
-// RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
-// if (rgvProtocol == null) {
-// continue;
-// }
-// BasRgv basRgv = basRgvService.selectById(rgvSlave.getId());
-// if (basRgv == null) {
-// log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�6", rgvSlave.getId());
-// continue;
-// }
-//
-// // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅浜屾棤鐗�//rgv鍙敤
-// if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
-// && rgvProtocol.getModeType() == RgvModeType.AUTO
-// && rgvProtocol.getLoaded1()==0 //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
-// ) {
-// BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
-// if (basRgvMap == null) {
-// log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱鍦板浘涓繘琛岀淮鎶わ紒", rgvProtocol.getRgvNo());
-// continue;
-// }
-// List<Integer> route = RouteUtils.getRoute(basRgvMap.getStartRoute(), basRgvMap.getEndRoute());
-// basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
-// List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectNoInterfereList(route, route);
-// for (WrkMastSta wrkMastSta : wrkMastStaList){
-// if (wrkMastSta.getType()!=2 || wrkMastSta.getWrkType()!=1){// 2:绌烘澘 1:鍙�
-// continue;
-// }
-// boolean sign = false;
-// if (wrkMastSta.getStaEnd()==0 && wrkMastSta.getStaStart()!=0){//鍙�
-// sign = rgvTakeEmpty(rgvProtocol.getRgvNo(),wrkMastSta);
-// } else {
-// continue;
-// }
-// if (sign){
-// boolean signMap = rgvMapUpdate(basRgvMap, wrkMastSta.getStaStart(), basRgvMap.getStartRoute());
-// if (signMap){
-// wrkMastSta.setWrkSts(1);
-// try{
-// wrkMastStaMapper.updateById(wrkMastSta);
-// }catch (Exception e){
-// log.error("鏇存柊灏忚溅浠诲姟澶辫触");
-// }
-// return;
-// }else {
-// log.error("3879琛岋紝璐х墿鎼繍浠诲姟锛氬伐浣滃彿{}鎵�灞炰换鍔′笅鍙戝悗鍦板浘鍚屾澶辫触",wrkMastSta.getWrkNo());
-// }
-// }else {
-// log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
-// }
-// break;
-// }
-// }
-// }
-// }catch (Exception e){
-// log.error("3989琛屾墽琛屽皬杞﹀彇绌烘澘浠诲姟涓嬪彂澶辫触");
-// log.error("3989琛�"+e);
-// }
-// }
-
- /*
- * 鏈変换鍔′絾鏈墽琛� 姝ゆ椂闇�瑕佽皟鏁村皬杞︿綅缃�
- * */
- public synchronized void rgvRunWrkMastEmptyStaAvoidance() {
- try{
- Integer integer = wrkMastStaMapper.selectAllWrkStsCount(null,0);//鏌ヨ鐘舵�佷负0鐨勪换鍔�
- if (integer==0){
- return;
- }
- List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
- for (BasRgvMap rgvSlave:basRgvMaps) {
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }else {
- rgvProtocol = rgvProtocol.clone();
- }
- BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
- if (basRgv == null) {
- log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�1", rgvSlave.getRgvNo());
- continue;
- }
-
- // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅涓�鏃犵墿//rgv鍙敤
- if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
- && rgvProtocol.getModeType() == RgvModeType.AUTO
- && rgvProtocol.getLoaded1()==0 //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
- && rgvProtocol.getTaskNo1()==0
- && rgvProtocol.getStatusType1() == RgvStatusType.IDLE
-// && rgvProtocol.getTaskNo2()==0
- ) {
- BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
- if (rgvProtocol.getRgvPosI().equals(basRgvMap.getStartRoute())){
- continue;
- }
-// if (rgvProtocol.getRgvNo()==1 && rgvProtocol.getRgvPosI().equals(100)){
-// continue;
-// } else if (rgvProtocol.getRgvNo()==2 && rgvProtocol.getRgvPosI().equals(157) ){
-// continue;
-// }
- rgvAvoidanceXY(rgvProtocol.getRgvNo());
- rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute(),"2727");
- }
- }
- }catch (Exception e){
- log.error("4109琛屾墽琛屽皬杞﹀垵濮嬪寲浠诲姟涓嬪彂澶辫触");
- log.error("4109琛�"+e);
- }
- }
-
- /*
- * 灏忚溅XY绉诲姩 閬胯
- * */
- public synchronized boolean rgvAvoidanceXY(Integer rgvId){
- BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo(rgvId);
- if (basRgvMap.getStartRoute() == 100 || basRgvMap.getStartRoute() == 101){
- try{
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1((short)32222); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.X_MOVE); // 宸ヤ綅1浠诲姟妯″紡: 鍥炲師鐐�
- //basRgvMap.getLockStartRoute().shortValue()
- rgvCommand.setSourceStaNo1(basRgvMap.getStartRoute().shortValue());
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔� step=9锛屽洖鍘熺偣 9999浠诲姟鍙�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
- return false;
- } else {
- return true;
- }
- }catch (Exception e){
- return false;
-
- }
- }else {
- try{
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1((short)32222); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.X_MOVE); // 宸ヤ綅1浠诲姟妯″紡: 鍥炲師鐐�
- //basRgvMap.getLockStartRoute().shortValue()
- rgvCommand.setSourceStaNo1(basRgvMap.getStartRoute().shortValue());
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔� step=9锛屽洖鍘熺偣 9999浠诲姟鍙�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
- return false;
- } else {
- return true;
- }
- }catch (Exception e){
- return false;
-
- }
- }
- }
-
-
- /*
- * 灏忚溅鍙栬揣鑷冲伐浣嶄换鍔�
- * */
- public synchronized boolean rgvTakeFullAll(Integer rgvId,WrkMastSta wrkMastSta){
- try{
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMastSta.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡: 鍙栨斁璐�
- rgvCommand.setSourceStaNo1(wrkMastSta.getStaStart().shortValue()); //宸ヤ綅1璧风偣
- rgvCommand.setDestinationStaNo1(wrkMastSta.getStaEnd().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
- return false;
- } else {
- return true;
- }
- }catch (Exception e){
- return false;
- }
- }
-
- /*
- * 灏忚溅鍙栬揣鑷冲伐浣嶄换鍔�
- * */
-// public synchronized boolean rgvTakeFull(Integer rgvId,WrkMastSta wrkMastSta){
-// try{
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
-// rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo1(wrkMastSta.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
-// rgvCommand.setTaskMode1(RgvTaskModeType.FETCH); // 宸ヤ綅1浠诲姟妯″紡: 鍙栬揣
-// rgvCommand.setSourceStaNo1(wrkMastSta.getStaStart().shortValue()); //宸ヤ綅1璧风偣
-// rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
-// if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
-// //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
-// log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
-// return false;
-// } else {
-// return true;
-// }
-// }catch (Exception e){
-// return false;
-// }
-// }
-
- /*
- * 灏忚溅鏀捐揣鑷宠緭閫佺嚎浠诲姟
- * */
-// public synchronized boolean rgvPutFull(Integer rgvId,WrkMastSta wrkMastSta){
-// try{
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
-// rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo1(wrkMastSta.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
-// rgvCommand.setTaskMode1(RgvTaskModeType.PUT); // 宸ヤ綅1浠诲姟妯″紡: 鏀捐揣
-// rgvCommand.setDestinationStaNo1(wrkMastSta.getStaEnd().shortValue()); //宸ヤ綅1鐩爣绔欑偣
-// rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
-// if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
-// //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
-// log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
-// return false;
-// } else {
-// return true;
-// }
-// }catch (Exception e){
-// return false;
-// }
-// }
-
- /*
- * 灏忚溅鍙栫┖鏉胯嚦宸ヤ綅浠诲姟
- * */
-// public synchronized boolean rgvTakeEmpty(Integer rgvId,WrkMastSta wrkMastSta){
-// try{
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
-// rgvCommand.setAckFinish2((short) 0); // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo2(wrkMastSta.getWrkNo().shortValue()); // 宸ヤ綅2宸ヤ綔鍙�
-// rgvCommand.setTaskMode2(RgvTaskModeType.FETCH); // 宸ヤ綅2浠诲姟妯″紡: 鍙栬揣
-// rgvCommand.setSourceStaNo2(wrkMastSta.getStaStart().shortValue()); //宸ヤ綅2璧风偣
-// rgvCommand.setCommand((short) 2); //宸ヤ綅2浠诲姟纭
-// if (!MessageQueue.offer(SlaveType.Crn, rgvId, new Task(5, rgvCommand))) {
-// //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
-// log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
-// return false;
-// } else {
-// return true;
-// }
-// }catch (Exception e){
-// return false;
-// }
-// }
-
- /*
- * 灏忚溅鏀剧┖鏉胯嚦杈撻�佺嚎浠诲姟
- * */
-// public synchronized boolean rgvPutEmpty(Integer rgvId,WrkMastSta wrkMastSta){
-// try{
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setRgvNo(rgvId); // RGV缂栧彿
-// rgvCommand.setAckFinish2((short) 0); // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo2(wrkMastSta.getWrkNo().shortValue()); // 宸ヤ綅2宸ヤ綔鍙�
-// rgvCommand.setTaskMode2(RgvTaskModeType.PUT); // 宸ヤ綅2浠诲姟妯″紡: 鏀捐揣
-// rgvCommand.setDestinationStaNo2(wrkMastSta.getStaEnd().shortValue()); //宸ヤ綅2鐩爣绔欑偣
-// rgvCommand.setCommand((short) 2); //宸ヤ綅2浠诲姟纭
-// if (!MessageQueue.offer(SlaveType.Crn, rgvId, new Task(5, rgvCommand))) {
-// //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
-// log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
-// return false;
-// } else {
-// return true;
-// }
-// }catch (Exception e){
-// return false;
-// }
-// }
-
- /*
- * 灏忚溅澶嶄綅
- * */
- public synchronized boolean rgvComplete(Integer rgvId){
- try{
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(3, new RgvCommand()))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}",rgvId);
- return false;
- } else {
- log.info("RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}",rgvId);
- return true;
- }
- }catch (Exception e){
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}銆傚紓甯革細"+e,rgvId);
- return false;
- }
- }
-
- public synchronized void autoMoveLoc() {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 16L));
- if (wrkMast == null || wrkMast.getStaNo() != 104 && wrkMast.getStaNo() != 107) {
- return;
- }
- // 鍒ゆ柇婧愮珯鐐规儏鍐� 鏈変换鍔″彿锛屾湁鐗╋紝鑷姩
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol106 = devpThread.getStation().get(106);
- StaProtocol staProtocol105 = devpThread.getStation().get(105);
- StaProtocol staProtocol107 = devpThread.getStation().get(107);
- if (staProtocol106 == null) {
- return;
- } else {
- staProtocol106 = staProtocol106.clone();
- }
- if (staProtocol105 == null) {
- return;
- } else {
- staProtocol105 = staProtocol105.clone();
- }
- if (staProtocol107 == null) {
- return;
- } else {
- staProtocol107 = staProtocol107.clone();
- }
-
- if (wrkMast.getStaNo() == 104) {
- // 鍒ゆ柇鍑哄簱绔欑偣鎯呭喌,鍙叆锛屽爢鍨涙満鍙互鍙栬揣锛屽彲鍑猴紝鍫嗗灈鏈哄彲浠ユ斁璐�
- if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable() || !staProtocol105.isLoading()) {
- return;
- }
- } else if (wrkMast.getStaNo() == 107) {
- if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable() || staProtocol107.isLoading()) {
- return;
- }
- }
-
- // 鑾峰彇鍫嗗灈鏈轰俊鎭� 骞� 鍒ゆ柇鏄惁鍙叆鍑�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 1);
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- return;
- }
- BasCrnp basCrnp = basCrnpService.selectById(1);
- if (!basCrnp.getInEnable().equals("Y") && !basCrnp.getOutEnable().equals("Y")) {
- return;
- }
-
- // 鍫嗗灈鏈烘帶鍒惰繃婊�
- if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
- return;
- }
-
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if (wrkMastMapper.selectWorking(1) != null) {
- return;
- }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX((short) 3); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY((short) 28); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) 28); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- if(wrkMast.getStaNo() == 104) { // 鐩爣绔�104锛屽嚭鍒�105浣嶇疆
- crnCommand.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) 4); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- }
- crnCommand.setCommand((short)1);
- crnCommand.setTraySize(true); //搴撲綅绫诲瀷
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
- News.error("106绉诲簱1鍙峰爢鍨涙満鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
- }
-// else {
-// wrkMast.setCrnNo(2);
-// wrkMastMapper.updateById(wrkMast);
-// }
- News.infoNoLog("106绉诲簱缁�1鍙峰爢鍨涙満涓嬪彂瀹屾垚");
- }
-
- public synchronized void writePlc305() {
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
- if (basDevp.getWrkNo() != 0 && basDevp.getWrkNo() != 9999) {
- WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
- if(wrkMast != null && wrkMast.getWhsType() != null && wrkMast.getWhsType() == 2) {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol305 = devpThread.getStation().get(305);
- if (!staProtocol305.getOpenAskDoor() && !staProtocol305.getIfOpenDoor()) { // 娌¤姹傛墦寮�
- // 璇锋眰鎵撳紑
- if(!MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 1))){
- log.error("璇锋眰寮�闂ㄥけ璐�");
- }
- }
- }
- }
- }
- public synchronized void readPlc305() {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 16L));
-
- }
-
- public synchronized void invokingBase() {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 1L).eq("io_type", 1)
- .eq("source_sta_no", 305));
- if (wrkMast != null) {
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("wrk_sts", 2L).eq("io_type", 1)
- .eq("source_sta_no", 305));
- if (count != 0) {
- log.warn("瀛樺湪305鍏ュ簱浠诲姟锛岀姸鎬佷负璁惧涓婅蛋");
- return;
- }
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol= devpThread.getStation().get(wrkMast.getStaNo());
- if (staProtocol == null) {
- return;
- } else {
- staProtocol = staProtocol.clone();
- }
- if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getSourceStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp,1, new Task(2, staProtocol));
- log.info("鍏ュ簱璇锋眰搴曞骇------");
}
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6e4d014..76f268e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.243:1433;databasename=ghlnasrs
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghlnasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqzasrs
username: sa
password: sa@123
mvc:
@@ -35,7 +34,7 @@
enable: false
wms:
- url: 10.10.10.243:8080/ghlnwms
+ url: 127.0.0.1:8080/mdqzwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -136,6 +135,54 @@
row: 6
bay: 28
lev: 1
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.30
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 6
+ bay: 1
+ lev: 1
# 杈撻�佺嚎1
devp[0]:
@@ -159,17 +206,6 @@
# 鍏ュ簱鍙�3
inSta[2]:
staNo: 305
- # 绌烘澘鍏ュ簱鍙�1
-# emptyInSta[0]:
-# staNo: 101
-# barcode: ${wcs-slave.barcode[0].id}
-# backSta: 100
-# led: ${wcs-slave.led[0].id}
-# emptyInSta[1]:
-# staNo: 103
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 102
-# led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
@@ -178,16 +214,6 @@
outSta[1]:
staNo: 102
led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 104
- led: ${wcs-slave.led[2].id}
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 107
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 305
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -199,6 +225,16 @@
id: 2
ip: 10.10.10.122
port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.122
+ port: 51236
+ # 鏉＄爜鎵弿浠�4
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.122
+ port: 51236
# LED1
led[0]:
@@ -206,19 +242,46 @@
ip: 10.10.10.190
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101,100
-
+ staArr: 101
# LED2
led[1]:
id: 2
ip: 10.10.10.191
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102,103
+ staArr: 102
# LED3
led[2]:
id: 3
- ip: 10.10.10.192
+ ip: 10.10.10.191
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104
\ No newline at end of file
+ staArr: 102
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.191
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 102
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.191
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 102
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.191
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 102
+ # LED7
+ led[6]:
+ id: 7
+ ip: 10.10.10.191
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 102
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index ecd1c2f..15c8d05 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/ghlnwcs";
+var baseUrl = "/mdqzwcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index f731681..de14203 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -30,7 +30,7 @@
let bLen
let interval // 闂撮殧鏁�
- if (maxBayNo<35) {
+ if (i < 8) {
interval = 1
bLen = maxBayNo / interval // 搴撲綅涓暟
} else {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index b2a3f7b..cebaab1 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -3,131 +3,148 @@
"rackCount": 8,
"crnCount": 2,
"stbCount": 18,
- "hpPosition": 1,
+ "hpPosition": 2,
"minBayNo": 1,
- "floors": 2,
+ "floors": 1,
"racks": [{
"type": "rack",
"id": "rack1",
- "top": 189,
- "left": 200,
- "width": 1350,
- "height": 23,
+ "top": 100,
+ "left": 450,
+ "width": 1300,
+ "height": 20,
"minBayNo": 1,
- "maxBayNo": 31
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 457,
- "left": 200,
- "width": 1300,
- "height": 23,
- "minBayNo": 2,
- "maxBayNo": 31
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 430,
- "left": 200,
- "width": 1300,
- "height": 23,
- "minBayNo": 2,
- "maxBayNo": 31
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 365,
- "left": 200,
- "width": 1350,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 31
- }, {
- "type": "rack",
- "id": "rack5",
- "top": 338,
- "left": 200,
- "width": 1350,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 31
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 311,
- "left": 200,
- "width": 1300,
- "height": 23,
- "minBayNo": 2,
- "maxBayNo": 31
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 283,
- "left": 200,
- "width": 1300,
- "height": 23,
- "minBayNo": 2,
- "maxBayNo": 31
- }, {
+ "maxBayNo": 40
+ },{
"type": "rack",
"id": "rack2",
- "top": 217,
- "left": 200,
- "width": 1350,
- "height": 23,
+ "top": 120,
+ "left": 450,
+ "width": 1300,
+ "height": 20,
"minBayNo": 1,
- "maxBayNo": 31
- }],
- "rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc8",
- "text": "#8",
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack3",
+ "top": 170,
+ "left": 450,
+ "width": 1300,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack4",
"top": 190,
- "left": 150,
- "width": 33,
- "height": 23
- },
- {"type": "rackDescs", "id": "lb_desc7", "text": "#7", "top": 218, "left": 150, "width": 33, "height": 23},
- {"type": "rackDescs", "id": "lb_desc6", "text": "#6", "top": 280, "left": 150, "width": 33, "height": 23},
- {"type": "rackDescs", "id": "lb_desc5", "text": "#5", "top": 310, "left": 150, "width": 33, "height": 23},
- {"type": "rackDescs", "id": "lb_desc4", "text": "#4", "top": 340, "left": 150, "width": 33, "height": 23},
- {"type": "rackDescs", "id": "lb_desc3", "text": "#3", "top": 370, "left": 150, "width": 33, "height": 23},
- {"type": "rackDescs", "id": "lb_desc2", "text": "#2", "top": 430, "left": 150, "width": 33, "height": 23},
- {"type": "rackDescs", "id": "lb_desc1", "text": "#1", "top": 460, "left": 150, "width": 33, "height": 23}],
- "crns": [{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 393,
- "left": 376,
- "width": 101,
- "height": 32
- }, {
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 408,
- "left": 200,
+ "left": 450,
"width": 1300,
- "height": 1
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 250,
- "left": 383,
- "width": 101,
- "height": 29
- }, {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 265,
- "left": 200,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack5",
+ "top": 210,
+ "left": 450,
"width": 1300,
- "height": 1
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack6",
+ "top": 260,
+ "left": 450,
+ "width": 1300,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack7",
+ "top": 280,
+ "left": 450,
+ "width": 1300,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack8",
+ "top": 330,
+ "left": 450,
+ "width": 1300,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack9",
+ "top": 455,
+ "left": 960,
+ "width": 800,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack10",
+ "top": 475,
+ "left": 960,
+ "width": 800,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack11",
+ "top": 525,
+ "left": 960,
+ "width": 800,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
+ },{
+ "type": "rack",
+ "id": "rack12",
+ "top": 545,
+ "left": 960,
+ "width": 800,
+ "height": 20,
+ "minBayNo": 1,
+ "maxBayNo": 40
}],
+ "rackDescs": [
+ {"type": "rackDescs", "id": "lb_desc1", "text": "#1", "top": 102, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc2", "text": "#2", "top": 120, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc3", "text": "#3", "top": 172, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc4", "text": "#4", "top": 192, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc5", "text": "#5", "top": 212, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc6", "text": "#6", "top": 262, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc7", "text": "#7", "top": 282, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc8", "text": "#8", "top": 332, "left": 1750, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc9", "text": "#9", "top": 457, "left": 1760, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc10", "text": "10", "top": 476, "left": 1760, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc11", "text": "11", "top": 527, "left": 1760, "width": 30, "height": 20},
+ {"type": "rackDescs", "id": "lb_desc12", "text": "12", "top": 546, "left": 1760, "width": 30, "height": 20}
+ ],
+ "crns": [
+ {"type": "crane", "id": "crn-1", "text": "1", "top": 142, "left": 376, "width": 100, "height": 30},
+ {"type": "track", "id": "lb_track1","text": "", "top": 159, "left": 450, "width": 1300, "height": 1},
+ {"type": "crane", "id": "crn-2", "text": "2", "top": 232, "left": 376, "width": 100, "height": 30},
+ {"type": "track", "id": "lb_track2","text": "", "top": 250, "left": 450, "width": 1300, "height": 1},
+ {"type": "crane", "id": "crn-3", "text": "3", "top": 302, "left": 460, "width": 100, "height": 30},
+ {"type": "track", "id": "lb_track3","text": "", "top": 320, "left": 450, "width": 1300, "height": 1},
+ {"type": "crane", "id": "crn-4", "text": "4", "top": 497, "left": 1200, "width": 100, "height": 30},
+ {"type": "track", "id": "lb_track4","text": "", "top": 515, "left": 960, "width": 800, "height": 1},
+ {"type": "track", "id": "lb_track5","text": "", "top": 612, "left": 303, "width": 1430, "height": 1},
+ {"type": "track", "id": "lb_track6","text": "", "top": 638, "left": 270 , "width": 1464, "height": 1},
+ {"type": "track", "id": "lb_track7","text": "", "top": 612, "left": 1733, "width": 1, "height": 26},
+ {"type": "track", "id": "lb_track8","text": "", "top": 100, "left": 303, "width": 1, "height": 513},
+ {"type": "track", "id": "lb_track9","text": "", "top": 100, "left": 270, "width": 33, "height": 1},
+ {"type": "track", "id": "lb_track10","text": "", "top": 100, "left": 270, "width": 1, "height": 538},
+ ],
"areas": [{
"type": "Control_floor",
"id": "tabControl_floor1",
@@ -144,190 +161,111 @@
"left": 22,
"width": 1677,
"height": 613,
- "stns": [{
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 431,
- "left": 1600,
- "width": 59,
- "height": 27
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 431,
- "left": 1520,
- "width": 59,
- "height": 27
- }, {
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 285,
- "left": 1600,
- "width": 59,
- "height": 25
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 285,
- "left": 1520,
- "width": 59,
- "height": 25
- },
- {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 431,
- "left": 1328,
- "width": 85,
- "height": 50
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 491,
- "left": 1328,
- "width": 85,
- "height": 50
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 284,
- "left": 287,
- "width": 86,
- "height": 105
- }, {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 431,
- "left": 287,
- "width": 86,
- "height": 50
- }]
- }, {
- "type": "floor",
- "id": "page_floor2",
- "text": "2F",
- "top": 4,
- "left": 22,
- "width": 1677,
- "height": 613,
- "stns": [{
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 431,
- "left": 1600,
- "width": 59,
- "height": 27
- }, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 431,
- "left": 1520,
- "width": 59,
- "height": 27
- }, {
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 285,
- "left": 1600,
- "width": 59,
- "height": 25
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 285,
- "left": 1520,
- "width": 59,
- "height": 25
- }, {
- "type": "stn",
- "id": "site-210",
- "text": "210",
- "top": 431,
- "left": 1680,
- "width": 59,
- "height": 25
- }, {
- "type": "track",
- "id": "lb_track5",
- "text": "",
- "top": 110,
- "left": 1690,
- "width": 1,
- "height": 350
- }, {
- "type": "track",
- "id": "lb_track6",
- "text": "",
- "top": 110,
- "left": 1720,
- "width": 1,
- "height": 350
- }, {
- "type": "stn",
- "id": "site-300",
- "text": "300",
- "top": 120,
- "left": 1630,
- "width": 59,
- "height": 25
- }
- , {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 120,
- "left": 1570,
- "width": 59,
- "height": 25
- }
- , {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 120,
- "left": 1510,
- "width": 59,
- "height": 25
- }
- , {
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 120,
- "left": 1450,
- "width": 59,
- "height": 25
- }
- , {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 94,
- "left": 1450,
- "width": 59,
- "height": 25
- }
- , {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 68,
- "left": 1450,
- "width": 59,
- "height": 25
- }
+ "stns": [
+ {"type": "stn", "id": "site-1091", "text": "1091", "top": 172, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1092", "text": "1092", "top": 172, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1093", "text": "1093", "top": 172, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1094", "text": "1094", "top": 193, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1095", "text": "1095", "top": 193, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1096", "text": "1096", "top": 193, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1097", "text": "1097", "top": 214, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1098", "text": "1098", "top": 214, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1099", "text": "1099", "top": 214, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1100", "text": "1100", "top": 282, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1101", "text": "1101", "top": 282, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1102", "text": "1102", "top": 282, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1103", "text": "1103", "top": 261, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1104", "text": "1104", "top": 261, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1105", "text": "1105", "top": 332, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1106", "text": "1106", "top": 332, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1107", "top": 332, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1090", "top": 367, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1089", "top": 393, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1088", "top": 393, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1087", "top": 393, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1086", "top": 456, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1085", "top": 456, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1084", "top": 456, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1083", "top": 519, "left": 307, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1082", "top": 519, "left": 355, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1081", "top": 519, "left": 403, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1079", "top": 393, "left": 625, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1078", "top": 393, "left": 673, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1077", "top": 393, "left": 721, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1075", "top": 393, "left": 769, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1074", "top": 414, "left": 769, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1073", "top": 435, "left": 769, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1061", "top": 456, "left": 769, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1063", "top": 456, "left": 721, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1064", "top": 456, "left": 673, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1065", "top": 456, "left": 625, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1066", "top": 477, "left": 769, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1067", "top": 498, "left": 769, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1068", "top": 519, "left": 769, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1070", "top": 519, "left": 721, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1071", "top": 519, "left": 673, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1072", "top": 519, "left": 625, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1050", "top": 527, "left": 913, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1051", "top": 512, "left": 817, "width": 47, "height": 35},
+ {"type": "stn", "id": "site-1107", "text": "1052", "top": 477, "left": 817, "width": 47, "height": 35},
+ {"type": "stn", "id": "site-1107", "text": "1049", "top": 548, "left": 913, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1047", "top": 548, "left": 865, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1046", "top": 548, "left": 817, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1045", "top": 569, "left": 817, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1044", "top": 590, "left": 817, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1053", "top": 456, "left": 817, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1054", "top": 456, "left": 865, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1056", "top": 456, "left": 913, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1057", "top": 477, "left": 913, "width": 47, "height": 20},
+
+ {"type": "stn", "id": "site-1107", "text": "1001", "top": 640, "left": 1340, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1002", "top": 661, "left": 1340, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1004", "top": 682, "left": 1340, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1005", "top": 682, "left": 1388, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1006", "top": 640, "left": 1436, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1007", "top": 661, "left": 1436, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1008", "top": 682, "left": 1436, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1009", "top": 682, "left": 1484, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1010", "top": 682, "left": 1532, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1011", "top": 661, "left": 1532, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1012", "top": 640, "left": 1532, "width": 47, "height": 20},
+
+ {"type": "stn", "id": "site-1107", "text": "1041", "top": 640, "left": 1050, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1042", "top": 661, "left": 1050, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1043", "top": 682, "left": 1050, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1013", "top": 682, "left": 1098, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1014", "top": 682, "left": 1146, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1015", "top": 682, "left": 1194, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1016", "top": 682, "left": 1242, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1017", "top": 661, "left": 1242, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1018", "top": 640, "left": 1242, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1019", "top": 640, "left": 1146, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1020", "top": 661, "left": 1146, "width": 47, "height": 20},
+
+ {"type": "stn", "id": "site-1107", "text": "1022", "top": 640, "left": 400, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1023", "top": 661, "left": 400, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1024", "top": 682, "left": 400, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1025", "top": 682, "left": 448, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1026", "top": 640, "left": 496, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1027", "top": 661, "left": 496, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1028", "top": 682, "left": 496, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1030", "top": 682, "left": 544, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1031", "top": 682, "left": 592, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1032", "top": 661, "left": 592, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1033", "top": 640, "left": 592, "width": 47, "height": 20},
+
+ {"type": "stn", "id": "site-1107", "text": "1034", "top": 640, "left": 650, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1035", "top": 661, "left": 650, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1036", "top": 682, "left": 650, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1038", "top": 682, "left": 698, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1039", "top": 682, "left": 746, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "1040", "top": 682, "left": 794, "width": 47, "height": 20},
+
+ {"type": "stn", "id": "site-1107", "text": "1", "top": 627, "left": 737, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "2", "top": 627, "left": 800, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "3", "top": 627, "left": 850, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "4", "top": 627, "left": 900, "width": 47, "height": 20},
+ {"type": "stn", "id": "site-1107", "text": "5", "top": 627, "left": 950, "width": 47, "height": 20},
]
}]
}]
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 6666baa..e9c7b96 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -144,8 +144,8 @@
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
<label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
-<!-- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>-->
-<!-- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>-->
+ <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 1fad194..3171813 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -34,7 +34,7 @@
<!-- 涓讳綋鍐呭 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
- Copyright 漏 2024 All Rights Reserved. <a href="" target="_blank">鑻忓窞鍐犻缚鏅鸿兘瑁呭鏈夐檺鍏徃</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2024 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
</footer>
</body>
<script>
--
Gitblit v1.9.1