From 4375805e5769179d7684a3af3e9132be68c38321 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 10 九月 2024 09:21:20 +0800
Subject: [PATCH] #fs
---
src/main/java/com/zy/asrs/entity/WrkMastCrn.java | 9
src/main/java/com/zy/asrs/utils/SteUtils.java | 376 -------
src/main/webapp/views/console-old.html | 122 --
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 102 --
src/main/webapp/views/console.html | 71 -
src/main/webapp/views/ste.html | 36
src/main/java/com/zy/asrs/controller/MonitorController.java | 33
src/main/java/com/zy/asrs/entity/WrkMast.java | 9
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 15
src/main/java/com/zy/core/ServerBootstrap.java | 65 -
src/main/java/com/zy/core/properties/SlaveProperties.java | 10
/dev/null | 799 ---------------
src/main/java/com/zy/asrs/controller/ConsoleController.java | 92 -
src/main/java/com/zy/asrs/utils/Utils.java | 180 ---
src/main/java/com/zy/asrs/controller/SteController.java | 43
src/main/java/com/zy/asrs/entity/BasJarMast.java | 16
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 1
src/main/java/com/zy/common/service/CommonService.java | 251 -----
src/main/resources/application.yml | 713 --------------
src/main/java/com/zy/asrs/entity/StaDesc.java | 10
20 files changed, 4 insertions(+), 2,949 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6d22e0a..3aef99c 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -7,29 +7,22 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
-import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
-import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
-import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
@@ -57,8 +50,6 @@
private BasDevpService basDevpService;
@Autowired
private LocMastMapper locMastMapper;
- @Autowired
- private BasCrnErrorMapper basCrnErrorMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -124,50 +115,6 @@
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆
vos.add(vo);
- }
- return R.ok().add(vos);
- }
-
- @PostMapping("/latest/data/crn")
- @ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
- public R crnLatestData(){
- List<CrnLatestDataVo> vos = new ArrayList<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- if (crnThread == null) {
- continue;
- }
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
- }
- CrnLatestDataVo vo = new CrnLatestDataVo();
- vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
-
-// Short totalBay = locMastMapper.selectTotalBay();
-
- vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
- /**
- * 鍫嗗灈鏈虹姸鎬佸垽鏂�
- */
- if (crnProtocol.getAlarm() > 0) {
- vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
- } else {
- if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
- } else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
- }
- } else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
- }
- }
- vos.add(vo);
-
}
return R.ok().add(vos);
}
@@ -253,45 +200,6 @@
}
return R.error();
- }
-
- @PostMapping("/crn/detail")
- @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam Integer crnNo){
- if (Cools.isEmpty(crnNo)){
- return R.parse(CodeRes.EMPTY);
- }
- CrnDetailVo vo = new CrnDetailVo();
- for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId().equals(crnNo)) {
- SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- vo.setCrnNo(crnNo);
- vo.setWorkNo(crnProtocol.getTaskNo());
- vo.setCrnStatus(crnProtocol.getStatusType().desc);
-
- if (crnProtocol.getAlarm() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
- vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
- }
-
- if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setSourceStaNo(wrkMast.getSourceStaNo$());
- vo.setStaNo(wrkMast.getStaNo$());
- vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
- vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
- vo.setCrnStatus(crnProtocol.getStatusType().desc);
- vo.setError(""); // todo
- }
- }
- return R.ok().add(vo);
- }
- }
- return R.error();
}
@Deprecated
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 17f7714..97ad91a 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -8,14 +8,11 @@
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.mapper.ReportQueryMapper;
-import com.zy.common.model.MatDto;
import com.zy.common.service.CommonService;
-import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.command.LedCommand;
-import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
import org.springframework.beans.factory.annotation.Autowired;
@@ -310,36 +307,6 @@
Double yDistance = 0.0D;
Double xDuration = 0.0D;
Double yDuration = 0.0D;
-
- if (null != crnId) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
- if (crnThread != null) {
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol != null) {
- xSpeed = Double.valueOf(crnProtocol.getXSpeed());
- ySpeed = Double.valueOf(crnProtocol.getYSpeed());
- zSpeed = Double.valueOf(crnProtocol.getZSpeed());
- switch (crnProtocol.getForkPos()) {
- case 0:
- forkPos = 1;
- break;
- case 1:
- forkPos = 2;
- break;
- case 2:
- forkPos = 0;
- break;
- default:
- forkPos = 1;
- break;
- }
- xDistance = Double.valueOf(crnProtocol.getXDistance());
- yDistance = Double.valueOf(crnProtocol.getYDistance());
- xDuration = Double.valueOf(crnProtocol.getXDuration());
- yDuration = Double.valueOf(crnProtocol.getYDuration());
- }
- }
- }
// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index 190ce4c..a1577a6 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -1,13 +1,11 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.param.SteModeParam;
import com.zy.asrs.domain.param.SteOperatorParam;
import com.zy.asrs.domain.vo.SteDataVo;
@@ -17,7 +15,6 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasSteService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -109,46 +106,6 @@
if (!Cools.isEmpty(steProtocol.getAlarm0())) {
vo.setAlarm2(String.valueOf(steProtocol.getAlarm0()));
}
- }
- return R.ok().add(list);
- }
-
- @PostMapping("/table/ste/msg")
- @ManagerAuth(memo = "绌挎杞︽暟鎹〃")
- public R steMsgTable(){
- List<SteMsgTableVo> list = new ArrayList<>();
- List<BasSte> stes = basSteService.selectList(new EntityWrapper<BasSte>().orderBy("ste_no"));
- for (BasSte basSte : stes) {
- // 琛ㄦ牸琛�
- SteMsgTableVo vo = new SteMsgTableVo();
- vo.setSteNo(basSte.getSteNo()); // 绌挎杞﹀彿
- list.add(vo);
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo());
- if (steThread == null) {
- continue;
- }
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) {
- continue;
- }
-
- vo.setWorkNo(steProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
- if (steProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(steProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
- vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯
- vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔�
- vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣�
- vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
- }
- } else {
- vo.setStatus(steProtocol.mode == 1? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
- }
- vo.setSpeed(steProtocol.getSpeed()); // 閫熷害
- vo.setCloser(steProtocol.getCloser()); // 杩戠偣璺濈
- vo.setPakMk(steProtocol.getPakMk()); // 浣滀笟鏍囪
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
deleted file mode 100644
index 99b6d01..0000000
--- a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.zy.asrs.domain.enums;
-
-/**
- * 鍫嗗灈鏈虹姸鎬佹灇涓�
- */
-public enum CrnStatusType {
-
- // 鍏ュ簱
- MACHINE_PAKIN("鍏ュ簱"),
- // 鍑哄簱
- MACHINE_PAKOUT("鍑哄簱"),
- // 搴撳埌搴�
- MACHINE_STOCK_MOVE("搴撳埌搴�"),
- // 绔欏埌绔�
- MACHINE_SITE_MOVE("绔欏埌绔�"),
- // p to p
- MACHINE_P_MOVE("PToP"),
- // 寮傚父
- MACHINE_ERROR("寮傚父"),
- // 鑷姩
- MACHINE_AUTO("鑷姩"),
- // 闈炶嚜鍔�/鎵嬪姩
- MACHINE_UN_AUTO("闈炶嚜鍔�"),
- ;
-
- private String desc;
- CrnStatusType(String desc){
- this.desc = desc;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public static CrnStatusType process(Integer ioType){
- if (ioType>100) {
- return MACHINE_PAKOUT;
- } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
- return MACHINE_PAKIN;
- } else if (ioType == 3) {
- return MACHINE_SITE_MOVE;
- } else if (ioType == 11) {
- return MACHINE_STOCK_MOVE;
- } else {
- return MACHINE_ERROR;
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
deleted file mode 100644
index 434cedc..0000000
--- a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.asrs.domain.vo;
-
-import lombok.Data;
-
-/**
- * 鍫嗗灈鏈鸿鎯呰鍥惧璞�
- * Created by vincent on 2020-06-03
- */
-@Data
-public class CrnDetailVo {
-
- // 鍫嗗灈鏈哄彿
- private Integer crnNo;
-
- // 宸ヤ綔鍙�
- private Short workNo;
-
- // 婧愮珯
- private String sourceStaNo = "";
-
- // 鐩爣绔�
- private String staNo = "";
-
- // 宸ヤ綔鐘舵��
- private String wrkSts = "";
-
- // 鍑哄叆绫诲瀷
- private String ioType = "";
-
- // 婧愬簱浣�
- private String sourceLocNo = "";
-
- // 鐩爣搴撲綅
- private String locNo = "";
-
- // 鍫嗗灈鏈虹姸鎬�
- private String crnStatus = "";
-
- // 寮傚父
- private String error = "";
-
-}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
deleted file mode 100644
index 3200202..0000000
--- a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zy.asrs.domain.vo;
-
-import com.zy.asrs.domain.enums.CrnStatusType;
-import lombok.Data;
-
-/**
- * 鍫嗗灈鏈烘渶鏂版暟鎹鍥惧璞�
- * Created by vincent on 2020-06-01
- */
-@Data
-public class CrnLatestDataVo {
-
- // 鍫嗗灈鏈虹紪鍙�
- private Integer crnId;
-
- // 鍋忕Щ閲�
- private Double offset;
-
- // 褰撳墠鍒�
- private Short bay;
-
- private CrnStatusType crnStatus;
-
- public String getCrnStatus(){
- return crnStatus.toString().toLowerCase().replaceAll("_", "-");
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
deleted file mode 100644
index ef124a3..0000000
--- a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.zy.asrs.domain.vo;
-
-import com.zy.asrs.utils.Utils;
-import lombok.Data;
-
-/**
- * Created by vincent on 2020-06-02
- */
-@Data
-public class CrnMsgTableVo {
-
- // 鍫嗗灈鏈哄彿
- private Integer crnNo;
-
- // 宸ヤ綔鍙�
- private Short workNo = 0;
-
- // 鐘舵��
- private String status = "-";
-
- // 婧愮珯
- private String sourceStaNo = "-";
-
- // 鐩爣绔�
- private String staNo = "-";
-
- // 婧愬簱浣�
- private String sourceLocNo = "-";
-
- // 鐩爣搴撲綅
- private String locNo = "-";
-
- // 寮傚父
- private String error = "";
-
- // 鍘熺偣
- private String origin = "";
-
- // 鍛戒护
- private String command = "";
-
- // 璧拌閫熷害锛坢/min)
- private Float xspeed = 0.0F;
-
- // 鍗囬檷閫熷害锛坢/min)
- private Float yspeed = 0.0F;
-
- // 鍙夌墮閫熷害锛坢/min)
- private Float zspeed = 0.0F;
-
- // 璧拌璺濈(Km)
- private Float xdistance = 0.0F;
-
- // 鍗囬檷璺濈(Km)
- private Float ydistance = 0.0F;
-
- // 璧拌鏃堕暱(H)
- private Float xduration = 0.0F;
-
- // 鍗囬檷鏃堕暱(H)
- private Float yduration = 0.0F;
-
- public void setXspeed(Float xspeed) {
- this.xspeed = Utils.scale(xspeed);
- }
-
- public void setYspeed(Float yspeed) {
- this.yspeed = Utils.scale(yspeed);
- }
-
- public void setZspeed(Float zspeed) {
- this.zspeed = Utils.scale(zspeed);
- }
-
- public void setXdistance(Float xdistance) {
- this.xdistance = Utils.scale(xdistance);
- }
-
- public void setYdistance(Float ydistance) {
- this.ydistance = Utils.scale(ydistance);
- }
-
- public void setXduration(Float xduration) {
- this.xduration = Utils.scale(xduration);
- }
-
- public void setYduration(Float yduration) {
- this.yduration = Utils.scale(yduration);
- }
-}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
deleted file mode 100644
index 4e9f53a..0000000
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.zy.asrs.domain.vo;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020-06-02
- */
-@Data
-public class CrnStateTableVo {
-
- // 鍫嗗灈鏈哄彿
- private Integer crnNo;
-
- // 妯″紡
- private String statusType = "-";
-
- // 鏈夌墿
- private String loading = "-";
-
- // 鍒�
- private Short bay;
-
- // 灞�
- private Short lev;
-
- // 璧拌鍘熺偣
- private String xOrigin = "-";
-
- // 鍗囬檷鍘熺偣
- private String yOrigin = "-";
-
- // 璐у弶浣嶇疆
- private String forkOffset = "-";
-
- // 杞借揣鍙颁綅缃�
- private String liftPos = "-";
-
- // 璧拌瀹氫綅
- private String walkPos = "-";
-
- // 鎬ュ仠
- private String stop = "-";
-
- // 鍒楀潗鏍�
- private String bayCoor = "-";
-
- // 灞傚潗鏍�
- private String levCoor = "-";
-
- // 瀹屾垚
- private String complete = "-";
-
- // 浠诲姟鍙�
- private Short workNo = 0;
-
- // 鐘舵��
- private String status = "-";
-
- // 寮傚父鐮�
- private String warnCode = "-";
-
- // 鍨傜洿鏁呴殰鐮�
- private String alarm = "-";
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
deleted file mode 100644
index 8702140..0000000
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("asr_bas_crn_error")
-public class BasCrnError implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 寮傚父浠ｅ彿
- */
- @ApiModelProperty(value= "寮傚父浠ｅ彿")
- @TableId(value = "error_code", type = IdType.AUTO)
- @TableField("error_code")
- private Long errorCode;
-
- /**
- * 寮傚父鎻忚堪
- */
- @ApiModelProperty(value= "寮傚父鎻忚堪")
- @TableField("err_name")
- private String errName;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- public BasCrnError() {}
-
- public BasCrnError(String errName, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
- this.errName = errName;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// BasCrnError basCrnError = new BasCrnError(
-// null, // 寮傚父鎻忚堪
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public Long getErrorCode() {
- return errorCode;
- }
-
- public void setErrorCode(Long errorCode) {
- this.errorCode = errorCode;
- }
-
- public String getErrName() {
- return errName;
- }
-
- public void setErrName(String errName) {
- this.errName = errName;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
deleted file mode 100644
index ed98925..0000000
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("asr_bas_crn_opt")
-public class BasCrnOpt implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 浠诲姟鍙�
- */
- @ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
-
- /**
- * 鍫嗗灈鏈�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- @TableField("crn_no")
- private Integer crnNo;
-
- /**
- * 涓嬪彂鏃堕棿
- */
- @ApiModelProperty(value= "涓嬪彂鏃堕棿")
- @TableField("send_time")
- private Date sendTime;
-
- /**
- * 妯″紡
- */
- @ApiModelProperty(value= "妯″紡")
- private String mode;
-
- /**
- * 婧愭帓
- */
- @ApiModelProperty(value= "婧愭帓")
- @TableField("source_row")
- private Integer sourceRow;
-
- /**
- * 婧愬垪
- */
- @ApiModelProperty(value= "婧愬垪")
- @TableField("source_bay")
- private Integer sourceBay;
-
- /**
- * 婧愬眰
- */
- @ApiModelProperty(value= "婧愬眰")
- @TableField("source_lev")
- private Integer sourceLev;
-
- /**
- * 婧愮珯
- */
- @ApiModelProperty(value= "婧愮珯")
- @TableField("source_sta")
- private Integer sourceSta;
-
- /**
- * 鐩爣鎺�
- */
- @ApiModelProperty(value= "鐩爣鎺�")
- @TableField("pos_row")
- private Integer posRow;
-
- /**
- * 鐩爣鍒�
- */
- @ApiModelProperty(value= "鐩爣鍒�")
- @TableField("pos_bay")
- private Integer posBay;
-
- /**
- * 鐩爣灞�
- */
- @ApiModelProperty(value= "鐩爣灞�")
- @TableField("pos_lev")
- private Integer posLev;
-
- /**
- * 鐩爣绔�
- */
- @ApiModelProperty(value= "鐩爣绔�")
- @TableField("pos_sta")
- private Integer posSta;
-
- /**
- * 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
- */
- @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
- private Integer response;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- private Date updateTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("update_by")
- private Long updateBy;
-
- public BasCrnOpt() {}
-
- public BasCrnOpt(Integer wrkNo,Integer crnNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy) {
- this.wrkNo = wrkNo;
- this.crnNo = crnNo;
- this.sendTime = sendTime;
- this.mode = mode;
- this.sourceRow = sourceRow;
- this.sourceBay = sourceBay;
- this.sourceLev = sourceLev;
- this.sourceSta = sourceSta;
- this.posRow = posRow;
- this.posBay = posBay;
- this.posLev = posLev;
- this.posSta = posSta;
- this.response = response;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- }
-
-// BasCrnOpt basCrnOpt = new BasCrnOpt(
-// null, // 浠诲姟鍙�
-// null, // 鍫嗗灈鏈篬闈炵┖]
-// null, // 涓嬪彂鏃堕棿
-// null, // 妯″紡
-// null, // 婧愭帓
-// null, // 婧愬垪
-// null, // 婧愬眰
-// null, // 婧愮珯
-// null, // 鐩爣鎺�
-// null, // 鐩爣鍒�
-// null, // 鐩爣灞�
-// null, // 鐩爣绔�
-// null, // 鍝嶅簲缁撴灉
-// null, // 淇敼鏃堕棿
-// null // 淇敼浜哄憳
-// );
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Integer getCrnNo() {
- return crnNo;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public Date getSendTime() {
- return sendTime;
- }
-
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
- }
-
- public void setSendTime(Date sendTime) {
- this.sendTime = sendTime;
- }
-
- public String getMode() {
- return mode;
- }
-
- public void setMode(String mode) {
- this.mode = mode;
- }
-
- public Integer getSourceRow() {
- return sourceRow;
- }
-
- public void setSourceRow(Integer sourceRow) {
- this.sourceRow = sourceRow;
- }
-
- public Integer getSourceBay() {
- return sourceBay;
- }
-
- public void setSourceBay(Integer sourceBay) {
- this.sourceBay = sourceBay;
- }
-
- public Integer getSourceLev() {
- return sourceLev;
- }
-
- public void setSourceLev(Integer sourceLev) {
- this.sourceLev = sourceLev;
- }
-
- public Integer getSourceSta() {
- return sourceSta;
- }
-
- public void setSourceSta(Integer sourceSta) {
- this.sourceSta = sourceSta;
- }
-
- public Integer getPosRow() {
- return posRow;
- }
-
- public void setPosRow(Integer posRow) {
- this.posRow = posRow;
- }
-
- public Integer getPosBay() {
- return posBay;
- }
-
- public void setPosBay(Integer posBay) {
- this.posBay = posBay;
- }
-
- public Integer getPosLev() {
- return posLev;
- }
-
- public void setPosLev(Integer posLev) {
- this.posLev = posLev;
- }
-
- public Integer getPosSta() {
- return posSta;
- }
-
- public void setPosSta(Integer posSta) {
- this.posSta = posSta;
- }
-
- public Integer getResponse() {
- return response;
- }
-
- public String getResponse$(){
- if (null == this.response){ return null; }
- switch (this.response){
- case 1:
- return "姝ｅ父";
- case 0:
- return "澶辫触";
- default:
- return String.valueOf(this.response);
- }
- }
-
- public void setResponse(Integer response) {
- this.response = response;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Long getUpdateBy() {
- return updateBy;
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setUpdateBy(Long updateBy) {
- this.updateBy = updateBy;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
deleted file mode 100644
index 6b92323..0000000
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ /dev/null
@@ -1,481 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("asr_bas_crnp")
-public class BasCrnp implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "crn_no", type = IdType.INPUT)
- @TableField("crn_no")
- private Integer crnNo;
-
- /**
- * 鍙叆
- */
- @ApiModelProperty(value= "鍙叆")
- @TableField("in_enable")
- private String inEnable;
-
- /**
- * 鍙嚭
- */
- @ApiModelProperty(value= "鍙嚭")
- @TableField("out_enable")
- private String outEnable;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty(value= "鐘舵��")
- @TableField("crn_sts")
- private Integer crnSts;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty(value= "鐘舵��1")
- @TableField("crn_status_one")
- private Integer crnStatusOne;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty(value= "鐘舵��2")
- @TableField("crn_status_two")
- private Integer crnStatusTwo;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no_two")
- private Integer wrkNoTwo;
-
- /**
- * 寮傚父鐮�
- */
- @ApiModelProperty(value= "寮傚父鐮�")
- @TableField("crn_err")
- private Long crnErr;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("frm_locno")
- private String frmLocno;
-
- /**
- * 婧愮珯
- */
- @ApiModelProperty(value= "婧愮珯")
- @TableField("frm_sta")
- private Integer frmSta;
-
- /**
- * 鐩爣绔�
- */
- @ApiModelProperty(value= "鐩爣绔�")
- @TableField("to_sta")
- private Integer toSta;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("to_locno")
- private String toLocno;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- @ApiModelProperty(value= "")
- @TableField("hp_mk")
- private String hpMk;
-
- @ApiModelProperty(value= "")
- @TableField("retrieve_mk")
- private String retrieveMk;
-
- @ApiModelProperty(value= "")
- @TableField("ctl_hp")
- private String ctlHp;
-
- @ApiModelProperty(value= "")
- @TableField("ctl_rest")
- private String ctlRest;
-
- @ApiModelProperty(value= "")
- @TableField("emp_in")
- private String empIn;
-
- @ApiModelProperty(value= "")
- @TableField("tank_qty")
- private Integer tankQty;
-
- @ApiModelProperty(value= "")
- @TableField("tank_qty1")
- private Integer tankQty1;
-
- public BasCrnp() {}
-
- public BasCrnp(String inEnable,String outEnable,Integer crnSts,Integer wrkNo,Long crnErr,String frmLocno,Integer frmSta,Integer toSta,String toLocno,Long appeUser,Date appeTime,Long modiUser,Date modiTime,String hpMk,String retrieveMk,String ctlHp,String ctlRest,String empIn,Integer tankQty,Integer tankQty1) {
- this.inEnable = inEnable;
- this.outEnable = outEnable;
- this.crnSts = crnSts;
- this.wrkNo = wrkNo;
- this.crnErr = crnErr;
- this.frmLocno = frmLocno;
- this.frmSta = frmSta;
- this.toSta = toSta;
- this.toLocno = toLocno;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.hpMk = hpMk;
- this.retrieveMk = retrieveMk;
- this.ctlHp = ctlHp;
- this.ctlRest = ctlRest;
- this.empIn = empIn;
- this.tankQty = tankQty;
- this.tankQty1 = tankQty1;
- }
-
-// BasCrnp basCrnp = new BasCrnp(
-// null, // 鍙叆
-// null, // 鍙嚭
-// null, // 鐘舵��
-// null, // 宸ヤ綔鍙�
-// null, // 寮傚父鐮�
-// null, // 婧愬簱浣�
-// null, // 婧愮珯
-// null, // 鐩爣绔�
-// null, // 鐩爣搴撲綅
-// null, // 鍒涘缓鑰�
-// null, // 鍒涘缓鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public Integer getCrnNo() {
- return crnNo;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public String getInEnable() {
- return inEnable;
- }
-
- public void setInEnable(String inEnable) {
- this.inEnable = inEnable;
- }
-
- public String getOutEnable() {
- return outEnable;
- }
-
- public void setOutEnable(String outEnable) {
- this.outEnable = outEnable;
- }
-
- public Integer getCrnSts() {
- return crnSts;
- }
-
- public void setCrnSts(Integer crnSts) {
- this.crnSts = crnSts;
- }
-
- public Integer getCrnStatusOne() {
- return crnStatusOne;
- }
-
- public void setCrnStatusOne(Integer crnStatusOne) {
- this.crnStatusOne = crnStatusOne;
- }
-
- public Integer getCrnStatusTwo() {
- return crnStatusTwo;
- }
-
- public void setCrnStatusTwo(Integer crnStatusTwo) {
- this.crnStatusTwo = crnStatusTwo;
- }
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Integer getWrkNoTwo() {
- return wrkNoTwo;
- }
-
- public void setWrkNoTwo(Integer wrkNoTwo) {
- this.wrkNoTwo = wrkNoTwo;
- }
-
- public Long getCrnErr() {
- return crnErr;
- }
-
- public void setCrnErr(Long crnErr) {
- this.crnErr = crnErr;
- }
-
- public String getFrmLocno() {
- return frmLocno;
- }
-
- public String getFrmLocno$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.frmLocno);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public void setFrmLocno(String frmLocno) {
- this.frmLocno = frmLocno;
- }
-
- public Integer getFrmSta() {
- return frmSta;
- }
-
- public String getFrmSta$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.frmSta);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public void setFrmSta(Integer frmSta) {
- this.frmSta = frmSta;
- }
-
- public Integer getToSta() {
- return toSta;
- }
-
- public String getToSta$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.toSta);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public void setToSta(Integer toSta) {
- this.toSta = toSta;
- }
-
- public String getToLocno() {
- return toLocno;
- }
-
- public String getToLocno$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.toLocno);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public void setToLocno(String toLocno) {
- this.toLocno = toLocno;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public String getHpMk() {
- return hpMk;
- }
-
- public void setHpMk(String hpMk) {
- this.hpMk = hpMk;
- }
-
- public String getRetrieveMk() {
- return retrieveMk;
- }
-
- public void setRetrieveMk(String retrieveMk) {
- this.retrieveMk = retrieveMk;
- }
-
- public String getCtlHp() {
- return ctlHp;
- }
-
- public void setCtlHp(String ctlHp) {
- this.ctlHp = ctlHp;
- }
-
- public String getCtlRest() {
- return ctlRest;
- }
-
- public void setCtlRest(String ctlRest) {
- this.ctlRest = ctlRest;
- }
-
- public String getEmpIn() {
- return empIn;
- }
-
- public void setEmpIn(String empIn) {
- this.empIn = empIn;
- }
-
- public Integer getTankQty() {
- return tankQty;
- }
-
- public void setTankQty(Integer tankQty) {
- this.tankQty = tankQty;
- }
-
- public Integer getTankQty1() {
- return tankQty1;
- }
-
- public void setTankQty1(Integer tankQty1) {
- this.tankQty1 = tankQty1;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index 432037d..715cd58 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -5,15 +5,10 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasJarMastStatusService;
-import com.zy.asrs.entity.BasJarMastStatus;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -232,15 +227,6 @@
// null, // 鍒涘缓鏃堕棿
// null // 鏇存柊鏃堕棿
// );
-
- public String getStatus$(){
- BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
- BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.status.toString()));
- if (!Cools.isEmpty(basJarMastStatus)){
- return String.valueOf(basJarMastStatus.getBoxSpecs());
- }
- return null;
- }
// public String getStatus$(){
// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index 9c61158..feeb779 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -183,15 +182,6 @@
public Integer getCrnNo() {
return crnNo;
- }
-
- public String getCrnNo$(){
- BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
- return String.valueOf(basCrnp.getCrnNo());
- }
- return null;
}
public void setCrnNo(Integer crnNo) {
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 18c3ff5..8c03867 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -364,15 +364,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getCrnNo$(){
- BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
- return String.valueOf(basCrnp.getCrnNo());
- }
- return null;
- }
-
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastCrn.java b/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
index 7cfdc2e..7d403da 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
@@ -229,15 +229,6 @@
// null // 婧愬簱浣�2
// );
- public String getCrnNo$(){
- BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
- return String.valueOf(basCrnp.getCrnNo());
- }
- return null;
- }
-
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index b71ecda..1266ed9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -6,13 +6,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasJarMastStatusService;
-import com.zy.asrs.entity.BasJarMastStatus;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -265,15 +259,6 @@
default:
return String.valueOf(this.wrkType);
}
- }
-
- public String getWrkSts$(){
- BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
- BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basJarMastStatus)){
- return String.valueOf(basJarMastStatus.getId());
- }
- return null;
}
/**
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
deleted file mode 100644
index 5323679..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.BasCrnError;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasCrnErrorMapper extends BaseMapper<BasCrnError> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
deleted file mode 100644
index 744c664..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.BasCrnOpt;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasCrnOptMapper extends BaseMapper<BasCrnOpt> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
deleted file mode 100644
index baffc35..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.BasCrnp;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasCrnpMapper extends BaseMapper<BasCrnp> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasCrnOptService.java b/src/main/java/com/zy/asrs/service/BasCrnOptService.java
deleted file mode 100644
index 7538c73..0000000
--- a/src/main/java/com/zy/asrs/service/BasCrnOptService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.BasCrnOpt;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface BasCrnOptService extends IService<BasCrnOpt> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpService.java b/src/main/java/com/zy/asrs/service/BasCrnpService.java
deleted file mode 100644
index 10c3feb..0000000
--- a/src/main/java/com/zy/asrs/service/BasCrnpService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.BasCrnp;
-
-public interface BasCrnpService extends IService<BasCrnp> {
-
- BasCrnp checkSiteStatus(Integer crnId);
-
- boolean checkSiteError(Integer crnNo, boolean pakin);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasJarMastService.java b/src/main/java/com/zy/asrs/service/BasJarMastService.java
deleted file mode 100644
index ff43bbc..0000000
--- a/src/main/java/com/zy/asrs/service/BasJarMastService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.BasJarMast;
-import com.baomidou.mybatisplus.service.IService;
-
-import java.util.List;
-
-public interface BasJarMastService extends IService<BasJarMast> {
-
- BasJarMast getJarMastByWrkNo(Long wrkNo);
-
- List<BasJarMast> getJarMastByJarId(Integer jarId);
-
- List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer statusStart,Integer statusEnd);
-
- List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,List<Integer> statusList);
-
- List<BasJarMast> getJarMastByJarIdAndStatusListCharge(Integer jarId,List<Integer> statusList);
-
- List<BasJarMast> getJarMastByJarIdAndStatusListB(Integer jarId,List<Integer> statusList);
-
- List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer type);
-
- BasJarMast getJarMastByJarIdMax(Integer jarId);
-
- BasJarMast getJarMastByJarIdMax(Integer jarId,Integer statusStart,Integer statusEnd);
- BasJarMast getJarMastByJarIdMaxB(Integer jarId,Integer statusStart,Integer statusEnd);
-
- BasJarMast getJarMastByJarIdMin(Integer jarId);
-
- BasJarMast getJarMastByJarIdMin(Integer jarId,Integer statusStart,Integer statusEnd);
- BasJarMast getJarMastByJarIdMinB(Integer jarId,Integer statusStart,Integer statusEnd);
-
- Integer getJarMastByJarIdCount(Integer jarId);
-
- Integer selectJarMastOperation(Integer jarId,Integer statusStart,Integer statusEnd);
-
- Integer selectJarMastOperation(Integer jarId,List<Integer> statusList);
-
- Integer selectJarMastOperation(Integer jarId,Integer type);
-
- Integer updateStatus(Integer jarId,Integer status,Integer statusUpdate);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasJarMastStatusService.java b/src/main/java/com/zy/asrs/service/BasJarMastStatusService.java
deleted file mode 100644
index f19f3ec..0000000
--- a/src/main/java/com/zy/asrs/service/BasJarMastStatusService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.BasJarMastStatus;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface BasJarMastStatusService extends IService<BasJarMastStatus> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasJarService.java b/src/main/java/com/zy/asrs/service/BasJarService.java
deleted file mode 100644
index 1e9a633..0000000
--- a/src/main/java/com/zy/asrs/service/BasJarService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.BasJar;
-import com.baomidou.mybatisplus.service.IService;
-
-import java.util.List;
-
-public interface BasJarService extends IService<BasJar> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
deleted file mode 100644
index 299afa8..0000000
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.BasCrnOptMapper;
-import com.zy.asrs.entity.BasCrnOpt;
-import com.zy.asrs.service.BasCrnOptService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basCrnOptService")
-public class BasCrnOptServiceImpl extends ServiceImpl<BasCrnOptMapper, BasCrnOpt> implements BasCrnOptService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
deleted file mode 100644
index 982f348..0000000
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.mapper.BasCrnpMapper;
-import com.zy.asrs.service.BasCrnpService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service("basCrnpService")
-public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
-
- @Override
- public BasCrnp checkSiteStatus(Integer crnId) {
- BasCrnp crnp = this.selectById(crnId);
- if (Cools.isEmpty(crnp)) {
- throw new CoolException(crnId + "鍙峰爢鍨涙満涓嶅瓨鍦�");
- }
- if ("N".equals(crnp.getInEnable())) {
- throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙叆");
- }
- if ("N".equals(crnp.getOutEnable())) {
- throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙嚭");
- }
- return crnp;
- }
-
- @Override
- public boolean checkSiteError(Integer crnNo, boolean pakin) {
- BasCrnp crnp = this.selectById(crnNo);
- if (Cools.isEmpty(crnp)) {
- log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
- return false;
- }
- if (pakin) {
- if ("N".equals(crnp.getInEnable())) {
- log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
- return false;
- }
- } else {
- if ("N".equals(crnp.getOutEnable())) {
- log.error("{}鍙峰爢鍨涙満涓嶅彲鍑�", crnNo);
- return false;
- }
- }
- if (crnp.getCrnSts() != null) {
- if (crnp.getCrnSts() == 10) {
- log.error("{}鍙峰爢鍨涙満鐘舵�佷负10.閿欒", crnNo);
- return false;
- }
- }
-// if (crnp.getCrnErr() != null) {
-// if (crnp.getCrnErr() != 0) {
-// log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
-// return false;
-// }
-// }
- return true;
- }
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
deleted file mode 100644
index c9294b6..0000000
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.BasJarMastMapper;
-import com.zy.asrs.entity.BasJarMast;
-import com.zy.asrs.service.BasJarMastService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("basJarMastService")
-public class BasJarMastServiceImpl extends ServiceImpl<BasJarMastMapper, BasJarMast> implements BasJarMastService {
-
- /*
- * 鑾峰彇BasJarMast
- * */
- @Override
- public BasJarMast getJarMastByWrkNo(Long wrkNo) {
- return this.baseMapper.getJarMastByWrkNo(wrkNo);
- }
-
- @Override
- public List<BasJarMast> getJarMastByJarId(Integer jarId) {
- return this.baseMapper.getJarMastByJarId(jarId);
- }
-
- @Override
- public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer statusStart,Integer statusEnd) {
- ArrayList<Integer> statusList = new ArrayList<>();
- for (Integer i = statusStart;i<=statusEnd;i++){
- statusList.add(i);
- }
- return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
- }
- @Override
- public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,List<Integer> statusList) {
- return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
- }
-
- @Override
- public List<BasJarMast> getJarMastByJarIdAndStatusListB(Integer jarId,List<Integer> statusList) {
- return this.baseMapper.getJarMastByJarIdAndStatusListB(jarId,statusList);
- }
-
- @Override
- public List<BasJarMast> getJarMastByJarIdAndStatusListCharge(Integer jarId,List<Integer> statusList) {
- return this.baseMapper.getJarMastByJarIdAndStatusListCharge(jarId,statusList);
- }
-
- @Override
- public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer type) {
- ArrayList<Integer> statusList = new ArrayList<>();
- switch (type){
- default:
- statusList.add(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
- case 7://鍑哄喎鍗存Ы浠诲姟
- case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
- case 5://寮�鍑烘枡闂ㄤ换鍔�
- statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
- case 4://鍑虹～鍖栫綈浠诲姟
- statusList.add(11);//鍐峰嵈涓�
-
- if (type!=6){
- statusList.add(12);//鍐峰嵈瀹屾垚
- }
- statusList.add(13);//鍐峰嵈瀹屾垚绛夊緟灏忚溅
- if (type!=7){
- statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
- }
- case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
-
- case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- statusList.add(0);//鍒濆
-
- case 1://寮�杩涙枡闂ㄤ换鍔�
- statusList.add(2);//杩涙枡闂ㄦ墦寮�
-
- case 0://鍏ョ～鍖栫綈浠诲姟
- statusList.add(1);//寮�杩涙枡闂ㄤ腑
- statusList.add(3);//鍏ョ～鍖栫綈涓�
-
- if (type!=6){
- statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
- }
- if (type!=5 && type!=6){
- statusList.add(6);//纭寲瀹屾垚
- }
-
- statusList.add(7);//寮�鍑烘枡闂ㄤ腑
-
- if (type!=4 && type!=6){
- statusList.add(8);//鍑烘枡闂ㄦ墦寮�
- }
-
- statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
-
- statusList.add(15);//鍑哄喎鍗存Ы涓�
- statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
-
- }
- return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
- }
-
- /*
- * 鑾峰彇jarLocDigit鏈�澶х殑BasJarMast
- * */
- @Override
- public BasJarMast getJarMastByJarIdMax(Integer jarId) {
- List<Integer> statusList = new ArrayList<Integer>(){{add(0);add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);add(11);add(12);add(13);add(14);add(15);}};
- return this.baseMapper.getJarMastByJarIdMax(jarId,statusList);
- }
-
- @Override
- public BasJarMast getJarMastByJarIdMax(Integer jarId,Integer statusStart,Integer statusEnd) {
- ArrayList<Integer> statusList = new ArrayList<>();
- for (Integer i = statusStart;i<=statusEnd;i++){
- statusList.add(i);
- }
- return this.baseMapper.getJarMastByJarIdMax(jarId,statusList);
- }
-
- @Override
- public BasJarMast getJarMastByJarIdMaxB(Integer jarId,Integer statusStart,Integer statusEnd) {
- ArrayList<Integer> statusList = new ArrayList<>();
- for (Integer i = statusStart;i<=statusEnd;i++){
- statusList.add(i);
- }
- return this.baseMapper.getJarMastByJarIdMaxB(jarId,statusList);
- }
-
-
- /*
- * 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
- * */
- @Override
- public BasJarMast getJarMastByJarIdMin(Integer jarId) {
- List<Integer> statusList = new ArrayList<Integer>(){{add(0);add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);add(11);add(12);add(13);add(14);add(15);}};
- return this.baseMapper.getJarMastByJarIdMin(jarId,statusList);
- }
-
- /*
- * 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
- * */
- @Override
- public BasJarMast getJarMastByJarIdMin(Integer jarId,Integer statusStart,Integer statusEnd) {
- List<Integer> statusList = new ArrayList<>();
- for (Integer i = statusStart;i<=statusEnd;i++){
- statusList.add(i);
- }
- return this.baseMapper.getJarMastByJarIdMin(jarId,statusList);
- }
-
- /*
- * 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
- * */
- @Override
- public BasJarMast getJarMastByJarIdMinB(Integer jarId,Integer statusStart,Integer statusEnd) {
- List<Integer> statusList = new ArrayList<>();
- for (Integer i = statusStart;i<=statusEnd;i++){
- statusList.add(i);
- }
- return this.baseMapper.getJarMastByJarIdMinB(jarId,statusList);
- }
-
- @Override
- public Integer getJarMastByJarIdCount(Integer jarId) {
- return this.baseMapper.getJarMastByJarIdCount(jarId);
- }
-
- @Override
- public Integer selectJarMastOperation(Integer jarId,Integer statusStart,Integer statusEnd) {
- ArrayList<Integer> statusList = new ArrayList<>();
- for (Integer i = statusStart;i<=statusEnd;i++){
- statusList.add(i);
- }
- return this.baseMapper.selectJarMastOperationByStatusList(jarId,statusList);
- }
-
- @Override
- public Integer selectJarMastOperation(Integer jarId,List<Integer> statusList) {
- return this.baseMapper.selectJarMastOperationByStatusList(jarId,statusList);
- }
-
- @Override
- public Integer selectJarMastOperation(Integer jarId,Integer type) {
- ArrayList<Integer> statusList = new ArrayList<>();
- switch (type){
- default:
- statusList.add(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
- case 7://鍑哄喎鍗存Ы浠诲姟
- case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
- case 5://寮�鍑烘枡闂ㄤ换鍔�
- statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
- case 4://鍑虹～鍖栫綈浠诲姟
- statusList.add(11);//鍐峰嵈涓�
-
- if (type!=6){
- statusList.add(12);//鍐峰嵈瀹屾垚
- }
- statusList.add(13);//鍐峰嵈瀹屾垚绛夊緟灏忚溅
- if (type!=7){
- statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
- }
- case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- if (type!=6){
- statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
- }
- case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- statusList.add(0);//鍒濆
-
- case 1://寮�杩涙枡闂ㄤ换鍔�
- statusList.add(2);//杩涙枡闂ㄦ墦寮�
-
- case 0://鍏ョ～鍖栫綈浠诲姟
- statusList.add(1);//寮�杩涙枡闂ㄤ腑
- statusList.add(3);//鍏ョ～鍖栫綈涓�
-
- if (type!=6 && type!=3){
- statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
- }
- if (type!=5 && type!=6){
- statusList.add(6);//纭寲瀹屾垚
- }
-
- statusList.add(7);//寮�鍑烘枡闂ㄤ腑
-
- if (type!=4 && type!=6){
- statusList.add(8);//鍑烘枡闂ㄦ墦寮�
- }
-
- statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
-
- statusList.add(15);//鍑哄喎鍗存Ы涓�
- statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
-
- }
- return this.baseMapper.selectJarMastOperationByStatusList(jarId,statusList);
- }
-
- @Override
- public Integer updateStatus(Integer jarId,Integer status,Integer statusUpdate) {
- return this.baseMapper.updateStatus(jarId,status,statusUpdate);
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastStatusServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastStatusServiceImpl.java
deleted file mode 100644
index 746d619..0000000
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastStatusServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.BasJarMastStatusMapper;
-import com.zy.asrs.entity.BasJarMastStatus;
-import com.zy.asrs.service.BasJarMastStatusService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basJarMastStatusService")
-public class BasJarMastStatusServiceImpl extends ServiceImpl<BasJarMastStatusMapper, BasJarMastStatus> implements BasJarMastStatusService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java
deleted file mode 100644
index 7be688b..0000000
--- a/src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.BasJarMapper;
-import com.zy.asrs.entity.BasJar;
-import com.zy.asrs.service.BasJarService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basJarService")
-public class BasJarServiceImpl extends ServiceImpl<BasJarMapper, BasJar> implements BasJarService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 6782c06..53fecbb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,50 +1,9 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-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.common.R;
-import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.WorkNoType;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.mapper.*;
-import com.zy.asrs.service.*;
-import com.zy.asrs.utils.*;
-import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.MatDto;
-import com.zy.common.model.SearchLocParam;
-import com.zy.common.model.StartupDto;
-import com.zy.common.service.CommonService;
-import com.zy.common.utils.CollectionUtils;
-import com.zy.common.utils.HttpHandler;
-import com.zy.common.utils.RedisUtil;
-import com.zy.common.utils.RgvUtils;
-import com.zy.core.CrnThread;
-import com.zy.core.DevpThread;
-import com.zy.core.Slave;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.*;
-import com.zy.core.model.*;
-import com.zy.core.model.command.*;
-import com.zy.core.model.cpmmandParam.CrnCommandParam;
-import com.zy.core.model.protocol.*;
-import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import springfox.documentation.spring.web.json.Json;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -54,67 +13,6 @@
@Service("mainService")
@Transactional
public class MainServiceImpl {
-
- public static final long COMMAND_TIMEOUT = 5 * 1000;
-// private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
- private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
-
- private static final Integer jarMaxLoc = 7;
- private static final Float jarTemperature = 50F;
- @Autowired
- private CommonService commonService;
- @Autowired
- private SlaveProperties slaveProperties;
- @Autowired
- private WrkMastMapper wrkMastMapper;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private WaitPakinMapper waitPakinMapper;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private BasCrnpService basCrnpService;
- @Autowired
- private BasRgvService basRgvService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private BasErrLogService basErrLogService;
- @Autowired
- private BasCrnErrorMapper basCrnErrorMapper;
- @Autowired
- private BasRgvErrMapper basRgvErrMapper;
- @Autowired
- private BasRgvErrLogService basRgvErrLogService;
- @Autowired
- private BasRgvPathService basRgvPathService;
- @Autowired
- private RedisUtil redisUtil;
- @Autowired
- private WrkMastStaMapper wrkMastStaMapper;
- @Autowired
- private BasRgvMapMapper basRgvMapMapper;
- @Autowired
- private RgvOneSignMapper rgvOneSignMapper;
- @Autowired
- private WrkMastCrnMapper wrkMastCrnMapper;
- @Autowired
- private WrkMastSplitTwinMapper wrkMastSplitTwinMapper;
- @Autowired
- private WrkMastSplitTwinService wrkMastSplitTwinService;
- @Autowired
- private BasJarMastService basJarMastService;
- @Autowired
- private WrkMastExecuteService wrkMastExecuteService;
- @Autowired
- private BasJarService basJarService;
- @Autowired
- private BasJarMapper basJarMapper;
@Value("${wms.url}")
private String wmsUrl;
diff --git a/src/main/java/com/zy/asrs/utils/SteUtils.java b/src/main/java/com/zy/asrs/utils/SteUtils.java
index 3374f98..536a734 100644
--- a/src/main/java/com/zy/asrs/utils/SteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/SteUtils.java
@@ -15,31 +15,6 @@
*/
public class SteUtils {
- public static final List<Integer> SHUTTLE_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
- add(11);add(12);
- }};
- public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(2);
- add(3);
- add(4);
- add(5);
- add(6);
- }};
- public static final List<Integer> THIRD_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(8);
- add(9);
- add(10);
- add(11);
- add(12);
- }};
- public static final List<Integer> THIRD_GROUP_BAY_LIST = new ArrayList<Integer>() {{
- add(4);
- add(10);
- add(16);
- add(22);
- }};
-
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
public static float scale(Float f){
@@ -63,362 +38,11 @@
}
}
- public static Integer getGroupRow(String locNo, Boolean pakin, Integer crnNo){
- int row = getRow(locNo);
- return getGroupRow(row, pakin, crnNo);
- }
-
- public static List<String> getGroupLocNo(String locNo){
- int row = getRow(locNo);
- int bay = getBay(locNo);
- List<String> result = new ArrayList<>();
- if (bay==4 || bay==10 || bay==16 || bay==22){
- if(row<7 && row>1)
- {
- if (SECOND_GROUP_ROW_LIST.contains(row)) {
- for (Integer groupRow : SECOND_GROUP_ROW_LIST) {
- result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
- }
- }
- } else if(row>7 && row<13){
- if (THIRD_GROUP_ROW_LIST.contains(row)) {
- for (Integer groupRow : THIRD_GROUP_ROW_LIST) {
- result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
- }
- }
- }
- } else{
- if (SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- for (Integer groupRow : SHUTTLE_GROUP_ROW_LIST) {
- result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
- }
- }
- }
-
- return result;
- }
-
- public static Integer getGroupRow(Integer row, Boolean pakin, Integer crnNo) {
- if (pakin) {
- if (SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- return crnNo == 1 ? 2 : 12;
- } else {
- return row;
- }
- } else {
- if (SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- return crnNo == 1 ? 2 : 12;
- } else {
- return row;
- }
- }
- }
-
- /**
- * 鍒ゆ柇搴撲綅鏄惁涓虹┛姊簱浣�
- * @param locNo
- * @return
- */
- public static Boolean isShuttle(String locNo) {
- int row = Utils.getRow(locNo);
- if (row >= 2 && row <= 12) {
- return Boolean.TRUE;
- }
- return Boolean.FALSE;
- }
-
- /**
- * 鍏ュ簱锛屽爢鍨涙満鍙�1锛氭渶澶栧眰搴撲綅鏄�2鎺掞紱 2锛氭渶澶栧眰搴撲綅鏄�12鎺�
- * 鍑哄簱锛屽爢鍨涙満鍙�1:鏈�澶栧眰搴撲綅鏄�2鎺掞紱 2锛氭渶澶栧眰搴撲綅鏄�12鎺�
- * @param locNo 搴撲綅鍙�
- * @param pakin 鍏ュ簱
- * @param crnNo 鍫嗗灈鏈哄彿
- * @return
- */
- public static Boolean isOutMost(String locNo, Boolean pakin, Integer crnNo) {
- switch (crnNo){
- case 1:
- return Integer.parseInt(locNo.substring(0, 2)) == 2;
- case 2:
- return Integer.parseInt(locNo.substring(0, 2)) == 12;
- }
- return false;
- }
- // -------------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
- /**
- * 鍒ゆ柇鏄惁涓烘繁搴撲綅
- */
- public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
- if (slaveProperties.isDoubleDeep()) {
- int row = getRow(locNo);
- return slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘繁搴撲綅
- */
- public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
- if (slaveProperties.isDoubleDeep()) {
- return slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
- */
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
- if (slaveProperties.isDoubleDeep()) {
- int row = getRow(locNo);
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
- */
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
- if (slaveProperties.isDoubleDeep()) {
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
- */
- public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
- int row = getRow(deepLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
- return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
- }
-
-
- /**
- * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
- */
- public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
- int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
- return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
- }
-
- /**
- * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
- */
- public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
- int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 1) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
- }
-
- /**
- * 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
- */
- public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = shallowRow - 1;
- } else if (remainder == 1) {
- targetRow = shallowRow + 1;
- } else {
- throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
- }
- return targetRow;
- }
-
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
- */
- public static int getRow(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(0, 2));
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
-
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
- */
- public static int getBay(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(2, 5));
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
-
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
- */
- public static int getLev(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(5, 7));
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
-
/**
* 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
*/
public static String append(int row, int bay, int lev) {
return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
- }
-
-
- /**
- * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
- */
- public static void toDeepIfEmptyByShallow(String shallowLoc) {
- int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, 4);
- int targetRow = 0;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- String targetLoc = zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-
- }
-
- public static String getLocNo(Number row, Number bay, Number lev) {
- return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
- }
-
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupOutsideLoc(String locNo,Integer crnNo){
- //姝ゆ柟娉曞彇姝ゆ帓澶栦晶搴撲綅
- int row = getRow(locNo);
- int bay = getBay(locNo);
- List<String> result = new ArrayList<>();
- if (THIRD_GROUP_BAY_LIST.contains(bay)){
- if (THIRD_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[THIRD_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, THIRD_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
-
- }else if (SECOND_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : SECOND_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
-
- }
- }else {
- if (SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- if (crnNo==1){
- for (Integer integer : SHUTTLE_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- }else {
- List<Integer> clone = Arrays.asList(new Integer[SHUTTLE_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, SHUTTLE_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- }
- }
- }
- return result;
- }
-
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupOutsideLocPakin(String locNo,Integer crnNo){
- // 姝ゆ柟娉曞彇姝ゆ帓鍐呬晶搴撲綅
- int row = getRow(locNo);
- int bay = getBay(locNo);
- List<String> result = new ArrayList<>();
- if (THIRD_GROUP_BAY_LIST.contains(bay)){
- if (THIRD_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : THIRD_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- }else if (SECOND_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[SECOND_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, SECOND_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
-
-
- }
- }else {
- if (SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- if (crnNo==2){
- for (Integer integer : SHUTTLE_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- }else {
- List<Integer> clone = Arrays.asList(new Integer[SHUTTLE_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, SHUTTLE_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- }
- }
- }
- return result;
}
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 07f4084..0f8c14a 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -22,158 +22,6 @@
return (float) Arith.multiplys(2, f, 1);
}
- public static String zerofill(String msg, Integer count){
- if (msg.length() == count){
- return msg;
- } else if (msg.length() > count){
- return msg.substring(0, 16);
- } else {
- StringBuilder msgBuilder = new StringBuilder(msg);
- for (int i = 0; i<count-msg.length(); i++){
- msgBuilder.insert(0,"0");
- }
- return msgBuilder.toString();
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘繁搴撲綅
- */
- public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
- if (slaveProperties.isDoubleDeep()) {
- int row = getRow(locNo);
- return slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘繁搴撲綅
- */
- public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
- if (slaveProperties.isDoubleDeep()) {
- return slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅 骞跺瓨鍦ㄦ繁搴撲綅
- */
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
- if (slaveProperties.isDoubleDeep()) {
- int row = getRow(locNo);
- if (!slaveProperties.getDoubleLocs().contains(row)){
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
- if (deepLocLeft){
- return true;
- }
- return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
- }
- }
- return false;
- }
-
- /**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
- */
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
- if (slaveProperties.isDoubleDeep()) {
- if (!slaveProperties.getDoubleLocs().contains(row)){
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
- if (deepLocLeft){
- return true;
- }
- return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
- }
- }
- return false;
- }
-
- /**
- * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
- */
- public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
- int row = getRow(deepLoc);
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
- int shallowRow = deepLocLeft? (row + 1) : (row - 1);
- return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
- }
-
- /**
- * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
- */
- public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
-// int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
-// return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, deepRow);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
- return deepLocLeft ? (deepRow + 1) : (deepRow - 1);
- }
-
- /**
- * 鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
- */
- public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) {
- if (slaveProperties.isDoubleDeep()) {
- return slaveProperties.getDoubleLocsLeft().contains(row);
- } else {
- return false;
- }
- }
-
-
- /**
- * 鍒ゆ柇鏄惁涓哄彸娣卞簱浣�
- */
- public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) {
- if (slaveProperties.isDoubleDeep()) {
- return slaveProperties.getDoubleLocsRight().contains(row);
- } else {
- return false;
- }
- }
-
- /**
- * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
- */
- public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
-// int row = getRow(shallowLoc);
-// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
-// int targetRow;
-// if (remainder == 2) {
-// targetRow = row - 1;
-// } else if (remainder == 3) {
-// targetRow = row + 1;
-// } else {
-// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
-// }
-// return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
- int row = getRow(shallowLoc);
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
- int shallowRow = deepLocLeft? (row - 1) : (row + 1);
- return zerofill(String.valueOf(shallowRow), 2) + shallowLoc.substring(2);
- }
-
- /**
- * 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
- */
- public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
-// int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
-// int targetRow;
-// if (remainder == 2) {
-// targetRow = shallowRow - 1;
-// } else if (remainder == 3) {
-// targetRow = shallowRow + 1;
-// } else {
-// throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
-// }
-// return targetRow;
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
- return deepLocLeft? (shallowRow - 1) : (shallowRow + 1);
- }
-
/**
* 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
*/
@@ -204,33 +52,5 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- /**
- * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
- */
- public static void toDeepIfEmptyByShallow(String shallowLoc) {
- int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, 4);
- int targetRow = 0;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- String targetLoc = zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
- }
-
- public static void main(String[] args) {
- SlaveProperties slaveProperties = new SlaveProperties();
- slaveProperties.setDoubleDeep(true);
- List<Integer> list = new ArrayList<>();
- list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
- slaveProperties.setDoubleLocs(list);
- slaveProperties.setGroupCount(4);
- Integer deepRow = getDeepRow(slaveProperties, 6);
- System.out.println(deepRow);
-
- }
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f568cb7..8589343 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -36,8 +36,6 @@
@Autowired
private RowLastnoService rowLastnoService;
@Autowired
- private BasCrnpService basCrnpService;
- @Autowired
private StaDescService staDescService;
@Autowired
private BasDevpService basDevpService;
@@ -84,255 +82,6 @@
}
}
return workNo;
- }
-
-
- /**
- * 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞宸ヤ綔绫诲瀷
- * @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
- * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
- */
- @Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- StartupDto startupDto = new StartupDto();
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
-
- switch (sourceStaNo) {
- case 202:
- whsType = 2;
- break;
- case 205:
- whsType = 1;
- break;
- case 126:
- whsType = 3;
- break;
- case 110:
- whsType = 4;
- break;
- case 301:
- whsType = 5;
- break;
- default:
- throw new CoolException("搴撲綅鎺掑彿鍒嗛厤閿欒, 婧愮珯鍙凤細" + sourceStaNo);
- }
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- // ===============>>>> 寮�濮嬫墽琛�
- int curRow = rowLastno.getCurrentRow();
- int sRow = rowLastno.getsRow();
- int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
- // 鐩爣搴撲綅
- LocMast locMast = null;
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos)) {
- List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
- for (String locNo : locNos) {
- if (Utils.isShallowLoc(slaveProperties, locNo)) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
- }
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
- if (locMasts.size() > 0) {
- for (LocMast loc : locMasts) {
- if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
-
- }
- }
- }
- }
-
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- // 1-4鎺�
- if (whsType == 1) {
- for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- break;
- }
- }
- // 5-8鎺�
- } else if (whsType == 2) {
- curRow = curRow - 4;
- for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- if (basCrnpService.checkSiteError(crnNo1 + 1, true)) {
- // 鍋忕Щ閲忚ˉ鍋�
- curRow = curRow + 4;
- crnNo = crnNo1 + 1;
- break;
- }
-
- }
- // 126绌烘澘鍏� 1-8鎺�
- } else {
- for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- break;
- }
- }
- }
- }
-
- if (crnNo == 0) {
- throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
- }
- // 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- }
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
-
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
-
- // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
- if (locMast == null) {
- if (Utils.isShallowLoc(slaveProperties, curRow)) {
- Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
- locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
- locMast = null;
- }
- }
- if (Cools.isEmpty(locMast)) {
- locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (!locMastService.checkEmptyCount(locMast)) {
- locMast = null;
- }
- // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- locMast = null;
- }
- }
- // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- locMast = null;
- }
- }
- }
- }
-
- // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
- if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
- times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
- } else {
- times = 0;
- }
-
- // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
- if (locTypeDto.getLocType1() == 1) {
- locTypeDto.setLocType1((short) 2);
- return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times);
- }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- String locNo = locMast.getLocNo();
-
- // 杩斿洖dto
- startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
- startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setStaNo(staNo.getDevNo());
- startupDto.setLocNo(locNo);
- return startupDto;
- }
-
- public static void main(String[] args) {
- System.out.println(Arith.remainder(1, 4));
- System.out.println("0200201".substring(0, 2));
- String locNo = "0800201";
- int row = Integer.parseInt(locNo.substring(0, 2));
- double remainder = Arith.remainder(row, 4);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
- return;
- }
- String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- System.out.println(zerofill);
}
public static String zerofill(String msg, Integer count) {
diff --git a/src/main/java/com/zy/core/CrnThread.java b/src/main/java/com/zy/core/CrnThread.java
deleted file mode 100644
index 8ab3a68..0000000
--- a/src/main/java/com/zy/core/CrnThread.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.core;
-
-import com.zy.core.model.protocol.CrnProtocol;
-
-public interface CrnThread extends ThreadHandler {
-
- CrnProtocol getCrnProtocol();
-
- void setResetFlag(boolean flag);
-
- void setResetFlagTwo(boolean flag);
-
- void setBackHpFlag(boolean flag);
-
- /**
- * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
- */
- boolean isBackHpFlag();
-}
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 98da0b9..f7c937a 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -31,8 +31,6 @@
int CRN_COUNT = 0;
- public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
-
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
@@ -53,10 +51,6 @@
}
private void initMq(){
-// // 鍒濆鍖栧爢鍨涙満mq
-// for (Slave crn : slaveProperties.getCrn()) {
-// MessageQueue.init(SlaveType.Crn, crn);
-// }
// // 鍒濆鍖朢GVmq
// for (Slave rgv : slaveProperties.getRgv()) {
// MessageQueue.init(SlaveType.Rgv, rgv);
@@ -77,10 +71,6 @@
// for (Slave scale : slaveProperties.getScale()) {
// MessageQueue.init(SlaveType.Scale, scale);
// }
-// // 鍒濆鍖栫～鍖栫綈mq
-// for (Slave jar : slaveProperties.getJar()) {
-// MessageQueue.init(SlaveType.Jar, jar);
-// }
// // 鍒濆鍖栧彴杞q
// for (Slave car : slaveProperties.getCar()) {
// MessageQueue.init(SlaveType.Car, car);
@@ -92,15 +82,6 @@
}
private void initThread(){
-// // 鍒濆鍖栧爢鍨涙満绾跨▼
-// log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
-// for (CrnSlave crn : slaveProperties.getCrn()) {
-// CrnThread crnThread = new SiemensCrnThread(crn);
-// Thread thread = new Thread((Runnable) crnThread);
-// thread.start();
-// map.put(crnThread, thread);
-// SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
-// }
// // 鍒濆鍖栫┛姊溅绾跨▼
// log.info("鍒濆鍖朢GV绾跨▼...................................................");
// for (RgvSlave rgv : slaveProperties.getRgv()) {
@@ -130,13 +111,6 @@
// new Thread(ledThread).start();
// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
// }
-// // 鍒濆鍖杍ar绾跨▼
-// log.info("鍒濆鍖杍ar绾跨▼...................................................");
-// for (JarSlave jar : slaveProperties.getJar()) {
-// JarThread jarThread = new JarThread(jar);
-// new Thread(jarThread).start();
-// SlaveConnection.put(SlaveType.Jar, jar.getId(), jarThread);
-// }
// // 鍒濆鍖朣te绾跨▼
// log.info("鍒濆鍖杝te绾跨▼...................................................");
// for (SteSlave ste : slaveProperties.getSte()) {
@@ -156,45 +130,6 @@
@PreDestroy
public void destroy() {
- }
-
- @Component
- class killThread {
-
- /* @Scheduled(cron = "0/3 * * * * ? ")
- public void kill() {
- for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) {
- CRN_COUNT++;
- SiemensCrnThread key = (SiemensCrnThread) entry.getKey();
-// System.out.println("绗�"+i+"涓爢鍨涙満绾跨▼閲嶅惎绾跨▼鏉′欢锛�"+(System.currentTimeMillis() - key.getSign()));
- if (CRN_COUNT>10000){
- continue;
- }
- if (System.currentTimeMillis() - key.getSign() > 120000 && System.currentTimeMillis() - key.getSign()<1200000) {
- System.out.println("绗�" + CRN_COUNT + "涓爢鍨涙満绾跨▼琚噸鍚�");
-
- // 璇锋眰绾跨▼瀹夊叏鍋滄
- key.requestStop();
-
- // 绛夊緟绾跨▼瀹屾垚鍋滄, 鍙互杩欐牱鍋氫篃鍙互閫夋嫨涓嶈繖涔堝仛锛屽彇鍐充簬鏄惁闇�瑕佺瓑寰呯嚎绋嬬粨鏉�
- try {
- entry.getValue().join(20000); // 绛夊緟鏈�澶�20绉�
- } catch (InterruptedException e) {
-// // 鍙�傚綋澶勭悊涓柇
-// Thread.currentThread().interrupt(); // 淇濈暀涓柇鐘舵��
- entry.getValue().stop();
- }
-
- // 閲嶆柊鍚姩绾跨▼
- Thread thread = new Thread((Runnable) key); // 鍋囪CrnThread瀹炵幇浜哛unnable
- thread.start();
-
- // 鏇挎崲鏄犲皠鍏崇郴涓殑鏃х嚎绋�
- map.put(entry.getKey(), thread);
- }
- }
- }*/
-
}
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError1.java b/src/main/java/com/zy/core/model/protocol/CrnError1.java
deleted file mode 100644
index 0ae2829..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnError1.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zy.core.model.protocol;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/17
- */
-@Data
-public class CrnError1 {
-
- // 閬ユ帶鍣ㄦ�ュ仠
- public boolean remoteStop;
-
- // 涓绘帶鐩樻�ュ仠
- public boolean mainStop;
-
- // 鎿嶄綔鐩樻�ュ仠
- public boolean controlStop;
-
- // X琛岃蛋鍙橀鍣ㄦ晠闅�
- public boolean xCoverErr;
-
- // Y鍗囬檷鍙橀鍣ㄦ晠闅�
- public boolean yCoverErr;
-
- // Z璐у弶鍙橀鍣ㄦ晠闅�
- public boolean zCoverErr;
-
- // 婵�鍏夋晠闅�
- public boolean laserErr;
-
- // 鏉＄爜闃呰鍣ㄦ晠闅�
- public boolean barcodeErr;
-
- // X鍓嶆瀬闄�
- public boolean xFrontLimitErr;
-
- // X鍚庢瀬闄�
- public boolean xBackLimitErr;
-
- // Y涓婃瀬闄�
- public boolean yUpLimitErr;
-
- // Y涓嬫瀬闄�
- public boolean yDownLimitErr;
-
- // Z宸︽瀬闄�
- public boolean zLeftLimitErr;
-
- // Z鍙虫瀬闄�
- public boolean zRightLimitErr;
-
- // 宸﹁秴瀹�1
- public boolean leftOverWidthErr1;
-
- // 宸﹁秴瀹�2
- public boolean leftOverWidthErr2;
-
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError2.java b/src/main/java/com/zy/core/model/protocol/CrnError2.java
deleted file mode 100644
index ef0e1cd..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnError2.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zy.core.model.protocol;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/17
- */
-@Data
-public class CrnError2 {
-
- // 宸﹁秴闀�1
- public boolean leftOverLenErr1;
-
- // 宸﹁秴闀�2
- public boolean leftOverLenErr2;
-
- // 宸﹁秴楂�
- public boolean leftOverHighErr;
-
- // 鍙宠秴瀹�1
- public boolean rightOverWidthErr1;
-
- // 鍙宠秴瀹�2
- public boolean rightOverWidthErr2;
-
- // 鍙宠秴闀�1
- public boolean rightOverLenErr1;
-
- // 鍙宠秴闀�2
- public boolean rightOverLenErr2;
-
- // 鍙宠秴楂�
- public boolean rightOverHighErr;
-
- // 宸︽澗缁�
- public boolean leftLooseRopeErr;
-
- // 鍙虫澗缁�
- public boolean rightLooseRopeErr;
-
- // 鍓嶅畨鍏ㄩ棬鏁呴殰
- public boolean frontDoorErr;
-
- // 鍚庡畨鍏ㄩ棬鏁呴殰
- public boolean backDoorErr;
-
- // 鍚姩閿欒
- public boolean startupErr;
-
- // X鍚戝墠瀹氫綅瓒呬笂闄�
- public boolean xFrontLocaUpErr;
-
- // X鍚戝墠瀹氫綅瓒呬笅闄�
- public boolean xFrontLocaDownErr;
-
- // X鍚戝悗瀹氫綅瓒呬笂闄�
- public boolean xBackLocaUpErr;
-
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError3.java b/src/main/java/com/zy/core/model/protocol/CrnError3.java
deleted file mode 100644
index d399480..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnError3.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zy.core.model.protocol;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/17
- */
-@Data
-public class CrnError3 {
-
- // X鍚戝悗瀹氫綅瓒呬笅闄�
- public boolean xBackLocaDownErr;
-
- // Y鍚戜笂瀹氫綅瓒呬笂闄�
- public boolean yUpLocaUpErr;
-
- // Y鍚戜笂瀹氫綅瓒呬笅闄�
- public boolean yUpLocaDownErr;
-
- // Y鍚戜笅瀹氫綅瓒呬笂闄�
- public boolean yDownLocaUpErr;
-
- // Y鍚戜笅瀹氫綅瓒呬笅闄�
- public boolean yDownLocaDownErr;
-
- // Z鍚戝乏瀹氫綅瓒呬笂闄�
- public boolean zLeftLocaUpErr;
-
- // Z鍚戝乏瀹氫綅瓒呬笅闄�
- public boolean zLeftLocaDownErr;
-
- // Z鍚戝彸瀹氫綅瓒呬笂闄�
- public boolean zRightLocaUpErr;
-
- // Z鍚戝彸瀹氫綅瓒呬笅闄�
- public boolean zRightLocaDownErr;
-
- // 宸﹀彇璐ф椂搴撲綅鏃犺揣
- public boolean leftTakeNoneErr;
-
- // 鍙冲彇璐ф椂搴撲綅鏃犺揣
- public boolean rightTakeNoneErr;
-
- // 宸﹀彇璐у悗搴撲綅鏈夎揣
- public boolean leftTakeThenLoadErr;
-
- // 鍙冲彇璐у悗搴撲綅鏈夎揣
- public boolean rightTakeThenLoadErr;
-
- // 宸︽斁璐ф椂搴撲綅鏈夎揣
- public boolean leftPutAndLoadErr;
-
- // 鍙冲彇璐у悗搴撲綅鏈夎揣
- public boolean rightPutAndLoadErr;
-
- // 宸︽斁璐у悗搴撲綅鏃犺揣
- public boolean leftPutThenNoneErr;
-
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError4.java b/src/main/java/com/zy/core/model/protocol/CrnError4.java
deleted file mode 100644
index 9eb90f9..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnError4.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.core.model.protocol;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/17
- */
-@Data
-public class CrnError4 {
-
- // 鍙虫斁璐у悗搴撲綅鏃犺揣
- public boolean rightPutThenNoneErr;
-
- // X鏉鹃椄瓒呮椂
- public boolean xLooseBrakeTimeout;
-
- // Y鏉鹃椄瓒呮椂
- public boolean yLooseBrakeTimeout;
-
- // Z鏉鹃椄瓒呮椂
- public boolean zLooseBrakeTimeout;
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError5.java b/src/main/java/com/zy/core/model/protocol/CrnError5.java
deleted file mode 100644
index 47d1863..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnError5.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.zy.core.model.protocol;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/17
- */
-@Data
-public class CrnError5 {
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError6.java b/src/main/java/com/zy/core/model/protocol/CrnError6.java
deleted file mode 100644
index a449f3c..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnError6.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.zy.core.model.protocol;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/17
- */
-@Data
-public class CrnError6 {
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
deleted file mode 100644
index 4ae14ea..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ /dev/null
@@ -1,325 +0,0 @@
-package com.zy.core.model.protocol;
-
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.core.enums.CrnForkPosType;
-import com.zy.core.enums.CrnLiftPosType;
-import com.zy.core.enums.CrnModeType;
-import com.zy.core.enums.CrnStatusType;
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/7
- */
-@Data
-public class CrnProtocol {
-
- private Integer crnNo;
-
- /**
- * 1 = 鎵嬪姩妯″紡
- * 2 = 鑷姩妯″紡
- * 3 = 鐢佃剳妯″紡
- */
- public Short mode;
-
- public CrnModeType modeType;
-
- /**
- * 1 = 鎬ュ仠
- */
- public Short eStop;
-
- /**
- * 寮傚父鐮�
- */
- public Short alarm;
- public Short alarmTwo;
-
- /**
- * 浠诲姟鍙�
- */
- public Short taskNo = 0;
- public Short taskNoTwo = 0;
-
- /**
- * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
- * -1锛氭湭鐭�
- * 0锛氱┖闂诧紝鏃犱换鍔�
- * 1锛氬彇璐у畾浣嶄腑
- * 2锛氬彇璐т腑
- * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
- * 4锛氭斁璐т腑
- * 5锛氬洖鍘熺偣涓�
- * 6锛氬弽鍘熺偣
- * 7锛氬簱浣嶇Щ浣�
- * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
- * 99锛氭姤璀�
- * 100锛氬叾浠�100
- * 101锛氭湭鐭�101
- */
- public Short status = -1;
- public Short statusTwo = -1;
-
- /**
- * 鐘舵�佹灇涓�
- */
- public CrnStatusType statusType;
- public CrnStatusType statusTypeTwo;
-
- /**
- * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
- */
- public Short bay;
- public Short bayTwo;
-
- /**
- * 鍫嗗灈鏈哄綋鍓嶅眰鍙�
- */
- public Short level;
- public Short levelTwo;
-
- /**
- * 褰撳墠璐у弶浣嶇疆
- * 0 = 璐у弶鍘熶綅
- * 1 = 璐у弶鍦ㄥ乏渚�
- * 2 = 璐у弶鍦ㄥ彸渚�
- */
- public Short forkPos;
- public Short forkPosTwo;
-
- public CrnForkPosType forkPosType;
- public CrnForkPosType forkPosTypeTwo;
-
- /**
- * 褰撳墠杞借揣鍙颁綅缃�
- * 0 = 涓嬪畾浣�
- * 1 = 涓婂畾浣�
- */
- public Short liftPos;
- public Short liftPosTwo;
-
- public CrnLiftPosType liftPosType;
- public CrnLiftPosType liftPosTypeTwo;
-
- /**
- * 璧拌鍦ㄥ畾浣�
- * 0 = 鍦ㄥ畾浣�
- * 1 = 涓嶅湪瀹氫綅
- */
- public Short walkPos;
- public Short walkPosTwo;
-
- /**
- * 杞借揣鍙版湁鐗�
- */
- public Short loaded;
- public Short loadedTwo;
-
- private Short temp1;
-
- private CrnTemp1 crnTemp1;
-
- private Short temp2;
-
- private Short temp3;
-
- private Short temp4;
-
- /**
- * 寮傚父1
- */
- private boolean[] error1;
-
- private CrnError1 crnError1;
-
- /**
- * 寮傚父2
- */
- private boolean[] error2;
-
- private CrnError2 crnError2;
-
- /**
- * 寮傚父3
- */
- private boolean[] error3;
-
- private CrnError3 crnError3;
-
- /**
- * 寮傚父4
- */
- private boolean[] error4;
-
- private CrnError4 crnError4;
-
- /**
- * 寮傚父5
- */
- private boolean[] error5;
-
- private CrnError5 crnError5;
-
- /**
- * 寮傚父6
- */
- private boolean[] error6;
-
- private CrnError6 crnError6;
-
- /**
- * X琛岃蛋绾块�熷害m/min
- */
- private Float xSpeed;
-
- /**
- * Y琛岃蛋绾块�熷害m/min
- */
- private Float ySpeed;
-
- /**
- * Z琛岃蛋绾块�熷害m/min
- */
- private Float zSpeed;
-
- /**
- * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
- */
- public Float xDistance;
-
- /**
- * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
- */
- public Float yDistance;
-
- /**
- * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
- */
- public Float xDuration;
-
- /**
- * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
- */
- public Float yDuration;
-
- public void setMode(Short mode) {
- this.mode = mode;
- this.modeType = CrnModeType.get(mode);
- }
-
- public void setMode(CrnModeType type) {
- this.modeType = type;
- this.mode = CrnModeType.get(type).id.shortValue();
- }
-
- public void setForkPos(Short forkPos) {
- this.forkPos = forkPos;
- this.forkPosType = CrnForkPosType.get(forkPos);
- }
-
- public void setForkPos(CrnForkPosType type) {
- this.forkPosType = type;
- this.forkPos = CrnForkPosType.get(type).id.shortValue();
- }
-
- public void setForkPosTwo(Short forkPosTwo) {
- this.forkPosTwo = forkPosTwo;
- this.forkPosTypeTwo = CrnForkPosType.get(forkPosTwo);
- }
-
- public void setForkPosTwo(CrnForkPosType typeTwo) {
- this.forkPosTypeTwo = typeTwo;
- this.forkPosTwo = CrnForkPosType.get(typeTwo).id.shortValue();
- }
-
- public void setLiftPos(Short liftPos) {
- this.liftPos = liftPos;
- this.liftPosType = CrnLiftPosType.get(liftPos);
- }
-
- public void setLiftPos(CrnLiftPosType type) {
- this.liftPosType = type;
- this.liftPos = CrnLiftPosType.get(type).id.shortValue();
- }
-
- public void setLiftPosTwo(Short liftPosTwo) {
- this.liftPosTwo = liftPosTwo;
- this.liftPosTypeTwo = CrnLiftPosType.get(liftPosTwo);
- }
-
- public void setLiftPosTwo(CrnLiftPosType typeTwo) {
- this.liftPosTypeTwo = typeTwo;
- this.liftPosTwo = CrnLiftPosType.get(typeTwo).id.shortValue();
- }
-
- public void setStatus(Short status){
- this.status = status;
- this.statusType = CrnStatusType.get(status);
- }
-
- public void setStatusTwo(Short statusTwo){
- this.statusTwo = statusTwo;
- this.statusTypeTwo = CrnStatusType.get(statusTwo);
- }
-
- public void setStatus(CrnStatusType type){
- this.statusType = type;
- this.status = CrnStatusType.get(type).id.shortValue();
- }
-
- public Short getTemp1() {
- return temp1;
- }
-
- public void setTemp1(Short temp1) {
- this.temp1 = temp1;
- }
-
- /**
- * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
- * I:鍏ュ簱
- * O:鍑哄簱
- */
- private String lastIo = "I";
-
-
- public BasCrnp toSqlModel(BasCrnp basCrnp){
- if (alarm!=null) {
- basCrnp.setCrnErr(alarm.longValue());
- }
- basCrnp.setWrkNo(taskNo.intValue());
- basCrnp.setWrkNoTwo(taskNoTwo.intValue());
- basCrnp.setCrnStatusOne(status.intValue());
- basCrnp.setCrnStatusTwo(statusTwo.intValue());
- return basCrnp;
- }
-
- public void setxSpeed(Short xSpeed) {
- this.xSpeed = Float.valueOf(xSpeed);
- }
-
- public void setySpeed(Short ySpeed) {
- this.ySpeed = Float.valueOf(ySpeed);
- }
-
- public void setzSpeed(Short zSpeed) {
- this.zSpeed = Float.valueOf(zSpeed);
- }
-
- public void setxDistance(Short xDistance) {
- this.xDistance = Float.valueOf(xDistance);
- }
-
- public void setyDistance(Short yDistance) {
- this.yDistance = Float.valueOf(yDistance);
- }
-
- public void setxDuration(Short xDuration) {
- this.xDuration = Float.valueOf(xDuration);
- }
-
- public void setyDuration(Short yDuration) {
- this.yDuration = Float.valueOf(yDuration);
- }
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnTemp1.java b/src/main/java/com/zy/core/model/protocol/CrnTemp1.java
deleted file mode 100644
index 3ca39e4..0000000
--- a/src/main/java/com/zy/core/model/protocol/CrnTemp1.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zy.core.model.protocol;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/8/17
- */
-@Data
-public class CrnTemp1 {
-
- // 鍗囬檷闄愪綅寮�鍏宠Е鍙�
- public boolean liftLimitSwitchErr;
-
- // 琛岃蛋鍒跺姩搴忓垪寮傚父
- public boolean liftBrakeErr;
-
- // 琛岃蛋娴嬭窛鍣ㄦ晠闅�
- public boolean liftDiastimeterFau;
-
- // 鎬ュ仠
- public boolean stop;
-
- // 鐩稿簭鎶ヨ
- public boolean warn;
-
- // 瓒呴珮
- public boolean overHighErr;
-
- // 宸﹁秴瀹�
- public boolean leftOverWidthErr;
-
- // 鍙宠秴瀹�
- public boolean rightOverWidthErr;
-
- // 宸﹁秴闀�
- public boolean leftOverLenErr;
-
- // 鍙宠秴闀�
- public boolean rightOverLenErr;
-
- // 鏈夌墿鍏�
- public boolean pakinThenLoadedErr;
-
- // 鏃犵墿鍑�
- public boolean pakOutThenNoneErr;
-
-}
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 172a5a5..2745e93 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -1,6 +1,5 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasRgv;
import com.zy.core.enums.*;
import lombok.Data;
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index b026c1b..b1d3ee9 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -20,15 +20,7 @@
@Data
@Configuration
@ConfigurationProperties(prefix = "wcs-slave")
-public class SlaveProperties {
-
- private boolean doubleDeep;
-
- private List<Integer> doubleLocs = new ArrayList<>();
- private List<Integer> doubleLocsLeft = new ArrayList<>();
- private List<Integer> doubleLocsRight = new ArrayList<>();
-
- private int groupCount;
+public class SlaveProperties{
private List<CrnSlave> crn = new ArrayList<>();
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
deleted file mode 100644
index 6b8c207..0000000
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ /dev/null
@@ -1,402 +0,0 @@
-package com.zy.core.thread;
-
-import HslCommunication.Core.Types.OperateResult;
-import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
-import com.alibaba.fastjson.JSON;
-import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasJar;
-import com.zy.asrs.entity.BasSteOpt;
-import com.zy.asrs.service.BasJarService;
-import com.zy.asrs.service.BasSteOptService;
-import com.zy.core.News;
-import com.zy.core.ThreadHandler;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.JarStatusType;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.JarSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.JarCommand;
-import com.zy.core.model.protocol.JarProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.text.MessageFormat;
-import java.util.Date;
-
-/**
- * shuttle 纭寲缃愮嚎绋�
- * Created by vincent on 2024/3/01
- */
-@Data
-@Slf4j
-public class JarThread implements Runnable, ThreadHandler {
-
- private SiemensS7Net siemensS7Net;
- private JarSlave slave;
- private JarProtocol jarProtocol;
- private short heartBeatVal = 1;
-
- public JarThread(JarSlave slave) {
- this.slave = slave;
- }
-
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- this.connect();
- while (true) {
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Jar, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- readStatus();
- break;
- // 鍐欐暟鎹� ID+鐩爣绔�
- case 2:
- write((JarCommand) task.getData());
- break;
- default:
- break;
- }
- // 蹇冭烦
-// heartbeat();
- Thread.sleep(500);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
- }
-
- /**
- * 鍒濆鍖栧爢鍨涙満鐘舵��
- */
- private void initSte() {
- if (null == jarProtocol) {
- jarProtocol = new JarProtocol();
- }
- jarProtocol.setJarNo(slave.getId());
- jarProtocol.setMode( 0);
- jarProtocol.setStatus(JarStatusType.OFF_LINE);
- jarProtocol.setJarErr(0);
- }
-
- @Override
- public boolean connect() {
- boolean result = false;
- // 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙�
- siemensS7Net = new SiemensS7Net(SiemensPLCS.S200Smart, slave.getIp());
-// siemensS7Net.setRack(slave.getRack().byteValue());
-// siemensS7Net.setSlot(slave.getSlot().byteValue());
- OperateResult connect = siemensS7Net.ConnectServer();
- if(connect.IsSuccess){
- result = true;
- OutputQueue.STE.offer(MessageFormat.format( "銆恵0}銆戠～鍖栫綈plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- News.info("纭寲缃恜lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- } else {
- OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戠～鍖栫綈plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- News.error("纭寲缃恜lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initSte();
- }
-// melsecMcNet.ConnectClose();
- return result;
- }
-
- /**
- * 璇诲彇鐘舵��
- */
- private void readStatus(){
- try {
- if (slave.getId()>4){
- if (null == jarProtocol) {
- jarProtocol = new JarProtocol();
- jarProtocol.setJarNo(slave.getId());
- }
- jarProtocol.setMode(2);//妯″紡
- jarProtocol.setStatus((short)0);//鐘舵��
- jarProtocol.setAutoing(true);//鑷姩
-
- jarProtocol.setRightDoor(true);//宸﹂棬鐘舵�� //鍑烘枡闂�
- jarProtocol.setLeftDoor(true);//鍙抽棬鐘舵�� //杩涙枡闂�
-
- jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
- jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
- jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
- jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
-
- jarProtocol.setJarTemperature(0.0F);
- return;
- }
- OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30);
- if (result.IsSuccess) {
- if (null == jarProtocol) {
- jarProtocol = new JarProtocol();
- jarProtocol.setJarNo(slave.getId());
- }
- if (slave.getId() == 1 || slave.getId() == 3){
- jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//宸﹂棬鐘舵�� //鍑烘枡闂�
- jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//鍙抽棬鐘舵�� //杩涙枡闂�
- jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 4) != 0);//宸﹂棬鍙紑 //鍑烘枡闂�
- jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 6) != 0);//宸﹂棬鍙叧 //鍑烘枡闂�
- jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 8) != 0);//鍙抽棬鍙紑 //杩涙枡闂�
- jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 10) != 0);//鍙抽棬鍙叧 //杩涙枡闂�
- jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door //鍑烘枡闂�
- jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door //鍑烘枡闂�
- jarProtocol.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door //杩涙枡闂�
- jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door //杩涙枡闂�
- } else {
- jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//宸﹂棬鐘舵�� //杩涙枡闂�
- jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//鍙抽棬鐘舵�� //鍑烘枡闂�
- jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 4) != 0);//宸﹂棬鍙紑 //杩涙枡闂�
- jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 6) != 0);//宸﹂棬鍙叧 //杩涙枡闂�
- jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 8) != 0);//鍙抽棬鍙紑 //鍑烘枡闂�
- jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 10) != 0);//鍙抽棬鍙叧 //鍑烘枡闂�
- jarProtocol.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door //杩涙枡闂�
- jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door //杩涙枡闂�
- jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door //鍑烘枡闂�
- jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door //鍑烘枡闂�
- }
- jarProtocol.setMode((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 12));//妯″紡
- jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//寮傚父鐮�
- jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
- jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//娓╁害
-
- jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
-
-//
-// jarProtocol.setMode(2);//妯″紡
-// jarProtocol.setStatus((short)6);//鐘舵��
-// jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
-// jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
-// jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
-// jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
-
-
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasJarService service = SpringUtils.getBean(BasJarService.class);
- if (null != service) {
- // 鍚屾pakMk
- BasJar basJar = service.selectById(slave.getId());
- basJar.setJarNo(slave.getId());
- if (!service.updateById(jarProtocol.toSqlModel(basJar))){
- News.error("纭寲缃恜lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
-
- }
- } else {
- OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆憑1}纭寲缃恜lc鐘舵�佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
- throw new CoolException(MessageFormat.format( "纭寲缃恜lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
- }
- } catch (Exception e) {
-// e.printStackTrace();
- log.error(e.getMessage());
- OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戣鍙栫～鍖栫綈plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-// News.error("璇诲彇绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initSte();
- }
-
- }
-
- /**
- * 鍐欏叆鏁版嵁
- */
- private synchronized boolean write(JarCommand command){
- if (null == command) {
- News.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
- return false;
- }
-
- command.setJarNo(slave.getId());
- OperateResult result1 = null;
- String resultV1 = "";
- short resultS1 = 0;
- OperateResult result2 = null;
- String resultV2 = null;
- short resultS2 = 0;
-
- switch (command.getTaskModeType().id){
- case 1:
- case 2:
- case 3:
- case 4:
- return false;
- case 5://寮�闂�
- resultV1 = "V318";
- resultV2 = "V320";
- resultS1 = (short)1;
- resultS2 = (short)1;
- break;
- case 6://鍏抽棬
- resultV1 = "V322";
- resultV2 = "V324";
- resultS1 = (short)1;
- resultS2 = (short)1;
- break;
- case 7:
- case 8:
- return false;
- case 9:
- resultV1 = "V318";
- resultV2 = "V320";
- break;
- case 10:
- resultV1 = "V322";
- resultV2 = "V324";
- break;
- default:
- return false;
- }
-
- result1 = siemensS7Net.Write(resultV1, resultS1);
- result2 = siemensS7Net.Write(resultV2, resultS2);
- //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- int writeCount = 1;
- do {
- try{
- if(!result1.IsSuccess){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
- if (resultRead1.IsSuccess) {
- short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (transInt16 == resultS1 || transInt16 == (short) 2 || transInt16 == (short) 3){
- break;
- } else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result1 = siemensS7Net.Write(resultV1, resultS1);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- writeCount = 1;
- do {
- try{
- if(!result2.IsSuccess){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result2 = siemensS7Net.Write(resultV2, resultS2);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 2);
- if (resultRead2.IsSuccess) {
- short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead2.Content, 0);
- if (transInt16 == resultS1 || transInt16 == (short) 3){
- break;
- } else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result2 = siemensS7Net.Write(resultV2, resultS2);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- } else {
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result2 = siemensS7Net.Write(resultV2, resultS2);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆纭寲缃恜lc鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- try {
- // 鏃ュ織璁板綍
- if (command.getTaskMode() != 0) {
- BasSteOptService bean = SpringUtils.getBean(BasSteOptService.class);
- if (null != bean) {
- BasSteOpt basSteOpt = new BasSteOpt(
- command.getTaskNo(), // 浠诲姟鍙�
- command.getJarNo(), // 纭寲缃�
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().desc, // 浣滀笟
- null, // 婧愭帓
- null, // 婧愬垪
- null, // 婧愬眰
- null, // 婧愮珯
- null, // 鐩爣鎺�
- null, // 鐩爣鍒�
- null, // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- bean.insert(basSteOpt);
- }
- }
- } catch (Exception ignore) {}
-
- if (result1 != null && result1.IsSuccess && result2 != null && result2.IsSuccess ) {
-
- News.info("纭寲缃愬懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
- OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 纭寲缃愬懡浠や笅鍙戯細 {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
- try {
- Thread.sleep(500);
- } catch (Exception e){ }
- return true;
- } else {
- OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ョ～鍖栫綈plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- News.error("鍐欏叆纭寲缃恜lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initSte();
- return false;
- }
- }
-
- @Override
- public void close() {
-// siemensS7Net.ConnectClose();
- }
-
- /**
- * 蹇冭烦
- */
- private void heartbeat(){
- if (heartBeatVal == 1) {
- heartBeatVal = 2;
- } else {
- heartBeatVal = 1;
- }
- OperateResult write = siemensS7Net.Write("D10", heartBeatVal);
- if (!write.IsSuccess) {
- News.error("纭寲缃恜lc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
- }
- }
-
-}
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
deleted file mode 100644
index 59c5e82..0000000
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ /dev/null
@@ -1,469 +0,0 @@
-package com.zy.core.thread;
-
-import HslCommunication.Core.Types.OperateResult;
-import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.Profinet.Melsec.MelsecMcNet;
-import com.alibaba.fastjson.JSON;
-import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasCrnOpt;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.service.BasCrnOptService;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.core.CrnThread;
-import com.zy.core.ThreadHandler;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.CrnStatusType;
-import com.zy.core.enums.CrnTaskModeType;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
-import com.zy.core.model.protocol.CrnProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.text.MessageFormat;
-import java.util.Date;
-
-/**
- * 鍫嗗灈鏈虹嚎绋�
- * Created by vincent on 2020/8/4
- */
-@Data
-@Slf4j
-public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread {
-
- private MelsecMcNet melsecMcNet;
- private CrnSlave slave;
- private CrnProtocol crnProtocol;
- private short heartBeatVal = 1;
- private boolean resetFlag = false;
-
- /**
- * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
- */
- private boolean backHpFlag = false;
-
- public MelsecCrnThread(CrnSlave slave) {
- this.slave = slave;
- }
-
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- this.connect();
-// try {
-// Thread.sleep(2000);
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
- while (true) {
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- readStatus();
- break;
- // 鍐欏叆鏁版嵁
- case 2:
- write((CrnCommand) task.getData());
- break;
- // 澶嶄綅
- case 3:
- CrnCommand command = (CrnCommand) task.getData();
- if (null == command) {
- command = new CrnCommand();
- }
- command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- write(command);
- break;
- default:
- break;
- }
- // 蹇冭烦
- heartbeat();
- Thread.sleep(500);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
- }
-
- /**
- * 鍒濆鍖栧爢鍨涙満鐘舵��
- */
- private void initCrn() {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
- }
- crnProtocol.setMode((short) -1);
-// crnProtocol.setTaskNo((short)0);
- crnProtocol.setStatus((short)-1);
- crnProtocol.setBay((short)0);
- crnProtocol.setLevel((short)0);
- crnProtocol.setForkPos((short) -1);
- crnProtocol.setLiftPos((short) -1);
- crnProtocol.setWalkPos((short)0);
- crnProtocol.setLoaded((short)0);
- crnProtocol.setAlarm((short)0);
- crnProtocol.setxSpeed((short)0);
- crnProtocol.setySpeed((short)0);
- crnProtocol.setzSpeed((short)0);
- crnProtocol.setxDistance((short)0);
- crnProtocol.setyDistance((short)0);
- crnProtocol.setxDuration((short)0);
- crnProtocol.setyDuration((short)0);
- }
-
- @Override
- public boolean connect() {
- boolean result = false;
- melsecMcNet = new MelsecMcNet(slave.getIp(), slave.getPort());
- OperateResult connect = melsecMcNet.ConnectServer();
- if(connect.IsSuccess){
- result = true;
- OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initCrn();
- }
-// melsecMcNet.ConnectClose();
- return result;
- }
-
- /**
- * 璇诲彇鐘舵��
- */
- private void readStatus(){
- try {
-// if (this.slave.getId() == 1 && flag1.equals(0)) {
-// Thread.sleep(3000);
-// flag1=1;
-// System.out.println("===");
-// }
- OperateResultExOne<byte[]> result = melsecMcNet.Read("D20", (short) 70);
- if (result.IsSuccess) {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
- crnProtocol.setCrnNo(slave.getId());
- }
- crnProtocol.setMode(melsecMcNet.getByteTransform().TransInt16(result.Content, 0));
- crnProtocol.setTaskNo(melsecMcNet.getByteTransform().TransInt16(result.Content, 2));
- crnProtocol.setStatus(melsecMcNet.getByteTransform().TransInt16(result.Content, 4));
- crnProtocol.setBay(melsecMcNet.getByteTransform().TransInt16(result.Content, 6));
- crnProtocol.setLevel(melsecMcNet.getByteTransform().TransInt16(result.Content, 8));
- crnProtocol.setForkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 10));
- crnProtocol.setLiftPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 12));
- crnProtocol.setWalkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 14));
- crnProtocol.setLoaded(melsecMcNet.getByteTransform().TransInt16(result.Content, 16));
- crnProtocol.setAlarm(melsecMcNet.getByteTransform().TransInt16(result.Content, 18));
- crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransInt16(result.Content, 20));
- crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
- crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 24));
- crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
- crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
- crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
- crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
- crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));
-
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
- // 澶嶄綅淇″彿
- if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- log.error("-------------------------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}][宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负90锛岀瓑寰呯‘璁わ紒锛�",slave.getId(),crnProtocol.getTaskNo());
- if (resetFlag) {
- if(crnProtocol.getTaskNo()==9999){
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- if (write(crnCommand)) {
- resetFlag = false;
- }
- }
- }
-
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = new BasCrnp();
- basCrnp.setCrnErr(crnProtocol.getAlarm()==null?0:crnProtocol.getAlarm().longValue());
- basCrnp.setCrnNo(slave.getId());
- basCrnp.setCrnSts((int)crnProtocol.getMode());
- if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
-
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆憑1}鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�",DateUtils.convert(new Date()), slave.getId()));
- throw new CoolException(MessageFormat.format( "鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initCrn();
- }
-
- }
-
- /**
- * 鍐欏叆鏁版嵁
- */
- private boolean write(CrnCommand command){
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
-
-// OperateResult result = null;
-// try{
-// Integer exeCount=0;
-// do{
-// command.setCrnNo(slave.getId());
-// short[] array = new short[10];
-// array[0] = command.getAckFinish();
-// array[1] = command.getTaskNo();
-// array[2] = command.getTaskMode();
-// array[3] = command.getSourcePosX();
-// array[4] = command.getSourcePosY();
-// array[5] = command.getSourcePosZ();
-// array[6] = command.getDestinationPosX();
-// array[7] = command.getDestinationPosY();
-// array[8] = command.getDestinationPosZ();
-// array[9] = command.getCommand();
-// result = melsecMcNet.Write("D0", array);
-// if(result.IsSuccess) {
-// if (command.getAckFinish() == 0) {
-// short commandFinish = 1;
-// result = melsecMcNet.Write("D9", commandFinish);
-// if(result.IsSuccess){
-// //鍐欎换鍔＄‘璁よ繑鍥炴垚鍔熷悗锛屾煡璇㈢‘璁や竴娆�
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result1 = melsecMcNet.Read("D9", (short)2);
-// if(result1.IsSuccess){
-// short commandVal = melsecMcNet.getByteTransform().TransInt16(result1.Content,2);
-// if(commandVal==1){
-// break;
-// } else {
-// exeCount++;
-// }
-// } else{
-// exeCount++;
-// }
-// }else{
-// exeCount++;
-// }
-// }
-// }else{
-// exeCount++;
-// }
-// Thread.sleep(200);
-// }while(exeCount>3);
-// }catch (Exception e){
-//
-// }
-
- command.setCrnNo(slave.getId());
- short[] array = new short[10];
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
- array[9] = command.getCommand();
- OperateResult result = melsecMcNet.Write("D0", array);
-
- if (command.getAckFinish() == 0) {
- short commandFinish = 1;
- result = melsecMcNet.Write("D9", commandFinish);
- }
-
- try {
- // 鏃ュ織璁板綍
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
-
- if (result != null && result.IsSuccess) {
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- return false;
- }
- }
-
- @Override
- public void close() {
- melsecMcNet.ConnectClose();
- }
-
- /**
- * 蹇冭烦
- */
- private void heartbeat(){
- if (heartBeatVal == 1) {
- heartBeatVal = 2;
- } else {
- heartBeatVal = 1;
- }
- OperateResult write = melsecMcNet.Write("D10", heartBeatVal);
- if (!write.IsSuccess) {
- log.error("鍫嗗灈鏈簆lc蹇冭烦閫氳澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
- }
-
-
- /******************************************************************************************/
- /**************************************** 娴嬭瘯涓撶敤 *****************************************/
- /*****************************************************************************************/
- public static void main(String[] args) throws InterruptedException {
- CrnSlave slave = new CrnSlave();
- slave.setId(1);
- slave.setIp("192.168.3.39");
- slave.setPort(5015);
- slave.setRack(0);
- slave.setSlot(0);
- MelsecCrnThread melsecCrnThread = new MelsecCrnThread(slave);
- melsecCrnThread.connect();
- melsecCrnThread.readStatus();
- System.out.println(JSON.toJSONString(melsecCrnThread.crnProtocol));
-
- // 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 3); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 2.鍑哄簱 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 4); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-
-// // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂 pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// command.setSourcePosX((short)2); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short)2); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)3); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)4); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)4); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 4.绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// command.setSourcePosX((short)1); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)1); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-// // 5.鍥炲師鐐� 涓嶇敤鍙� pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-
- // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
-// if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr
-// || crnThread.crnProtocol.getCrnError2().rightTakeNoneErr
-// || crnThread.crnProtocol.getCrnError2().leftPutLoadErr
-// || crnThread.crnProtocol.getCrnError2().rightPutLoadErr) {
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
-// Thread.sleep(3000L);
-// crnThread.write(command);
-// }
-
- }
-
- @Override
- public void setResetFlagTwo(boolean flag) {
-
- }
-}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
deleted file mode 100644
index 699d8dc..0000000
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ /dev/null
@@ -1,904 +0,0 @@
-package com.zy.core.thread;
-
-import HslCommunication.Core.Types.OperateResult;
-import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasCrnOpt;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.service.BasCrnOptService;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.core.CrnThread;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.*;
-import com.zy.core.model.CrnSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
-import com.zy.core.model.cpmmandParam.CrnCommandParam;
-import com.zy.core.model.protocol.CrnProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.text.MessageFormat;
-import java.util.Date;
-
-/**
- * 鍫嗗灈鏈虹嚎绋�
- * Created by vincent on 2020/8/4
- */
-@Data
-@Slf4j
-public class SiemensCrnThread implements Runnable, CrnThread {
-
- private SiemensS7Net siemensNet;
- private CrnSlave slave;
- private CrnProtocol crnProtocol;
- private boolean resetFlag = false;
- private boolean resetFlagTwo = false;
-
- public Long sign = System.currentTimeMillis();
-
- public boolean isRunning = true;
-
- /**
- * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
- */
- private boolean backHpFlag = false;
- private boolean backHpFlagTwo = false;
-
- public SiemensCrnThread(CrnSlave slave) {
- this.slave = slave;
- }
-
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- this.connect();
- sign = System.currentTimeMillis();
- while (isRunning) {
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- readStatus();
- break;
- // 鍐欏叆鏁版嵁
- case 2:
- write((CrnCommand) task.getData());
- break;
- // 澶嶄綅
- case 3:
- CrnCommand command = (CrnCommand) task.getData();
- if (null == command) {
- command = new CrnCommand();
- }
- command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- write(command);
- break;
- // 鍐欏叆鏁版嵁
- case 5:
- write5((CrnCommand) task.getData());
- break;
- // 澶嶄綅
- case 6:
- CrnCommand command2 = (CrnCommand) task.getData();
- if (null == command2) {
- command2 = new CrnCommand();
- }
- command2.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- command2.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command2.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command2.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- command2.setSourcePosX((short)0); // 婧愬簱浣嶆帓
- command2.setSourcePosY((short)0); // 婧愬簱浣嶅垪
- command2.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
- command2.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
- command2.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
- command2.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- write5(command2);
- break;
- // 鍙屽伐浣嶅悓鏃朵綔涓�
- case 9:
- write9((CrnCommandParam) task.getData());
- break;
- default:
- break;
- }
- Thread.sleep(500);
- } catch (Exception e) {
-// e.printStackTrace();
- }
-// System.out.println("绗�"+slave.getId()+"涓爢鍨涙満绾跨▼杩愯涓�杞細"+(System.currentTimeMillis()-sign));
- sign = System.currentTimeMillis();
- }
- }
-
- /**
- * 鍒濆鍖栧爢鍨涙満鐘舵��
- */
- private void initCrn() {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
- }
- crnProtocol.setMode((short) -1);
-// crnProtocol.setTaskNo((short)0);
- crnProtocol.setStatus((short)-1);
- crnProtocol.setStatusTwo((short)-1);
- crnProtocol.setBay((short)0);
- crnProtocol.setLevel((short)0);
- crnProtocol.setForkPos((short) -1);
- crnProtocol.setLiftPos((short) -1);
- crnProtocol.setWalkPos((short)0);
- crnProtocol.setLoaded((short)0);
- crnProtocol.setAlarm((short)0);
- crnProtocol.setxSpeed((short) 0);
- crnProtocol.setySpeed((short) 0);
- crnProtocol.setzSpeed((short) 0);
- crnProtocol.setxDistance((short) 0);
- crnProtocol.setyDistance((short) 0);
- crnProtocol.setxDuration((short) 0);
- crnProtocol.setyDuration((short) 0);
-
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = basCrnpService.selectById(slave.getId());
- basCrnp.setCrnSts((int)crnProtocol.getMode());
- basCrnp.setCrnStatusOne(-1);
- basCrnp.setCrnStatusTwo(-1);
- if (!basCrnpService.updateById(basCrnp)){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- }
-
- @Override
- public boolean connect() {
- boolean result = false;
- siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
- siemensNet.setRack(slave.getRack().byteValue());
- siemensNet.setSlot(slave.getSlot().byteValue());
- OperateResult connect = siemensNet.ConnectServer();
- if(connect.IsSuccess){
- result = true;
- OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- initCrn();
- }
-// siemensNet.ConnectClose();
- return result;
- }
-
- /**
- * 璇诲彇鐘舵��
- */
- private void readStatus(){
- try {
- OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>();
- if (slave.getId()>2 && slave.getId()<6){
- result = siemensNet.Read("DB101.0", (short) 66);
- } else {
- result = siemensNet.Read("DB101.0", (short) 56);
- }
- if (result.IsSuccess) {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
- crnProtocol.setCrnNo(slave.getId());
- }
- crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
- crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
- crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
- crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
- crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
- crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
-
- if (slave.getId()<3 || slave.getId()>5){
- crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
- crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
- crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
- crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
- } else {
- crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 12));
-
- crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- crnProtocol.setBayTwo(siemensNet.getByteTransform().TransInt16(result.Content, 18));
- crnProtocol.setLevelTwo(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22));
- crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24));
-
- crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
-
- crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
- crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));
-
- crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
- crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
-// crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
-
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 50));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 54));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 58));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 62));
- }
-
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
- // 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusType()) && (crnProtocol.getStatusType().equals(CrnStatusType.WAITING) || crnProtocol.getStatusType().equals(CrnStatusType.SEPARATE_WAITING))) {
- log.error("-------------------------宸ヤ綅1-------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�:{}]==>> 鐘舵�佷负{}锛岀瓑寰呯‘璁わ紒锛�",
- slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "鏈夌墿" : "鏃犵墿",crnProtocol.getStatusType());
- if (resetFlag) {
- if(crnProtocol.getTaskNo()==9999){
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- if (write(crnCommand)) {
- resetFlag = false;
- }
- }
- }
-
- // 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && (crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING) || crnProtocol.getStatusTypeTwo().equals(CrnStatusType.SEPARATE_WAITING))) {
- log.error("-------------------------宸ヤ綅2-------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�:{}]==>> 鐘舵�佷负{}锛岀瓑寰呯‘璁わ紒锛�",
- slave.getId(),crnProtocol.getTaskNoTwo(), crnProtocol.getLoadedTwo()==1 ? "鏈夌墿" : "鏃犵墿",crnProtocol.getStatusTypeTwo());
- if (resetFlagTwo) {
- if(crnProtocol.getTaskNoTwo()==9999){
- backHpFlagTwo = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- if (write5(crnCommand)) {
- resetFlagTwo = false;
- }
- }
- }
-
- try {
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = new BasCrnp();
- basCrnp.setCrnNo(slave.getId());
- basCrnp.setCrnSts((int)crnProtocol.getMode());
- if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- } catch (Exception ignore){}
-
- } else {
- initCrn();
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- } catch (Exception e) {
- e.printStackTrace();
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initCrn();
- }
- }
-
- private void convertRow(CrnCommand crnCommand) {
- if (crnCommand.getSourcePosX() != null && crnCommand.getSourcePosX() != 0) {
- crnCommand.setSourcePosX((short) (crnCommand.getSourcePosX() - ((slave.getId() - 1) * 4)));
- }
- if (crnCommand.getDestinationPosX() != null && crnCommand.getDestinationPosX() != 0) {
- crnCommand.setDestinationPosX((short) (crnCommand.getDestinationPosX() - ((slave.getId() - 1) * 4)));
- }
- }
-
- /**
- * 鍐欏叆鏁版嵁
- */
- private boolean write(CrnCommand command) throws InterruptedException {
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
-// convertRow(command);
- command.setCrnNo(slave.getId());
- short[] array = new short[10];
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
-// array[9] = command.getSourceStaNo();
-// array[10] = command.getDestinationStaNo();
- array[9] = command.getCommand();
- OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
- OperateResult result = siemensNet.Write("DB100.0", array);
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
-
-
-
- //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- Thread.sleep(200);
- int writeCount = 1;
- do {
- try{
- if(!result.IsSuccess){
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result = siemensNet.Write("DB100.0", array);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
- if (resultRead.IsSuccess) {
- CrnCommand one = new CrnCommand();
- one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
- one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
- if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
- || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
- || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
- || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
- ){
- try{
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
- }catch (Exception e){
- try{
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(resultRead));
- }catch (Exception e1){
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
- }
- }
- try{
- Thread.sleep(100);
- }catch (Exception e){
-
- }
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result = siemensNet.Write("DB100.0", array);
- writeCount++;
- continue;
- } else {
- log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
- break;
- }
- }
- }catch (Exception e){
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- if (command.getAckFinish() == 0) {
- short commandFinish = 1;
- Thread.sleep(100L);
- result = siemensNet.Write("DB100.18", commandFinish);
- int signFinish = 1;
- while (signFinish<5){
- OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
- short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
- if (transInt16 != commandFinish){
- log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
- result = siemensNet.Write("DB100.18", commandFinish);
- signFinish++;
- }else {
- log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
- break;
- }
- }
- }
-
- try {
- // 鏃ュ織璁板綍
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
-
- if (result != null && result.IsSuccess) {
- Thread.sleep(200);
- this.readStatus();
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- return false;
- }
- }
-
- /**
- * 鍐欏叆鏁版嵁 宸ヤ綅2
- */
- private boolean write5(CrnCommand command) throws InterruptedException {
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
-// convertRow(command);
- command.setCrnNo(slave.getId());
- short[] array = new short[10];
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
-// array[9] = command.getSourceStaNo();
-// array[10] = command.getDestinationStaNo();
- array[9] = command.getCommand();
- OperateResult result18 = siemensNet.Write("DB100.38", (short)0);
- OperateResult result = siemensNet.Write("DB100.20", array);
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
-
- //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- Thread.sleep(200);
- int writeCount = 1;
- do {
- try{
- if(!result.IsSuccess){
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result = siemensNet.Write("DB100.20", array);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 24);
- if (resultRead.IsSuccess) {
- CrnCommand one = new CrnCommand();
- one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
- one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
- if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
- || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
- || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
- || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
- ){
- try{
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
- }catch (Exception e){
- try{
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(resultRead));
- }catch (Exception e1){
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSONString(command));
- }
- }
- try{
- Thread.sleep(100);
- }catch (Exception e){
-
- }
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(command),writeCount);
- result = siemensNet.Write("DB100.20", array);
- writeCount++;
- continue;
- } else {
- log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command),JSON.toJSONString(one));
- break;
- }
- }
- }catch (Exception e){
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- if (command.getAckFinish() == 0) {
- short commandFinish = 1;
- Thread.sleep(100L);
- result = siemensNet.Write("DB100.38", commandFinish);
- int signFinish = 1;
- while (signFinish<5){
- OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.38", (short) 2);
- short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
- if (transInt16 != commandFinish){
- log.info("涓嬪彂DB100.38 鍥炶澶辫触" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.38 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
- result = siemensNet.Write("DB100.38", commandFinish);
- signFinish++;
- }else {
- log.info("涓嬪彂DB100.38" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.38" + "array:"+ JSON.toJSONString(array));
- break;
- }
- }
- }
-
- try {
- // 鏃ュ織璁板綍
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
-
- if (result != null && result.IsSuccess) {
- Thread.sleep(200);
- this.readStatus();
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- return false;
- }
- }
-
- /**
- * 鍐欏叆鏁版嵁 鍙屽伐浣�
- */
- private boolean write9(CrnCommandParam command) throws InterruptedException {
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
- command.setCrnNo(slave.getId());
- short[] array = new short[22];
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
- array[9] = command.getCommand();
- array[10] = command.getAckFinish2();
- array[11] = command.getTaskNo2();
- array[12] = command.getTaskMode2();
- array[13] = command.getSourcePosX2();
- array[14] = command.getSourcePosY2();
- array[15] = command.getSourcePosZ2();
- array[16] = command.getDestinationPosX2();
- array[17] = command.getDestinationPosY2();
- array[18] = command.getDestinationPosZ2();
- array[19] = command.getCommand();
- array[20] = (short)1;
- array[21] = (short)1;
- OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
- OperateResult result38 = siemensNet.Write("DB100.38", (short)0);
- OperateResult result = siemensNet.Write("DB100.0", array);
-// OperateResult result = siemensNet.Write("DB100.20", array);
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
-
- //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- Thread.sleep(200);
- int writeCount = 1;
- do {
- try{
- if(!result.IsSuccess){
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
- result = siemensNet.Write("DB100.0", array);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 40);
- if (resultRead.IsSuccess) {
- CrnCommandParam one = new CrnCommandParam();
- one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
- one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
- one.setTaskNo2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 22));
- one.setTaskMode2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 24));
- one.setSourcePosX2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 26));
- one.setSourcePosY2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 28));
- one.setSourcePosZ2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 30));
- one.setDestinationPosX2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 32));
- one.setDestinationPosY2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 34));
- one.setDestinationPosZ2(siemensNet.getByteTransform().TransInt16(resultRead.Content, 36));
- if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
- || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
- || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
- || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
- ||
- !command.getTaskNo2().equals(one.getTaskNo2()) || !command.getTaskMode2().equals(one.getTaskMode2())
- || !command.getSourcePosX2().equals(one.getSourcePosX2()) || !command.getSourcePosY2().equals(one.getSourcePosY2())
- || !command.getSourcePosZ2().equals(one.getSourcePosZ2()) || !command.getDestinationPosX2().equals(one.getDestinationPosX2())
- || !command.getDestinationPosY2().equals(one.getDestinationPosY2()) || !command.getDestinationPosZ2().equals(one.getDestinationPosZ2())
- ){
- try{
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
- }catch (Exception e){
- try{
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
- }catch (Exception e1){
- log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
- }
- }
- try{
- Thread.sleep(100);
- }catch (Exception e){
-
- }
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
- result = siemensNet.Write("DB100.0", array);
- writeCount++;
- continue;
- } else {
- log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
- break;
- }
- }
- }catch (Exception e){
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- if (command.getAckFinish() == 0) {
- short commandFinish = 1;
- Thread.sleep(100L);
- result18 = siemensNet.Write("DB100.18", commandFinish);
- result38 = siemensNet.Write("DB100.38", commandFinish);
- int signFinish = 1;
- while (signFinish<5){
- OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
- OperateResultExOne<byte[]> result10038 = siemensNet.Read("DB100.38", (short) 2);
- short transInt1618 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
- short transInt1638 = siemensNet.getByteTransform().TransInt16(result10038.Content, 0);
- if (transInt1618 != commandFinish || transInt1638 != commandFinish){
- log.info("涓嬪彂DB100.18/DB100.38 鍥炶澶辫触" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.18/DB100.38 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
- result18 = siemensNet.Write("DB100.18", commandFinish);
- result38 = siemensNet.Write("DB100.38", commandFinish);
- signFinish++;
- }else {
- log.info("涓嬪彂DB100.18/DB100.38" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.18/DB100.38" + "array:"+ JSON.toJSONString(array));
- break;
- }
- }
- }
-
- try {
- // 鏃ュ織璁板綍
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
-
- if (result != null && result.IsSuccess) {
- Thread.sleep(200);
- this.readStatus();
- log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- return false;
- }
- }
-
-
- @Override
- public void close() {
- siemensNet.ConnectClose();
- }
-
- /******************************************************************************************/
- /**************************************** 娴嬭瘯涓撶敤 *****************************************/
- /*****************************************************************************************/
- public static void main(String[] args) throws InterruptedException {
- CrnSlave slave = new CrnSlave();
- slave.setId(1);
- slave.setIp("192.168.6.9");
- slave.setRack(0);
- slave.setSlot(0);
- SiemensCrnThread crnThread = new SiemensCrnThread(slave);
- crnThread.connect();
- crnThread.readStatus();
- System.out.println(JSON.toJSONString(crnThread.crnProtocol));
- Thread.sleep(3000L);
-
- // 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 3); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 2.鍑哄簱 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 4); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-
-// // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂 pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// command.setSourcePosX((short)2); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short)2); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)3); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)4); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)4); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 4.绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// command.setSourcePosX((short)1); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)1); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-// // 5.鍥炲師鐐� 涓嶇敤鍙� pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
-// // 7.鍧愭爣绉昏 鐩爣鍙� pass
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
-// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
-// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 1); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
-// crnThread.write(command);
-
- // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
-// if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr
-// || crnThread.crnProtocol.getCrnError2().rightTakeNoneErr
-// || crnThread.crnProtocol.getCrnError2().leftPutLoadErr
-// || crnThread.crnProtocol.getCrnError2().rightPutLoadErr) {
-// CrnCommand command = new CrnCommand();
-// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
-// Thread.sleep(3000L);
-// crnThread.write(command);
-// }
-
- }
-
- // 鎻愪緵涓�涓柟娉曟潵鍋滄绾跨▼
- public void requestStop() {
- isRunning = false;
- }
-
-}
diff --git a/src/main/java/taskRecord.sql b/src/main/java/taskRecord.sql
deleted file mode 100644
index c7bbf4f..0000000
--- a/src/main/java/taskRecord.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save taskRecord record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'taskRecord/taskRecord.html', 'taskRecord绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'taskRecord#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'taskRecord#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'taskRecord#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'taskRecord#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'taskRecord#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'taskRecord/taskRecord.html', N'taskRecord绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'taskRecord#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'taskRecord#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'taskRecord#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'taskRecord#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'taskRecord#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9c09009..9b95660 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -18,14 +18,9 @@
host: localhost
port: 6379
database: 0
-# password: xltys1995
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
-# global-config:
-# field-strategy: 0
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/@pom.build.finalName@/logs
@@ -37,210 +32,8 @@
swagger:
enable: false
-wms:
- url: localhost:8080/yxwms
-
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍙屾繁
- doubleDeep: true
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,21,24,27
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
- # 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft: 1,5,21
- # 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 4,8,24,27
- # 鍫嗗灈鏈�1
- crn[0]:
- id: 1
- ip: 10.10.10.120
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 153
- staNoOther: 152
- row: 4
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- staNoOther: 101
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.130
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 145
- staNoOther: 144
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 148
- staNoOther: 149
- row: 5
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.140
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 261
- staNoOther: 257
- staNoOther1: 256
- staNoOther2: 255
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- staNoOther: 200
- row: 9
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.150
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 260
- staNoOther: 248
- staNoOther1: 247
- staNoOther2: 246
- row: 12
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 250
- staNoOther: 250
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.160
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 259
- staNoOther: 239
- staNoOther1: 238
- staNoOther2: 237
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 241
- staNoOther: 241
- row: 13
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.10
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 413
- staNoOther: 413
- row: 23
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 415
- staNoOther: 415
- row: 22
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.20
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 405
- staNoOther: 405
- row: 26
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 407
- staNoOther: 407
- row: 25
- bay: 1
- lev: 1
-
# 杈撻�佺嚎
devp[0]:
id: 1
@@ -248,42 +41,6 @@
port: 102
rack: 0
slot: 0
- # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
- inSingleSta[0]:
- staNo: 173
- barcode: ${wcs-slave.barcode[2].id}
- # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
- emptyInSingleSta[0]:
- staNo: 104
- # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
- emptyInSingleSta[1]:
- staNo: 126
- # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
- emptyInSingleSta[2]:
- staNo: 131
-# # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
-# emptyInSingleSta[1]:
-# staNo: 173
- # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
- inLargeSta[0]:
- staNo: 292
- barcode: ${wcs-slave.barcode[1].id}
- # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
- inLargeSta[1]:
- staNo: 281
- barcode: ${wcs-slave.barcode[0].id}
- # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
- emptyInLargeSta[0]:
- staNo: 292
- # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
- emptyInLargeSta[1]:
- staNo: 281
- # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
- emptyInLargeSta[2]:
- staNo: 310
- # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
- emptyInLargeSta[3]:
- staNo: 312
# 杈撻�佺嚎
devp[1]:
id: 2
@@ -291,472 +48,6 @@
port: 102
rack: 0
slot: 0
- # 绌烘澘鍏ュ簱鍙�1(涓存椂)
- emptyInSta[0]:
- staNo: 511
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�1(涓存椂)
- emptyInSta[1]:
- staNo: 515
- # 绌烘澘鍏ュ簱鍙�1(涓存椂)
- emptyInSta[2]:
- staNo: 536
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�1(涓存椂)
- emptyInSta[3]:
- staNo: 607
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 460
- barcode: ${wcs-slave.barcode[6].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 453
- barcode: ${wcs-slave.barcode[5].id}
- # 鍏ュ簱鍙�464
- inSta464[0]:
- staNo: 464
- led: ${wcs-slave.led[0].id}
- barcode: ${wcs-slave.barcode[10].id}
- # 鍏ョ～鍖栫綈RGV
- enterRgv[0]:
- rgvNo: 623
- steNo: 1
- jarRegin: 1
- burial: 5
- staNoEnter[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 612
- row: 3
- staNoEnter[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 615
- row: 1
- # 鍏ョ～鍖栫綈RGV
- enterRgv[1]:
- rgvNo: 624
- steNo: 2
- jarRegin: 1
- burial: 6
- staNoEnter[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 619
- row: 3
- staNoEnter[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 622
- row: 1
- # 鍑虹～鍖栫綈RGV
- endRgv[0]:
- rgvNo: 625
- steNo: 1
- jarNo: 1
- jarRegin: 1
- burial: 5
- staNoEnd[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 627
- row: 1
- # 鍑虹～鍖栫綈RGV
- endRgv[1]:
- rgvNo: 626
- steNo: 2
- jarNo: 3
- jarRegin: 1
- burial: 6
- staNoEnd[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 628
- row: 1
-
- # 鏉＄爜鎵弿浠�
- barcode[0]:
- id: 1
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[3]:
- id: 4
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[4]:
- id: 5
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[5]:
- id: 6
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[6]:
- id: 7
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[7]:
- id: 8
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[8]:
- id: 9
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[9]:
- id: 10
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[10]:
- id: 11
- ip: 10.10.10.52
- port: 51236
- # LED1
- # JAR1
- jar[0]:
- id: 1
- ip: 10.10.10.190
- port: 120
- jarOtherId: 2
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 612
- rgvNo: 623
- steNo: 1
- row: 3
- # 纭寲缃愬嚭搴撶珯鐐�
- jarOutSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 627
- rgvNo: 625
- steNo: 1
- row: 1
- # 纭寲缃愬叆搴揜GV
- jarInRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 623
- row: 1
- # 纭寲缃愬嚭搴揜GV
- jarOutRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 625
- row: 1
- # 纭寲缃愬叆搴撶┛姊澘
- jarInSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 1
- row: 1
- # 纭寲缃愬嚭搴撶┛姊澘
- jarOutSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 1
- row: 1
- # JAR2
- jar[1]:
- id: 2
- ip: 10.10.10.191
- port: 120
- jarOtherId: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 615
- rgvNo: 623
- steNo: 1
- row: 1
- # 纭寲缃愬嚭搴撶珯鐐�
- jarOutSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 627
- rgvNo: 625
- steNo: 1
- row: 1
- # 纭寲缃愬叆搴揜GV
- jarInRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 623
- row: 1
- # 纭寲缃愬嚭搴揜GV
- jarOutRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 625
- row: 1
- # 纭寲缃愬叆搴撶┛姊澘
- jarInSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 1
- row: 1
- # 纭寲缃愬嚭搴撶┛姊澘
- jarOutSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 1
- row: 1
- # JAR3
- jar[2]:
- id: 3
- ip: 10.10.10.192
- port: 120
- jarOtherId: 4
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 619
- rgvNo: 624
- steNo: 2
- row: 3
- # 纭寲缃愬嚭搴撶珯鐐�
- jarOutSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 628
- rgvNo: 626
- steNo: 2
- row: 1
- # 纭寲缃愬叆搴揜GV
- jarInRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 624
- row: 1
- # 纭寲缃愬嚭搴揜GV
- jarOutRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 626
- row: 2
- # 纭寲缃愬叆搴撶┛姊澘
- jarInSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 2
- row: 2
- # 纭寲缃愬嚭搴撶┛姊澘
- jarOutSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 2
- row: 2
- # JAR4
- jar[3]:
- id: 4
- ip: 10.10.10.193
- port: 120
- jarOtherId: 3
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 622
- rgvNo: 624
- steNo: 2
- row: 3
- # 纭寲缃愬嚭搴撶珯鐐�
- jarOutSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 628
- rgvNo: 626
- steNo: 2
- row: 1
- # 纭寲缃愬叆搴揜GV
- jarInRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 624
- row: 1
- # 纭寲缃愬嚭搴揜GV
- jarOutRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 626
- row: 2
- # 纭寲缃愬叆搴撶┛姊澘
- jarInSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 2
- row: 2
- # 纭寲缃愬嚭搴撶┛姊澘
- jarOutSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 2
- row: 2
- # 鍐峰嵈妲�5
- jar[4]:
- id: 5
- ip: 10.10.10.190
- port: 120
- jarOtherId: 2
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 612
- rgvNo: 623
- steNo: 1
- row: 3
- # 纭寲缃愬嚭搴撶珯鐐�
- jarOutSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 627
- rgvNo: 625
- steNo: 1
- row: 1
- # 纭寲缃愬叆搴揜GV
- jarInRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 623
- row: 1
- # 纭寲缃愬嚭搴揜GV
- jarOutRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 625
- row: 1
- # 纭寲缃愬叆搴撶┛姊澘
- jarInSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 1
- row: 1
- # 纭寲缃愬嚭搴撶┛姊澘
- jarOutSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 1
- row: 1
- # 鍐峰嵈妲�6
- jar[5]:
- id: 6
- ip: 10.10.10.193
- port: 120
- jarOtherId: 3
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 619
- rgvNo: 624
- steNo: 2
- row: 3
- # 纭寲缃愬嚭搴撶珯鐐�
- jarOutSta[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 628
- rgvNo: 626
- steNo: 2
- row: 1
- # 纭寲缃愬叆搴揜GV
- jarInRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 624
- row: 1
- # 纭寲缃愬嚭搴揜GV
- jarOutRgv[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 626
- row: 2
- # 纭寲缃愬叆搴撶┛姊澘
- jarInSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 2
- row: 2
- # 纭寲缃愬嚭搴撶┛姊澘
- jarOutSte[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 2
- row: 2
- # ste1
- ste[0]:
- id: 1
- ip: 10.10.10.170
- port: 502
- rack: 0
- slot: 0
- # 鍏ュ簱绔欑偣
- steInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 612
- rgvNo: 623
- jarNo: 1
- row: 3
- # 鍏ュ簱绔欑偣
- steInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 615
- rgvNo: 623
- jarNo: 2
- row: 1
- # ste2
- ste[1]:
- id: 2
- ip: 10.10.10.175
- port: 502
- rack: 0
- slot: 0
- # 鍏ュ簱绔欑偣
- steInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 619
- rgvNo: 624
- jarNo: 3
- row: 3
- # 鍏ュ簱绔欑偣
- steInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 622
- rgvNo: 624
- jarNo: 4
- row: 1
- # 纾呯Г
- scale[0]:
- id: 1
- ip: 10.10.10.207
- port: 5005
- staNo: 281
- # 纾呯Г
- scale[1]:
- id: 2
- ip: 10.10.10.206
- port: 5005
- staNo: 292
- # 纾呯Г
- scale[2]:
- id: 3
- ip: 10.10.10.209
- port: 5005
- staNo: 453
- # 纾呯Г
- scale[3]:
- id: 4
- ip: 10.10.10.208
- port: 5005
- staNo: 460
- # LED1 鍗婃垚鍝佸簱
- led[0]:
- id: 1
- ip: 10.10.10.220
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 453
- # LED2 鐮寸鍖�
- led[1]:
- id: 2
- ip: 10.10.10.221
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 536
- # LED3 浜屾ゼ鍘熸枡鍖�
- led[2]:
- id: 3
- ip: 10.10.10.222
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 281,292
- # LED4 瀵嗙偧鍖�
- led[3]:
- id: 1
- ip: 10.10.10.223
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 453
\ No newline at end of file
+wms:
+ url: localhost:8080/yxwms
\ No newline at end of file
diff --git a/src/main/resources/mapper/BasCrnErrorMapper.xml b/src/main/resources/mapper/BasCrnErrorMapper.xml
deleted file mode 100644
index e911e0f..0000000
--- a/src/main/resources/mapper/BasCrnErrorMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.BasCrnErrorMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnError">
- <id column="error_code" property="errorCode" />
- <result column="err_name" property="errName" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/BasCrnpMapper.xml b/src/main/resources/mapper/BasCrnpMapper.xml
deleted file mode 100644
index e2ac8b4..0000000
--- a/src/main/resources/mapper/BasCrnpMapper.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.BasCrnpMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnp">
- <id column="crn_no" property="crnNo" />
- <result column="in_enable" property="inEnable" />
- <result column="out_enable" property="outEnable" />
- <result column="crn_sts" property="crnSts" />
- <result column="crn_status_one" property="crnStatusOne" />
- <result column="crn_status_two" property="crnStatusTwo" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_no_two" property="wrkNoTwo" />
- <result column="crn_err" property="crnErr" />
- <result column="frm_locno" property="frmLocno" />
- <result column="frm_sta" property="frmSta" />
- <result column="to_sta" property="toSta" />
- <result column="to_locno" property="toLocno" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="hp_mk" property="hpMk" />
- <result column="retrieve_mk" property="retrieveMk" />
- <result column="ctl_hp" property="ctlHp" />
- <result column="ctl_rest" property="ctlRest" />
- <result column="emp_in" property="empIn" />
- <result column="tank_qty" property="tankQty" />
- <result column="tank_qty1" property="tankQty1" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/BasJarMapper.xml b/src/main/resources/mapper/BasJarMapper.xml
deleted file mode 100644
index d7138f5..0000000
--- a/src/main/resources/mapper/BasJarMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.BasJarMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasJar">
- <id column="jar_no" property="jarNo" />
- <result column="region" property="region" />
- <result column="jar_code" property="jarCode" />
- <result column="sta_no" property="staNo" />
- <result column="jar_status" property="jarStatus" />
- <result column="jar_count" property="jarCount" />
- <result column="jar_err" property="jarErr" />
- <result column="left_door" property="leftDoor" />
- <result column="right_door" property="rightDoor" />
- <result column="left_in_enable" property="leftInEnable" />
- <result column="left_out_enable" property="leftOutEnable" />
- <result column="autoing" property="autoing" />
- <result column="jar_mode" property="jarMode" />
- <result column="right_in_enable" property="rightInEnable" />
- <result column="right_out_enable" property="rightOutEnable" />
- <result column="enter_ste_no" property="enterSteNo" />
- <result column="out_ste_no" property="outSteNo" />
- <result column="enter_rgv_no" property="enterRgvNo" />
- <result column="out_rgv_no" property="outRgvNo" />
- <result column="burial" property="burial" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/BasJarMastMapper.xml b/src/main/resources/mapper/BasJarMastMapper.xml
deleted file mode 100644
index d713143..0000000
--- a/src/main/resources/mapper/BasJarMastMapper.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.BasJarMastMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasJarMast">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="enter_sta_no" property="enterStaNo" />
- <result column="out_sta_no" property="outStaNo" />
- <result column="jar_enter_sta_no" property="jarEnterStaNo" />
- <result column="jar_out_sta_no" property="jarOutStaNo" />
- <result column="jar_id" property="jarId" />
- <result column="jar_regin" property="jarRegin" />
- <result column="status" property="status" />
- <result column="enter_ste_no" property="enterSteNo" />
- <result column="out_ste_id" property="outSteId" />
- <result column="enter_rgv_id" property="enterRgvId" />
- <result column="out_rgv_id" property="outRgvId" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_time" property="appeTime" />
- <result column="jar_loc_digit" property="jarLocDigit" />
- <result column="burial" property="burial" />
-
- </resultMap>
-
- <select id="getJarMastByWrkNo" resultMap="BaseResultMap">
- select top 1 * from asr_bas_jar_mast
- where 1=1
- and wrk_no = #{wrkNo}
- order by jar_loc_digit desc
- </select>
-
- <select id="getJarMastByJarId" resultMap="BaseResultMap">
- select * from asr_bas_jar_mast
- where 1=1
- and jar_id = #{jarId}
- order by jar_loc_digit desc
- </select>
-
- <select id="getJarMastByJarIdAndStatusList" resultMap="BaseResultMap">
- select * from asr_bas_jar_mast
- where 1=1
- and
- (
- status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and jar_id = #{jarId}
- order by jar_loc_digit desc
- </select>
-
- <select id="getJarMastByJarIdAndStatusListB" resultMap="BaseResultMap">
- select * from asr_bas_jar_mast
- where 1=1
- and
- (
- status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and burial = #{jarId}
- order by jar_loc_digit desc
- </select>
-
- <select id="getJarMastByJarIdAndStatusListCharge" resultMap="BaseResultMap">
- select * from asr_bas_jar_mast
- where 1=1
- and
- (
- status not in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and jar_regin = #{jarId}
- order by jar_loc_digit desc
- </select>
-
- <select id="getJarMastByJarIdMax" resultMap="BaseResultMap">
- select top 1 * from asr_bas_jar_mast
- where 1=1
- and
- (
- status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and jar_id = #{jarId}
- order by jar_loc_digit desc
- </select>
-
- <select id="getJarMastByJarIdMaxB" resultMap="BaseResultMap">
- select top 1 * from asr_bas_jar_mast
- where 1=1
- and
- (
- status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and burial = #{jarId}
- order by jar_loc_digit desc
- </select>
-
- <select id="getJarMastByJarIdMin" resultMap="BaseResultMap">
- select top 1 * from asr_bas_jar_mast
- where 1=1
- and
- (
- status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and jar_id = #{jarId}
- order by jar_loc_digit asc
- </select>
-
- <select id="getJarMastByJarIdMinB" resultMap="BaseResultMap">
- select top 1 * from asr_bas_jar_mast
- where 1=1
- and
- (
- status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and burial = #{jarId}
- order by jar_loc_digit asc
- </select>
-
- <select id="getJarMastByJarIdCount" resultType="Integer">
- select count(1) from asr_bas_jar_mast
- where 1=1
- and jar_id = #{jarId}
- </select>
-
- <select id="selectJarMastOperationByStatusList" resultType="Integer">
- SELECT count(1) FROM [dbo].[asr_bas_jar_mast] WHERE status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- AND jar_id = #{jarId}
- </select>
-
- <update id="updateStatus">
- update asr_bas_jar_mast
- set status = #{statusUpdate}
- where 1=1
- and jar_id = #{jarId}
- and status = #{status}
- </update>
-
-</mapper>
diff --git a/src/main/resources/mapper/BasJarMastStatusMapper.xml b/src/main/resources/mapper/BasJarMastStatusMapper.xml
deleted file mode 100644
index 759a405..0000000
--- a/src/main/resources/mapper/BasJarMastStatusMapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.BasJarMastStatusMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasJarMastStatus">
- <id column="id" property="id" />
- <result column="box_specs" property="boxSpecs" />
- <result column="box_type" property="boxType" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/webapp/static/js/console.map12.js b/src/main/webapp/static/js/console.map12.js
deleted file mode 100644
index 532918e..0000000
--- a/src/main/webapp/static/js/console.map12.js
+++ /dev/null
@@ -1,231 +0,0 @@
-mapInfo = {
- "mapName": "STWCS",
- "rackCount": 16,
- "crnCount": 4,
- "stbCount": 16,
- "hpPosition": -1,
- "minBayNo": 2,
- "floors": 1,
- "racks": [],
- "rackDescs": [],
- "crns": [],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 68,
- "left": 80,
- "width": 1400,
- "height": 680,
- "floors": [{
- "type": "floor",
- "id": "page_floor2",
- "text": "2",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-525",
- "text": "525",
- "top": 100,
- "left": 430,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-526",
- "text": "526",
- "top": 150,
- "left": 430,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-527",
- "text": "527",
- "top": 200,
- "left": 430,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-528",
- "text": "528",
- "top": 250,
- "left": 430,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-529",
- "text": "529",
- "top": 300,
- "left": 430,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-530",
- "text": "530",
- "top": 350,
- "left": 430,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-531",
- "text": "531",
- "top": 400,
- "left": 420,
- "width": 69,
- "height": 29
- },{
- "type": "stn",
- "id": "site-532",
- "text": "532",
- "top": 430,
- "left": 430,
- "width": 49,
- "height": 99
- },{
- "type": "stn",
- "id": "site-533",
- "text": "533",
- "top": 530,
- "left": 420,
- "width": 89,
- "height": 49
- },{
- "type": "stn",
- "id": "site-548",
- "text": "548",
- "top": 100,
- "left": 530,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-547",
- "text": "547",
- "top": 150,
- "left": 530,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-546",
- "text": "546",
- "top": 200,
- "left": 530,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-545",
- "text": "545",
- "top": 250,
- "left": 530,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-544",
- "text": "544",
- "top": 300,
- "left": 530,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-543",
- "text": "543",
- "top": 350,
- "left": 530,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-542",
- "text": "542",
- "top": 400,
- "left": 520,
- "width": 69,
- "height": 29
- },{
- "type": "stn",
- "id": "site- ",
- "text": " ",
- "top": 430,
- "left": 530,
- "width": 49,
- "height": 19
- },{
- "type": "stn",
- "id": "site-541",
- "text": "541",
- "top": 450,
- "left": 520,
- "width": 69,
- "height": 29
- },{
- "type": "stn",
- "id": "site-540",
- "text": "540",
- "top": 480,
- "left": 530,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-534",
- "text": "534",
- "top": 530,
- "left": 510,
- "width": 89,
- "height": 49
- },{
- "type": "stn",
- "id": "site-535",
- "text": "535",
- "top": 520,
- "left": 600,
- "width": 49,
- "height": 69
- },{
- "type": "stn",
- "id": "site-536",
- "text": "536",
- "top": 530,
- "left": 650,
- "width": 89,
- "height": 49
- },{
- "type": "stn",
- "id": "site-537",
- "text": "537",
- "top": 520,
- "left": 740,
- "width": 49,
- "height": 69
- },{
- "type": "stn",
- "id": "site-538",
- "text": "538",
- "top": 530,
- "left": 790,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-539",
- "text": "539",
- "top": 510,
- "left": 840,
- "width": 89,
- "height": 89
- }]
- }]
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map2.js b/src/main/webapp/static/js/console.map2.js
deleted file mode 100644
index 29e50a8..0000000
--- a/src/main/webapp/static/js/console.map2.js
+++ /dev/null
@@ -1,1791 +0,0 @@
-mapInfo = {
- "mapName": "STWCS",
- "rackCount": 16,
- "crnCount": 4,
- "stbCount": 16,
- "hpPosition": 1,
- "minBayNo": 2,
- "floors": 1,
- "overflow": "scroll",
- "racks": [{
- "type": "rack",
- "id": "rack1",
- "top": 661,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 639,//-48 ==>3
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 591,//-22 ==>4 //67,//92 103 //591 +25 ==>//616 +11 ==>//627
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 569,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- },{
- "type": "rack",
- "id": "rack5",
- "top": 547,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 525,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 477,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 455,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack9",
- "top": 432,//-22 ==>10
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack10",
- "top": 384,//+25 ==>409 +11 ==>420
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- },{
- "type": "rack",
- "id": "rack11",
- "top": 362,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack12",
- "top": 314,//+25 ==>339
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack13",
- "top": 292,
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack14",
- "top": 244,//+25 ==> 269
- "left": 350,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }],
- "rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc16",
- "text": "#1",
- "top": 661,
- "left": 270,
- "width": 30,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#4",
- "top": 569,
- "left": 270,
- "width": 41,
- "height": 23
- }],
- "crns": [{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 616,// 591(3鍙峰爢鍨涙満),//-22 ==>4 //67,//92 103 //锛堟祴绠楀爢鍨涙満浣嶇疆锛�591 +25 ==>//616 +11 ==>//627
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 627,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 502,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 513,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 409,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 420,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-4",
- "text": "4",
- "top": 339,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 350,
- "left": 273,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-5",
- "text": "5",
- "top": 269,
- "left": 439,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track5",
- "text": "",
- "top": 280,
- "left": 273,
- "width": 1042,
- "height": 2
- }],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 68,
- "left": 80,
- "width": 1400,
- "height": 680,
- "floors": [{
- "type": "floor",
- "id": "page_floor1",
- "text": "灏忔枡绠�",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 641.5,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 664,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 664,
- "left": 1318,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 629,
- "left": 1369,
- "width": 29,
- "height": 55
- },{
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 624,
- "left": 1400,
- "width": 29,
- "height": 60
- },{
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 58,
- "left": 1133,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-124",
- "text": "124",
- "top": 88,
- "left": 1133,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-125",
- "text": "125",
- "top": 118,
- "left": 1133,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-126",
- "text": "126",
- "top": 128,
- "left": 1103,
- "width": 29,
- "height": 19
- },{
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 58,
- "left": 1163,
- "width": 25,
- "height": 20
- },{
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 58,
- "left": 1189,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-129",
- "text": "129",
- "top": 88,
- "left": 1189,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 118,
- "left": 1189,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-131",
- "text": "131",
- "top": 128,
- "left": 1219,
- "width": 29,
- "height": 19
- },{
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 58,
- "left": 1219,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 58,
- "left": 1279,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 58,
- "left": 1339,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 58,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 98,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 138,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 178,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 218,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 258,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 298,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 338,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 378,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 418,
- "left": 1400,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 458,
- "left": 1400,
- "width": 29,
- "height": 59
- },{
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 518,
- "left": 1400,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 548,
- "left": 1400,
- "width": 29,
- "height": 75
- },{
- "type": "stn",
- "id": "site-154",
- "text": "154",
- "top": 572,
- "left": 1369,
- "width": 29,
- "height": 55
- },{
- "type": "stn",
- "id": "site-127",
- "text": "127",
- "top": 158,
- "left": 1133,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-128",
- "text": "128",
- "top": 178,
- "left": 1163,
- "width": 25,
- "height": 20
- },{
- "type": "stn",
- "id": "site-132",
- "text": "132",
- "top": 158,
- "left": 1189,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-133",
- "text": "133",
- "top": 178,
- "left": 1219,
- "width": 69,
- "height": 20
- },{
- "type": "stn",
- "id": "site-134",
- "text": "134",
- "top": 178,
- "left": 1289,
- "width": 79,
- "height": 20
- },{
- "type": "stn",
- "id": "site-135",
- "text": "135",
- "top": 178,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-136",
- "text": "136",
- "top": 218,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-137",
- "text": "137",
- "top": 258,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-138",
- "text": "138",
- "top": 298,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-139",
- "text": "139",
- "top": 338,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-140",
- "text": "140",
- "top": 378,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-141",
- "text": "141",
- "top": 418,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-142",
- "text": "142",
- "top": 458,
- "left": 1369,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-143",
- "text": "143",
- "top": 458,
- "left": 1318,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 458,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-145",
- "text": "145",
- "top": 480,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-148",
- "text": "148",
- "top": 528,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-149",
- "text": "149",
- "top": 550,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-150",
- "text": "150",
- "top": 550,
- "left": 1318,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-147",
- "text": "147",
- "top": 535,
- "left": 1369,
- "width": 29,
- "height": 35
- },{
- "type": "stn",
- "id": "site-146",
- "text": "146",
- "top": 499,
- "left": 1369,
- "width": 29,
- "height": 34
- },{
- "type": "stn",
- "id": "site-151",
- "text": "151",
- "top": 572,
- "left": 1318,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-152",
- "text": "152",
- "top": 572,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-153",
- "text": "153",
- "top": 593,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-155",
- "text": "155",
- "top": 258,
- "left": 1430,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-156",
- "text": "156",
- "top": 258,
- "left": 1455,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-157",
- "text": "157",
- "top": 258,
- "left": 1480,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-158",
- "text": "158",
- "top": 258,
- "left": 1505,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-159",
- "text": "159",
- "top": 258,
- "left": 1530,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-160",
- "text": "160",
- "top": 258,
- "left": 1555,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-161",
- "text": "161",
- "top": 258,
- "left": 1580,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-162",
- "text": "162",
- "top": 258,
- "left": 1605,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-163",
- "text": "163",
- "top": 258,
- "left": 1630,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-164",
- "text": "164",
- "top": 258,
- "left": 1655,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-165",
- "text": "165",
- "top": 258,
- "left": 1680,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-166",
- "text": "166",
- "top": 258,
- "left": 1705,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-167",
- "text": "167",
- "top": 258,
- "left": 1730,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-168",
- "text": "168",
- "top": 258,
- "left": 1755,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-169",
- "text": "169",
- "top": 258,
- "left": 1780,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-170",
- "text": "170",
- "top": 258,
- "left": 1805,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-171",
- "text": "171",
- "top": 258,
- "left": 1830,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-172",
- "text": "172",
- "top": 258,
- "left": 1855,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-193",
- "text": "193",
- "top": 238,
- "left": 1430,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-192",
- "text": "192",
- "top": 238,
- "left": 1455,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-191",
- "text": "191",
- "top": 238,
- "left": 1480,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-190",
- "text": "190",
- "top": 238,
- "left": 1505,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-189",
- "text": "189",
- "top": 238,
- "left": 1530,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-188",
- "text": "188",
- "top": 238,
- "left": 1555,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-187",
- "text": "187",
- "top": 238,
- "left": 1580,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-186",
- "text": "186",
- "top": 238,
- "left": 1605,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-185",
- "text": "185",
- "top": 238,
- "left": 1630,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-184",
- "text": "184",
- "top": 238,
- "left": 1655,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-183",
- "text": "183",
- "top": 238,
- "left": 1680,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-182",
- "text": "182",
- "top": 238,
- "left": 1705,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-181",
- "text": "181",
- "top": 238,
- "left": 1730,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-180",
- "text": "180",
- "top": 238,
- "left": 1755,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-179",
- "text": "179",
- "top": 238,
- "left": 1780,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-178",
- "text": "178",
- "top": 238,
- "left": 1805,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-177",
- "text": "177",
- "top": 238,
- "left": 1830,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-176",
- "text": "176",
- "top": 238,
- "left": 1855,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-175",
- "text": "175",
- "top": 238,
- "left": 1880,
- "width": 24,
- "height": 19
- },{
- "type": "stn",
- "id": "site-174",
- "text": "174",
- "top": 258,
- "left": 1880,
- "width": 24,
- "height": 59
- },{
- "type": "stn",
- "id": "site-173",
- "text": "173",
- "top": 318,
- "left": 1880,
- "width": 24,
- "height": 19
- }]
- }, {
- "type": "floor",
- "id": "page_floor2",
- "text": "澶ф枡绠�",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 434,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 434,
- "left": 1318,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 434,
- "left": 1349,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 434,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 434,
- "left": 1410,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 316,
- "left": 1410,
- "width": 29,
- "height": 57
- },{
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 374,
- "left": 1410,
- "width": 29,
- "height": 59
- },{
- "type": "stn",
- "id": "site-261",
- "text": "261",
- "top": 386,
- "left": 1267,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-257",
- "text": "257",
- "top": 386,
- "left": 1292,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-256",
- "text": "256",
- "top": 386,
- "left": 1318,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-255",
- "text": "255",
- "top": 386,
- "left": 1349,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-254",
- "text": "254",
- "top": 386,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-258",
- "text": "258",
- "top": 407,
- "left": 1380,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-250",
- "text": "250",
- "top": 364,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-251",
- "text": "251",
- "top": 364,
- "left": 1318,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-252",
- "text": "252",
- "top": 364,
- "left": 1349,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-253",
- "text": "253",
- "top": 364,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-260",
- "text": "260",
- "top": 316,
- "left": 1267,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-248",
- "text": "248",
- "top": 316,
- "left": 1292,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-247",
- "text": "247",
- "top": 316,
- "left": 1318,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-246",
- "text": "246",
- "top": 316,
- "left": 1349,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-245",
- "text": "245",
- "top": 316,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-249",
- "text": "249",
- "top": 337,
- "left": 1380,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-241",
- "text": "241",
- "top": 294,
- "left": 1267,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-242",
- "text": "242",
- "top": 294,
- "left": 1318,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-243",
- "text": "243",
- "top": 294,
- "left": 1349,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-244",
- "text": "244",
- "top": 294,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-207",
- "text": "207",
- "top": 294,
- "left": 1410,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-262",
- "text": "262",
- "top": 294,
- "left": 1440,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-263",
- "text": "263",
- "top": 294,
- "left": 1470,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-264",
- "text": "264",
- "top": 294,
- "left": 1500,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-265",
- "text": "265",
- "top": 294,
- "left": 1530,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-266",
- "text": "266",
- "top": 294,
- "left": 1560,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-267",
- "text": "267",
- "top": 294,
- "left": 1590,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-268",
- "text": "268",
- "top": 294,
- "left": 1620,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-269",
- "text": "269",
- "top": 315,
- "left": 1620,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-270",
- "text": "270",
- "top": 365,
- "left": 1620,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-320",
- "text": "320",
- "top": 415,
- "left": 1620,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-321",
- "text": "321",
- "top": 415,
- "left": 1660,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-322",
- "text": "322",
- "top": 415,
- "left": 1700,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-323",
- "text": "323",
- "top": 415,
- "left": 1740,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-324",
- "text": "324",
- "top": 436,
- "left": 1740,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-271",
- "text": "271",
- "top": 486,
- "left": 1740,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-259",
- "text": "259",
- "top": 246,
- "left": 1267,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-239",
- "text": "239",
- "top": 246,
- "left": 1292,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-238",
- "text": "238",
- "top": 246,
- "left": 1318,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-237",
- "text": "237",
- "top": 246,
- "left": 1349,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-236",
- "text": "236",
- "top": 246,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-235",
- "text": "235",
- "top": 225,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-234",
- "text": "234",
- "top": 204,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-231",
- "text": "231",
- "top": 183,
- "left": 1360,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-230",
- "text": "230",
- "top": 183,
- "left": 1310,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-229",
- "text": "229",
- "top": 183,
- "left": 1260,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-227",
- "text": "227",
- "top": 183,
- "left": 1160,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-228",
- "text": "228",
- "top": 183,
- "left": 1210,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-233",
- "text": "233",
- "top": 183,
- "left": 1385,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 162,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-226",
- "text": "226",
- "top": 141,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-225",
- "text": "225",
- "top": 120,
- "left": 1340,
- "width": 69,
- "height": 20
- },{
- "type": "stn",
- "id": "site-312",
- "text": "312",
- "top": 110,
- "left": 1320,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-313",
- "text": "313",
- "top": 120,
- "left": 1290,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-224",
- "text": "224",
- "top": 99,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-223",
- "text": "223",
- "top": 78,
- "left": 1380,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-215",
- "text": "215",
- "top": 57,
- "left": 1360,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-216",
- "text": "216",
- "top": 57,
- "left": 1310,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-217",
- "text": "217",
- "top": 57,
- "left": 1260,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-218",
- "text": "218",
- "top": 57,
- "left": 1210,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 162,
- "left": 1230,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-222",
- "text": "222",
- "top": 141,
- "left": 1230,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-221",
- "text": "221",
- "top": 120,
- "left": 1190,
- "width": 69,
- "height": 20
- },{
- "type": "stn",
- "id": "site-310",
- "text": "310",
- "top": 110,
- "left": 1170,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-311",
- "text": "311",
- "top": 120,
- "left": 1140,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-220",
- "text": "220",
- "top": 99,
- "left": 1230,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-219",
- "text": "219",
- "top": 78,
- "left": 1230,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-208",
- "text": "208",
- "top": 267,
- "left": 1410,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-209",
- "text": "209",
- "top": 246,
- "left": 1410,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 246,
- "left": 1440,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 246,
- "left": 1470,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 246,
- "left": 1500,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 246,
- "left": 1530,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-300",
- "text": "300",
- "top": 246,
- "left": 1560,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-299",
- "text": "299",
- "top": 246,
- "left": 1600,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-298",
- "text": "298",
- "top": 246,
- "left": 1640,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-297",
- "text": "297",
- "top": 267,
- "left": 1655,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-296",
- "text": "296",
- "top": 317,
- "left": 1655,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-329",
- "text": "329",
- "top": 367,
- "left": 1655,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-328",
- "text": "328",
- "top": 367,
- "left": 1695,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-327",
- "text": "327",
- "top": 367,
- "left": 1735,
- "width": 39,
- "height": 20
- },{
- "type": "stn",
- "id": "site-326",
- "text": "326",
- "top": 367,
- "left": 1775,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-325",
- "text": "325",
- "top": 388,
- "left": 1775,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-295",
- "text": "295",
- "top": 438,
- "left": 1775,
- "width": 24,
- "height": 49
- },{
- "type": "stn",
- "id": "site-240",
- "text": "240",
- "top": 267,
- "left": 1380,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-210",
- "text": "210",
- "top": 225,
- "left": 1410,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-211",
- "text": "211",
- "top": 183,
- "left": 1410,
- "width": 29,
- "height": 41
- },{
- "type": "stn",
- "id": "site-212",
- "text": "212",
- "top": 141,
- "left": 1410,
- "width": 29,
- "height": 41
- },{
- "type": "stn",
- "id": "site-213",
- "text": "213",
- "top": 99,
- "left": 1410,
- "width": 29,
- "height": 41
- },{
- "type": "stn",
- "id": "site-214",
- "text": "214",
- "top": 57,
- "left": 1410,
- "width": 29,
- "height": 41
- }]
- }]
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map21.js b/src/main/webapp/static/js/console.map21.js
deleted file mode 100644
index f1171d4..0000000
--- a/src/main/webapp/static/js/console.map21.js
+++ /dev/null
@@ -1,1559 +0,0 @@
-mapInfo = {
- "mapName": "STWCS",
- "rackCount": 16,
- "crnCount": 4,
- "stbCount": 16,
- "hpPosition": 1,
- "minBayNo": 2,
- "floors": 1,
- "overflow": "scroll",
- "racks": [{
- "type": "rack",
- "id": "rack1",
- "top": 661,
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 639,//-48 ==>3
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 591,//-22 ==>4 //67,//92 103 //591 +25 ==>//616 +11 ==>//627
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 569,
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- },{
- "type": "rack",
- "id": "rack5",
- "top": 547,
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 525,
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 477,
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 455,
- "left": 550,
- "width": 917,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 42
- }, {
- "type": "rack",
- "id": "rack9",
- "top": 432,//-22 ==>10
- "left": 350,
- "width": 1117,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack10",
- "top": 384,//+25 ==>409 +11 ==>420
- "left": 350,
- "width": 1117,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- },{
- "type": "rack",
- "id": "rack11",
- "top": 362,
- "left": 350,
- "width": 1117,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack12",
- "top": 314,//+25 ==>339
- "left": 350,
- "width": 1117,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack13",
- "top": 292,
- "left": 350,
- "width": 1117,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack14",
- "top": 244,//+25 ==> 269
- "left": 350,
- "width": 1117,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }],
- "rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc16",
- "text": "#1",
- "top": 661,
- "left": 470,
- "width": 30,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#4",
- "top": 569,
- "left": 470,
- "width": 41,
- "height": 23
- }],
- "crns": [{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 616,// 591(3鍙峰爢鍨涙満),//-22 ==>4 //67,//92 103 //锛堟祴绠楀爢鍨涙満浣嶇疆锛�591 +25 ==>//616 +11 ==>//627
- "left": 639,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 627,
- "left": 473,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 502,
- "left": 639,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 513,
- "left": 473,
- "width": 1042,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 409,
- "left": 639,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 420,
- "left": 293,
- "width": 1242,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-4",
- "text": "4",
- "top": 339,
- "left": 639,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 350,
- "left": 293,
- "width": 1242,
- "height": 2
- },{
- "type": "crane",
- "id": "crn-5",
- "text": "5",
- "top": 269,
- "left": 639,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track5",
- "text": "",
- "top": 280,
- "left": 293,
- "width": 1242,
- "height": 2
- }],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 68,
- "left": 80,
- "width": 1400,
- "height": 680,
- "floors": [{
- "type": "floor",
- "id": "page_floor1",
- "text": "灏忔枡绠�",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-495",
- "text": "495",
- "top": 200,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-651",
- "text": "651",
- "top": 250,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-650",
- "text": "650",
- "top": 300,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-649",
- "text": "649",
- "top": 350,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-648",
- "text": "648",
- "top": 400,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-647",
- "text": "647",
- "top": 450,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-646",
- "text": "646",
- "top": 500,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-645",
- "text": "645",
- "top": 550,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-644",
- "text": "644",
- "top": 600,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-494",
- "text": "494",
- "top": 200,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-600",
- "text": "600",
- "top": 250,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-601",
- "text": "601",
- "top": 300,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-602",
- "text": "602",
- "top": 350,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-603",
- "text": "603",
- "top": 400,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-604",
- "text": "604",
- "top": 450,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-605",
- "text": "605",
- "top": 500,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site- 606",
- "text": "606",
- "top": 550,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-607",
- "text": "607",
- "top": 600,
- "left": 230,
- "width": 49,
- "height": 49
- }, {
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 641.5,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 664,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 664,
- "left": 1518,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 629,
- "left": 1569,
- "width": 29,
- "height": 55
- },{
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 624,
- "left": 1600,
- "width": 29,
- "height": 60
- },{
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 58,
- "left": 1333,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-124",
- "text": "124",
- "top": 88,
- "left": 1333,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-125",
- "text": "125",
- "top": 118,
- "left": 1333,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-126",
- "text": "126",
- "top": 128,
- "left": 1303,
- "width": 29,
- "height": 19
- },{
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 58,
- "left": 1363,
- "width": 25,
- "height": 20
- },{
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 58,
- "left": 1389,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-129",
- "text": "129",
- "top": 88,
- "left": 1389,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 118,
- "left": 1389,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-131",
- "text": "131",
- "top": 128,
- "left": 1419,
- "width": 29,
- "height": 19
- },{
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 58,
- "left": 1419,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 58,
- "left": 1479,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 58,
- "left": 1539,
- "width": 59,
- "height": 20
- },{
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 58,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 98,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 138,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 178,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 218,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 258,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 298,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 338,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 378,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 418,
- "left": 1600,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 458,
- "left": 1600,
- "width": 29,
- "height": 59
- },{
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 518,
- "left": 1600,
- "width": 29,
- "height": 29
- },{
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 548,
- "left": 1600,
- "width": 29,
- "height": 75
- },{
- "type": "stn",
- "id": "site-154",
- "text": "154",
- "top": 572,
- "left": 1569,
- "width": 29,
- "height": 55
- },{
- "type": "stn",
- "id": "site-127",
- "text": "127",
- "top": 158,
- "left": 1333,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-128",
- "text": "128",
- "top": 178,
- "left": 1363,
- "width": 25,
- "height": 20
- },{
- "type": "stn",
- "id": "site-132",
- "text": "132",
- "top": 158,
- "left": 1389,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-133",
- "text": "133",
- "top": 178,
- "left": 1419,
- "width": 69,
- "height": 20
- },{
- "type": "stn",
- "id": "site-134",
- "text": "134",
- "top": 178,
- "left": 1489,
- "width": 79,
- "height": 20
- },{
- "type": "stn",
- "id": "site-135",
- "text": "135",
- "top": 178,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-136",
- "text": "136",
- "top": 218,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-137",
- "text": "137",
- "top": 258,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-138",
- "text": "138",
- "top": 298,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-139",
- "text": "139",
- "top": 338,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-140",
- "text": "140",
- "top": 378,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-141",
- "text": "141",
- "top": 418,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-142",
- "text": "142",
- "top": 458,
- "left": 1569,
- "width": 29,
- "height": 39
- },{
- "type": "stn",
- "id": "site-143",
- "text": "143",
- "top": 458,
- "left": 1518,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 458,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-145",
- "text": "145",
- "top": 480,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-148",
- "text": "148",
- "top": 528,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-149",
- "text": "149",
- "top": 550,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-150",
- "text": "150",
- "top": 550,
- "left": 1518,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-147",
- "text": "147",
- "top": 535,
- "left": 1569,
- "width": 29,
- "height": 35
- },{
- "type": "stn",
- "id": "site-146",
- "text": "146",
- "top": 499,
- "left": 1569,
- "width": 29,
- "height": 34
- },{
- "type": "stn",
- "id": "site-151",
- "text": "151",
- "top": 572,
- "left": 1518,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-152",
- "text": "152",
- "top": 572,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-153",
- "text": "153",
- "top": 593,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-155",
- "text": "155",
- "top": 258,
- "left": 1630,
- "width": 49,
- "height": 19
- },{
- "type": "stn",
- "id": "site-193",
- "text": "193",
- "top": 238,
- "left": 1630,
- "width": 49,
- "height": 19
- }]
- }, {
- "type": "floor",
- "id": "page_floor2",
- "text": "澶ф枡绠�",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 434,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 434,
- "left": 1518,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 434,
- "left": 1549,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 434,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 434,
- "left": 1610,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 316,
- "left": 1610,
- "width": 29,
- "height": 57
- },{
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 374,
- "left": 1610,
- "width": 29,
- "height": 59
- },{
- "type": "stn",
- "id": "site-261",
- "text": "261",
- "top": 386,
- "left": 1467,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-257",
- "text": "257",
- "top": 386,
- "left": 1492,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-256",
- "text": "256",
- "top": 386,
- "left": 1518,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-255",
- "text": "255",
- "top": 386,
- "left": 1549,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-254",
- "text": "254",
- "top": 386,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-258",
- "text": "258",
- "top": 407,
- "left": 1580,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-250",
- "text": "250",
- "top": 364,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-251",
- "text": "251",
- "top": 364,
- "left": 1518,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-252",
- "text": "252",
- "top": 364,
- "left": 1549,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-253",
- "text": "253",
- "top": 364,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-260",
- "text": "260",
- "top": 316,
- "left": 1467,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-248",
- "text": "248",
- "top": 316,
- "left": 1492,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-247",
- "text": "247",
- "top": 316,
- "left": 1518,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-246",
- "text": "246",
- "top": 316,
- "left": 1549,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-245",
- "text": "245",
- "top": 316,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-249",
- "text": "249",
- "top": 337,
- "left": 1580,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-241",
- "text": "241",
- "top": 294,
- "left": 1467,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-242",
- "text": "242",
- "top": 294,
- "left": 1518,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-243",
- "text": "243",
- "top": 294,
- "left": 1549,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-244",
- "text": "244",
- "top": 294,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-207",
- "text": "207",
- "top": 294,
- "left": 1610,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-259",
- "text": "259",
- "top": 246,
- "left": 1467,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-239",
- "text": "239",
- "top": 246,
- "left": 1492,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-238",
- "text": "238",
- "top": 246,
- "left": 1518,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-237",
- "text": "237",
- "top": 246,
- "left": 1549,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-236",
- "text": "236",
- "top": 246,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-235",
- "text": "235",
- "top": 225,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-234",
- "text": "234",
- "top": 204,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-231",
- "text": "231",
- "top": 183,
- "left": 1560,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-230",
- "text": "230",
- "top": 183,
- "left": 1510,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-229",
- "text": "229",
- "top": 183,
- "left": 1460,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-227",
- "text": "227",
- "top": 183,
- "left": 1360,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-228",
- "text": "228",
- "top": 183,
- "left": 1410,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-233",
- "text": "233",
- "top": 183,
- "left": 1585,
- "width": 24,
- "height": 20
- },{
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 162,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-226",
- "text": "226",
- "top": 141,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-225",
- "text": "225",
- "top": 120,
- "left": 1540,
- "width": 69,
- "height": 20
- },{
- "type": "stn",
- "id": "site-312",
- "text": "312",
- "top": 110,
- "left": 1520,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-313",
- "text": "313",
- "top": 120,
- "left": 1490,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-224",
- "text": "224",
- "top": 99,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-223",
- "text": "223",
- "top": 78,
- "left": 1580,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-215",
- "text": "215",
- "top": 57,
- "left": 1560,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-216",
- "text": "216",
- "top": 57,
- "left": 1510,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-217",
- "text": "217",
- "top": 57,
- "left": 1460,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-218",
- "text": "218",
- "top": 57,
- "left": 1410,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 162,
- "left": 1430,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-222",
- "text": "222",
- "top": 141,
- "left": 1430,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-221",
- "text": "221",
- "top": 120,
- "left": 1390,
- "width": 69,
- "height": 20
- },{
- "type": "stn",
- "id": "site-310",
- "text": "310",
- "top": 110,
- "left": 1370,
- "width": 29,
- "height": 40
- },{
- "type": "stn",
- "id": "site-311",
- "text": "311",
- "top": 120,
- "left": 1340,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-220",
- "text": "220",
- "top": 99,
- "left": 1430,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-219",
- "text": "219",
- "top": 78,
- "left": 1430,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-208",
- "text": "208",
- "top": 267,
- "left": 1610,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-209",
- "text": "209",
- "top": 246,
- "left": 1610,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-240",
- "text": "240",
- "top": 267,
- "left": 1580,
- "width": 29,
- "height": 26
- },{
- "type": "stn",
- "id": "site-210",
- "text": "210",
- "top": 225,
- "left": 1610,
- "width": 29,
- "height": 20
- },{
- "type": "stn",
- "id": "site-211",
- "text": "211",
- "top": 183,
- "left": 1610,
- "width": 29,
- "height": 41
- },{
- "type": "stn",
- "id": "site-212",
- "text": "212",
- "top": 141,
- "left": 1610,
- "width": 29,
- "height": 41
- },{
- "type": "stn",
- "id": "site-213",
- "text": "213",
- "top": 99,
- "left": 1610,
- "width": 29,
- "height": 41
- },{
- "type": "stn",
- "id": "site-214",
- "text": "214",
- "top": 57,
- "left": 1610,
- "width": 29,
- "height": 41
- },{
- "type": "stn",
- "id": "site-262",
- "text": "262",
- "top": 294,
- "left": 1640,
- "width": 49,
- "height": 20
- },{
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 246,
- "left": 1640,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-495",
- "text": "495",
- "top": 200,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-651",
- "text": "651",
- "top": 250,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-650",
- "text": "650",
- "top": 300,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-649",
- "text": "649",
- "top": 350,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-648",
- "text": "648",
- "top": 400,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-647",
- "text": "647",
- "top": 450,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-646",
- "text": "646",
- "top": 500,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-645",
- "text": "645",
- "top": 550,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-644",
- "text": "644",
- "top": 600,
- "left": 130,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-494",
- "text": "494",
- "top": 200,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-600",
- "text": "600",
- "top": 250,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-601",
- "text": "601",
- "top": 300,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-602",
- "text": "602",
- "top": 350,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-603",
- "text": "603",
- "top": 400,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-604",
- "text": "604",
- "top": 450,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-605",
- "text": "605",
- "top": 500,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site- 606",
- "text": "606",
- "top": 550,
- "left": 230,
- "width": 49,
- "height": 49
- },{
- "type": "stn",
- "id": "site-607",
- "text": "607",
- "top": 600,
- "left": 230,
- "width": 49,
- "height": 49
- }]
- }]
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map22.js b/src/main/webapp/static/js/console.map22.js
deleted file mode 100644
index 5759910..0000000
--- a/src/main/webapp/static/js/console.map22.js
+++ /dev/null
@@ -1,737 +0,0 @@
-mapInfo = {
- "mapName": "STWCS",
- "rackCount": 16,
- "crnCount": 4,
- "stbCount": 16,
- "hpPosition": 1,
- "minBayNo": 2,
- "floors": 1,
- "overflow": "scroll",
- "racks": [],
- "rackDescs": [],
- "crns": [],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 68,
- "left": 80,
- "width": 1400,
- "height": 680,
- "floors": [{
- "type": "floor",
- "id": "page_floor1",
- "text": "灏忔枡绠�",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-192",
- "text": "192",
- "top": 120,
- "left": 250,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-191",
- "text": "191",
- "top": 120,
- "left": 300,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-190",
- "text": "190",
- "top": 120,
- "left": 350,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-189",
- "text": "189",
- "top": 120,
- "left": 400,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-188",
- "text": "188",
- "top": 120,
- "left": 450,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-187",
- "text": "187",
- "top": 120,
- "left": 500,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-186",
- "text": "186",
- "top": 120,
- "left": 550,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-185",
- "text": "185",
- "top": 120,
- "left": 600,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-184",
- "text": "184",
- "top": 120,
- "left": 650,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-183",
- "text": "183",
- "top": 120,
- "left": 700,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-182",
- "text": "182",
- "top": 120,
- "left": 750,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-181",
- "text": "181",
- "top": 120,
- "left": 800,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-180",
- "text": "180",
- "top": 120,
- "left": 850,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-179",
- "text": "179",
- "top": 120,
- "left": 900,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-178",
- "text": "178",
- "top": 120,
- "left": 950,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-177",
- "text": "177",
- "top": 120,
- "left": 1000,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-176",
- "text": "176",
- "top": 120,
- "left": 1050,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-175",
- "text": "175",
- "top": 120,
- "left": 1100,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-156",
- "text": "156",
- "top": 150,
- "left": 250,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-157",
- "text": "157",
- "top": 150,
- "left": 300,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-158",
- "text": "158",
- "top": 150,
- "left": 350,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-159",
- "text": "159",
- "top": 150,
- "left": 400,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-160",
- "text": "160",
- "top": 150,
- "left": 450,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-161",
- "text": "161",
- "top": 150,
- "left": 500,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-162",
- "text": "162",
- "top": 150,
- "left": 550,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-163",
- "text": "163",
- "top": 150,
- "left": 600,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-164",
- "text": "164",
- "top": 150,
- "left": 650,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-165",
- "text": "165",
- "top": 150,
- "left": 700,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-166",
- "text": "166",
- "top": 150,
- "left": 750,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-167",
- "text": "167",
- "top": 150,
- "left": 800,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-168",
- "text": "168",
- "top": 150,
- "left": 850,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-169",
- "text": "169",
- "top": 150,
- "left": 900,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-170",
- "text": "170",
- "top": 150,
- "left": 950,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-171",
- "text": "171",
- "top": 150,
- "left": 1000,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-172",
- "text": "172",
- "top": 150,
- "left": 1050,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-174",
- "text": "174",
- "top": 150,
- "left": 1100,
- "width": 49,
- "height": 99
- }, {
- "type": "stn",
- "id": "site-173",
- "text": "173",
- "top": 250,
- "left": 1100,
- "width": 49,
- "height": 29
- }]
- }, {
- "type": "floor",
- "id": "page_floor2",
- "text": "澶ф枡绠�",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 120,
- "left": 200,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 120,
- "left": 250,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 120,
- "left": 300,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-300",
- "text": "300",
- "top": 120,
- "left": 350,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-299",
- "text": "299",
- "top": 120,
- "left": 430,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-298",
- "text": "298",
- "top": 120,
- "left": 510,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-297",
- "text": "297",
- "top": 150,
- "left": 540,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-296",
- "text": "296",
- "top": 210,
- "left": 540,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-329",
- "text": "329",
- "top": 270,
- "left": 540,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-328",
- "text": "328",
- "top": 270,
- "left": 620,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-327",
- "text": "327",
- "top": 270,
- "left": 700,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-326",
- "text": "326",
- "top": 270,
- "left": 780,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-325",
- "text": "325",
- "top": 300,
- "left": 810,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-295",
- "text": "295",
- "top": 330,
- "left": 810,
- "width": 49,
- "height": 69
- }, {
- "type": "stn",
- "id": "site-294",
- "text": "294",
- "top": 400,
- "left": 810,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-293",
- "text": "293",
- "top": 400,
- "left": 860,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-292",
- "text": "292",
- "top": 400,
- "left": 910,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-291",
- "text": "291",
- "top": 400,
- "left": 960,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-290",
- "text": "290",
- "top": 400,
- "left": 1010,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-263",
- "text": "263",
- "top": 180,
- "left": 200,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-264",
- "text": "264",
- "top": 180,
- "left": 250,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-265",
- "text": "265",
- "top": 180,
- "left": 300,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-266",
- "text": "266",
- "top": 180,
- "left": 350,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-267",
- "text": "267",
- "top": 180,
- "left": 400,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-268",
- "text": "268",
- "top": 180,
- "left": 450,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-269",
- "text": "269",
- "top": 210,
- "left": 450,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-270",
- "text": "270",
- "top": 270,
- "left": 450,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-320",
- "text": "320",
- "top": 330,
- "left": 450,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-321",
- "text": "321",
- "top": 330,
- "left": 530,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-322",
- "text": "322",
- "top": 330,
- "left": 610,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-323",
- "text": "323",
- "top": 330,
- "left": 690,
- "width": 79,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-324",
- "text": "324",
- "top": 360,
- "left": 720,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-271",
- "text": "271",
- "top": 390,
- "left": 720,
- "width": 49,
- "height": 69
- }, {
- "type": "stn",
- "id": "site-272",
- "text": "272",
- "top": 460,
- "left": 720,
- "width": 89,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-285",
- "text": "285",
- "top": 460,
- "left": 810,
- "width": 99,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-287",
- "text": "287",
- "top": 460,
- "left": 910,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-288",
- "text": "288",
- "top": 460,
- "left": 960,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-289",
- "text": "289",
- "top": 430,
- "left": 1010,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-284",
- "text": "284",
- "top": 490,
- "left": 810,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-283",
- "text": "283",
- "top": 520,
- "left": 810,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-282",
- "text": "282",
- "top": 520,
- "left": 860,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-281",
- "text": "281",
- "top": 520,
- "left": 910,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-280",
- "text": "280",
- "top": 520,
- "left": 960,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-279",
- "text": "279",
- "top": 520,
- "left": 1010,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-273",
- "text": "273",
- "top": 490,
- "left": 720,
- "width": 49,
- "height": 89
- }, {
- "type": "stn",
- "id": "site-274",
- "text": "274",
- "top": 580,
- "left": 720,
- "width": 89,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-275",
- "text": "275",
- "top": 580,
- "left": 810,
- "width": 99,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-276",
- "text": "276",
- "top": 580,
- "left": 910,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-277",
- "text": "277",
- "top": 580,
- "left": 960,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-278",
- "text": "278",
- "top": 550,
- "left": 1010,
- "width": 49,
- "height": 59
- }]
- }]
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map23.js b/src/main/webapp/static/js/console.map23.js
deleted file mode 100644
index 44414de..0000000
--- a/src/main/webapp/static/js/console.map23.js
+++ /dev/null
@@ -1,415 +0,0 @@
-mapInfo = {
- "mapName": "STWCS",
- "rackCount": 16,
- "crnCount": 4,
- "stbCount": 16,
- "hpPosition": -1,
- "minBayNo": 2,
- "floors": 1,
- "racks": [],
- "rackDescs": [],
- "crns": [],
- "areas": [{
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 68,
- "left": 80,
- "width": 1400,
- "height": 680,
- "floors": [{
- "type": "floor",
- "id": "page_floor2",
- "text": "2",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-643",
- "text": "643",
- "top": 150,
- "left": 430,
- "width": 49,
- "height": 199
- }, {
- "type": "stn",
- "id": "site-642",
- "text": "642",
- "top": 350,
- "left": 430,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-641",
- "text": "641",
- "top": 410,
- "left": 430,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-640",
- "text": "640",
- "top": 470,
- "left": 430,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-639",
- "text": "639",
- "top": 530,
- "left": 430,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-638",
- "text": "638",
- "top": 590,
- "left": 430,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-637",
- "text": "637",
- "top": 650,
- "left": 430,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-636",
- "text": "636",
- "top": 650,
- "left": 480,
- "width": 79,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-635",
- "text": "635",
- "top": 650,
- "left": 560,
- "width": 79,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-634",
- "text": "634",
- "top": 650,
- "left": 640,
- "width": 79,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-633",
- "text": "633",
- "top": 650,
- "left": 720,
- "width": 69,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-608",
- "text": "608",
- "top": 150,
- "left": 530,
- "width": 49,
- "height": 49
- }, {
- "type": "stn",
- "id": "site-609",
- "text": "609",
- "top": 200,
- "left": 530,
- "width": 49,
- "height": 49
- }, {
- "type": "stn",
- "id": "site-610",
- "text": "610",
- "top": 210,
- "left": 580,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-611",
- "text": "611",
- "top": 210,
- "left": 630,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-612",
- "text": "612",
- "top": 240,
- "left": 630,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart612",
- "text": "",
- "top": 340,
- "left": 630,
- "width": 49,
- "height": 199
- }, {
- "type": "stn",
- "id": "site-613",
- "text": "613",
- "top": 210,
- "left": 680,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-614",
- "text": "614",
- "top": 210,
- "left": 730,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-615",
- "text": "615",
- "top": 240,
- "left": 730,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart615",
- "text": "",
- "top": 340,
- "left": 730,
- "width": 49,
- "height": 199
- }, {
- "type": "stn",
- "id": "site-616",
- "text": "616",
- "top": 210,
- "left": 780,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-617",
- "text": "617",
- "top": 210,
- "left": 830,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-618",
- "text": "618",
- "top": 210,
- "left": 880,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-619",
- "text": "619",
- "top": 240,
- "left": 880,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart619",
- "text": "",
- "top": 340,
- "left": 880,
- "width": 49,
- "height": 199
- }, {
- "type": "stn",
- "id": "site-620",
- "text": "620",
- "top": 210,
- "left": 930,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-621",
- "text": "621",
- "top": 210,
- "left": 980,
- "width": 49,
- "height": 29
- }, {
- "type": "stn",
- "id": "site-622",
- "text": "622",
- "top": 240,
- "left": 980,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart622",
- "text": "",
- "top": 340,
- "left": 980,
- "width": 49,
- "height": 199
- }, {
- "type": "stn",
- "id": "site-623",
- "text": "623",
- "top": 290,
- "left": 680,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart1",
- "text": "",
- "top": 300,
- "left": 630,
- "width": 150,
- "height": 6
- }, {
- "type": "track",
- "id": "lb_trCart2",
- "text": "",
- "top": 324,
- "left": 630,
- "width": 150,
- "height": 6
- }, {
- "type": "stn",
- "id": "site-624",
- "text": "624",
- "top": 290,
- "left": 930,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart3",
- "text": "",
- "top": 300,
- "left": 880,
- "width": 150,
- "height": 6
- }, {
- "type": "track",
- "id": "lb_trCart4",
- "text": "",
- "top": 324,
- "left": 880,
- "width": 150,
- "height": 6
- }, {
- "type": "stn",
- "id": "site-625",
- "text": "625",
- "top": 540,
- "left": 680,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart5",
- "text": "",
- "top": 550,
- "left": 630,
- "width": 150,
- "height": 6
- }, {
- "type": "track",
- "id": "lb_trCart6",
- "text": "",
- "top": 574,
- "left": 630,
- "width": 150,
- "height": 6
- }, {
- "type": "stn",
- "id": "site-626",
- "text": "626",
- "top": 540,
- "left": 930,
- "width": 49,
- "height": 49
- }, {
- "type": "track",
- "id": "lb_trCart7",
- "text": "",
- "top": 550,
- "left": 880,
- "width": 150,
- "height": 6
- }, {
- "type": "track",
- "id": "lb_trCart8",
- "text": "",
- "top": 574,
- "left": 880,
- "width": 150,
- "height": 6
- }, {
- "type": "stn",
- "id": "site-627",
- "text": "627",
- "top": 590,
- "left": 730,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-628",
- "text": "628",
- "top": 590,
- "left": 980,
- "width": 49,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-632",
- "text": "632",
- "top": 650,
- "left": 790,
- "width": 59,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-631",
- "text": "631",
- "top": 650,
- "left": 850,
- "width": 59,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-630",
- "text": "630",
- "top": 650,
- "left": 910,
- "width": 59,
- "height": 59
- }, {
- "type": "stn",
- "id": "site-629",
- "text": "629",
- "top": 650,
- "left": 970,
- "width": 59,
- "height": 59
- }]
- }]
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/views/console-old.html b/src/main/webapp/views/console-old.html
index ecd6347..2d06a68 100644
--- a/src/main/webapp/views/console-old.html
+++ b/src/main/webapp/views/console-old.html
@@ -863,36 +863,7 @@
})
});
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
- })
-
- })
// 寮圭獥鍏抽棴
$('button').on('click', function () {
$('#siteWindow').attr('style', 'display:none')
@@ -1029,33 +1000,6 @@
});
}
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = ($('.item').eq(0).width() + 13) / 2;
- if (crns[i].bay < 0) {
- crns[i].bay = 0
- }
- crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
function getBarcodeInfo() {
$.ajax({
@@ -1129,72 +1073,6 @@
}
// 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 ---------------------------------------------------------
-
- // 杈撻�佽澶囩偣鍑讳簨浠�
- // $('.site').on('click', function () {
- // var id = this.id.split("-")[1];
- // if (id === undefined) {
- // return;
- // }
- // layer.open({
- // title: id + " 绔欑偣淇℃伅璇︽儏",
- // closeBtn: 0,
- // skin: 'layui-layer-lan',
- // offset: '180px',
- // type: 1,
- // shadeClose: true,
- // content: $('#siteWindow'),
- // area: ['35rem', '18rem'],
- // btn: ['纭畾', '鍏抽棴'],
- // success: function(layero, index){
- // http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
- // for (var val in res.data) {
- // var find = $("#siteWindow").find(":input[name='" + val + "']");
- // if (find[0].type==='text') {
- // find.val(res.data[val]);
- // } else if (find[0].type === 'checkbox') {
- // find.attr("checked", res.data[val] === 'Y');
- // }
- // }
- // })
- // },
- // end: function () {
- // $(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected');
- // }
- // });
- // });
-
- // 鍫嗗灈鏈虹偣鍑讳簨浠�
- // $('.machine').on('click', function () {
- // var id = this.id.split("-")[1];
- // layer.open({
- // title: id+"鍙峰爢鍨涙満",
- // skin: 'layui-layer-lan',
- // closeBtn: 0,
- // type: 1,
- // offset: '150px',
- // shadeClose: true,
- // content: $("#crnWindow"),
- // area: ['40rem', '20rem'],
- // btn: ['纭畾', '鍏抽棴'],
- // success: function(layero, index){
- // http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
- // for (var val in res.data) {
- // var find = $("#crnWindow").find(":input[name='" + val + "']");
- // if (find[0].type==='text') {
- // find.val(res.data[val]);
- // } else if (find[0].type === 'checkbox') {
- // find.attr("checked", res.data[val] === 'Y');
- // }
- // }
- // })
- // },
- // end: function () {
- // $(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected');
- // }
- // });
- // });
-
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2b78d7d..a02d07d 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -413,36 +413,7 @@
})
});
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
- })
-
- })
// 寮圭獥鍏抽棴
$('button').on('click', function () {
$('#siteWindow').attr('style', 'display:none')
@@ -575,48 +546,6 @@
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
-
- if (crns[i].bay < 0 || crns[i].bay === -2) {
- crns[i].bay = 1
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
-
- var offSet = 0;
- unit = 17;
- offSet = 550;
-
-
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
}
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
diff --git a/src/main/webapp/views/console12.html b/src/main/webapp/views/console12.html
deleted file mode 100644
index d74e5da..0000000
--- a/src/main/webapp/views/console12.html
+++ /dev/null
@@ -1,799 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../static/css/render.css">
- <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script src="../static/js/layer/layer.js"></script>
- <!--鍦板浘json-->
- <script src="../static/js/console.map12.js"></script>
- <script src="../static/js/console.js"></script>
- <script src="../static/js/common.js"></script>
-
-
-</head>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
- </div>
- <div class="head-right">
-<!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
- </div>
- </div>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part">
-
- </div>
- <div id="body">
- <!-- 鎬诲紑鍏� -->
- <div class="system-state">
- <div class="body-head">鎬诲紑鍏�</div>
- <div class="switch">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
- <div class="switch_r">
- <p>绯荤粺鐘舵��</p>
- <p id="system-run-desc">绯荤粺杩愯涓�</p>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
- <div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
- </div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
-
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
- <span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span id="line-total" class="line-ss"></span>
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode1" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode2" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode3" class="table-body">
-
- </div>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈哄脊绐� -->
- <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <div id="crnWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 鍫嗗灈鏈哄彿 -->
- <div class="form-item">
- <div class="form-item-label" style>
- <span>鍫嗗灈鏈哄彿锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 绔欐簮 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>绔欐簮锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnStatus" value="">
- </div>
- </div>
- <!-- 寮傚父 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>寮傚父锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="error" value="">
- </div>
- </div>
- </form>
- </div>
- <!-- 杈撻�佽澶囧脊绐� -->
- <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <!-- 琛ㄥご -->
- <div id="siteWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 璁惧鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>璁惧鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="siteId" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鑷姩 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑷姩</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="autoing">
- </div>
- </div>
- <!-- 鏈夌墿 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鏈夌墿</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="loading">
- </div>
- </div>
- <!-- 鑳藉叆 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉叆</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canining">
- </div>
- </div>
- <!-- 鑳藉嚭 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉嚭</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canouting">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愮珯 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愮珯锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
-
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- url: baseUrl + '/console/barcode/output/site',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- tData = eval(res.data);
- if (tData.length <= 5) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#barcode1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#barcode2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#barcode3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- })
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // carAnimate();
- carAnimate2();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- alert(res.msg);
- console.log(res.msg);
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- console.log(sites[i].siteId)
- siteEl.attr("class", "site " + sites[i].siteStatus);
- // siteEl.attr("class", "site site-auto-run-id");
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
-
- if (sites[i].siteId === '16' || sites[i].siteId === '016') {
-
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
-
- if (crns[i].bay < 0 || crns[i].bay === -2) {
- crns[i].bay = 1
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
-
- var offSet = 0;
- unit = 60;
- offSet = 325;
-
-
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#crn-3").animate({left: leftVal + 'px'}, 1000);
- crn3Position = leftVal;
- break;
- case 4:
- $("#crn-4").animate({left: leftVal + 'px'}, 1000);
- crn4Position = leftVal;
- break;
- case 5:
- $("#crn-5").animate({left: leftVal + 'px'}, 1000);
- crn5Position = leftVal;
- break;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- // debugger
- var targetTop = 0;
- if (id === 16 || id === '16' || id === '016') {
- switch (target) {
- case 1:
- targetTop += 827;
- break;
- case 2:
- targetTop += 765;
- break;
- case 3:
- targetTop += 651;
- break;
- case 4:
- targetTop += 589;
- break;
- case 5:
- targetTop += 505;
- break;
- case 6:
- targetTop += 443;
- break;
- case 7:
- targetTop += 362;
- break;
- case 8:
- targetTop += 297;
- break;
- case 9:
- targetTop += 243;
- break;
- case 10:
- targetTop += 129;
- break;
- default:
- return;
- }
- } else {
- return;
- }
-
- $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
- let sitePosition = {
- 101: '68px',
- 102: '117px',
- 122: '183px',
- 104: '183px',
- 105: '232px',
- 118: '297px',
- 107: '297px',
- 108: '345px',
- 119: '355px',
- 110: '410px',
- 120: '421px',
- 111: '459px',
- 121: '479px',
- 113: '524px',
- 123: '556px',
- 114: '572px',
- 1142: '600px',
- 116: '639px',
- 117: '687px',
- }
-
- //RGV杞︾Щ鍔ㄥ姩鐢�
- function moveSite(siteId, staNo) {
- $(siteId).animate({top: sitePosition[staNo]}, 1000);
- }
-
- // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
-
- // Rgv瀹炴椂鏁版嵁鑾峰彇
- function carAnimate2() {
- // console.log("1=============1")
- $.ajax({
- url: baseUrl + "/rgv/console/rgv/site/data",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var rgvMap = res.data;
- for (var i = 0; i < rgvMap.length; i++) {
- moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
- }
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/console2.html b/src/main/webapp/views/console2.html
deleted file mode 100644
index 46edf68..0000000
--- a/src/main/webapp/views/console2.html
+++ /dev/null
@@ -1,799 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../static/css/render.css">
- <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script src="../static/js/layer/layer.js"></script>
- <!--鍦板浘json-->
- <script src="../static/js/console.map2.js"></script>
- <script src="../static/js/console.js"></script>
- <script src="../static/js/common.js"></script>
-
-
-</head>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
- </div>
- <div class="head-right">
-<!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
- </div>
- </div>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part" style="width: 1920px;height:1080px;overflow: scroll">
-
- </div>
- <div id="body">
- <!-- 鎬诲紑鍏� -->
- <div class="system-state">
- <div class="body-head">鎬诲紑鍏�</div>
- <div class="switch">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
- <div class="switch_r">
- <p>绯荤粺鐘舵��</p>
- <p id="system-run-desc">绯荤粺杩愯涓�</p>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
- <div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
- </div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
-
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
- <span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span id="line-total" class="line-ss"></span>
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode1" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode2" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode3" class="table-body">
-
- </div>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈哄脊绐� -->
- <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <div id="crnWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 鍫嗗灈鏈哄彿 -->
- <div class="form-item">
- <div class="form-item-label" style>
- <span>鍫嗗灈鏈哄彿锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 绔欐簮 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>绔欐簮锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnStatus" value="">
- </div>
- </div>
- <!-- 寮傚父 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>寮傚父锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="error" value="">
- </div>
- </div>
- </form>
- </div>
- <!-- 杈撻�佽澶囧脊绐� -->
- <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <!-- 琛ㄥご -->
- <div id="siteWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 璁惧鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>璁惧鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="siteId" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鑷姩 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑷姩</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="autoing">
- </div>
- </div>
- <!-- 鏈夌墿 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鏈夌墿</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="loading">
- </div>
- </div>
- <!-- 鑳藉叆 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉叆</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canining">
- </div>
- </div>
- <!-- 鑳藉嚭 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉嚭</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canouting">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愮珯 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愮珯锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
-
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- url: baseUrl + '/console/barcode/output/site',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- tData = eval(res.data);
- if (tData.length <= 5) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#barcode1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#barcode2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#barcode3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- })
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // carAnimate();
- carAnimate2();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- alert(res.msg);
- console.log(res.msg);
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- console.log(sites[i].siteId)
- siteEl.attr("class", "site " + sites[i].siteStatus);
- // siteEl.attr("class", "site site-auto-run-id");
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
-
- if (sites[i].siteId === '16' || sites[i].siteId === '016') {
-
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
-
- if (crns[i].bay < 0 || crns[i].bay === -2) {
- crns[i].bay = 1
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
-
- var offSet = 0;
- unit = 60;
- offSet = 325;
-
-
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#crn-3").animate({left: leftVal + 'px'}, 1000);
- crn3Position = leftVal;
- break;
- case 4:
- $("#crn-4").animate({left: leftVal + 'px'}, 1000);
- crn4Position = leftVal;
- break;
- case 5:
- $("#crn-5").animate({left: leftVal + 'px'}, 1000);
- crn5Position = leftVal;
- break;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- // debugger
- var targetTop = 0;
- if (id === 16 || id === '16' || id === '016') {
- switch (target) {
- case 1:
- targetTop += 827;
- break;
- case 2:
- targetTop += 765;
- break;
- case 3:
- targetTop += 651;
- break;
- case 4:
- targetTop += 589;
- break;
- case 5:
- targetTop += 505;
- break;
- case 6:
- targetTop += 443;
- break;
- case 7:
- targetTop += 362;
- break;
- case 8:
- targetTop += 297;
- break;
- case 9:
- targetTop += 243;
- break;
- case 10:
- targetTop += 129;
- break;
- default:
- return;
- }
- } else {
- return;
- }
-
- $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
- let sitePosition = {
- 101: '68px',
- 102: '117px',
- 122: '183px',
- 104: '183px',
- 105: '232px',
- 118: '297px',
- 107: '297px',
- 108: '345px',
- 119: '355px',
- 110: '410px',
- 120: '421px',
- 111: '459px',
- 121: '479px',
- 113: '524px',
- 123: '556px',
- 114: '572px',
- 1142: '600px',
- 116: '639px',
- 117: '687px',
- }
-
- //RGV杞︾Щ鍔ㄥ姩鐢�
- function moveSite(siteId, staNo) {
- $(siteId).animate({top: sitePosition[staNo]}, 1000);
- }
-
- // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
-
- // Rgv瀹炴椂鏁版嵁鑾峰彇
- function carAnimate2() {
- // console.log("1=============1")
- $.ajax({
- url: baseUrl + "/rgv/console/rgv/site/data",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var rgvMap = res.data;
- for (var i = 0; i < rgvMap.length; i++) {
- moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
- }
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/console21.html b/src/main/webapp/views/console21.html
deleted file mode 100644
index e5df504..0000000
--- a/src/main/webapp/views/console21.html
+++ /dev/null
@@ -1,799 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../static/css/render.css">
- <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script src="../static/js/layer/layer.js"></script>
- <!--鍦板浘json-->
- <script src="../static/js/console.map21.js"></script>
- <script src="../static/js/console.js"></script>
- <script src="../static/js/common.js"></script>
-
-
-</head>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
- </div>
- <div class="head-right">
-<!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
- </div>
- </div>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part" style="width: 1920px;height:1080px;overflow: scroll">
-
- </div>
- <div id="body">
- <!-- 鎬诲紑鍏� -->
- <div class="system-state">
- <div class="body-head">鎬诲紑鍏�</div>
- <div class="switch">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
- <div class="switch_r">
- <p>绯荤粺鐘舵��</p>
- <p id="system-run-desc">绯荤粺杩愯涓�</p>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
- <div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
- </div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
-
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
- <span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span id="line-total" class="line-ss"></span>
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode1" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode2" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode3" class="table-body">
-
- </div>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈哄脊绐� -->
- <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <div id="crnWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 鍫嗗灈鏈哄彿 -->
- <div class="form-item">
- <div class="form-item-label" style>
- <span>鍫嗗灈鏈哄彿锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 绔欐簮 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>绔欐簮锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnStatus" value="">
- </div>
- </div>
- <!-- 寮傚父 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>寮傚父锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="error" value="">
- </div>
- </div>
- </form>
- </div>
- <!-- 杈撻�佽澶囧脊绐� -->
- <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <!-- 琛ㄥご -->
- <div id="siteWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 璁惧鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>璁惧鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="siteId" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鑷姩 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑷姩</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="autoing">
- </div>
- </div>
- <!-- 鏈夌墿 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鏈夌墿</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="loading">
- </div>
- </div>
- <!-- 鑳藉叆 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉叆</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canining">
- </div>
- </div>
- <!-- 鑳藉嚭 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉嚭</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canouting">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愮珯 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愮珯锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
-
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- url: baseUrl + '/console/barcode/output/site',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- tData = eval(res.data);
- if (tData.length <= 5) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#barcode1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#barcode2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#barcode3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- })
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // carAnimate();
- carAnimate2();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- alert(res.msg);
- console.log(res.msg);
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- console.log(sites[i].siteId)
- siteEl.attr("class", "site " + sites[i].siteStatus);
- // siteEl.attr("class", "site site-auto-run-id");
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
-
- if (sites[i].siteId === '16' || sites[i].siteId === '016') {
-
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
-
- if (crns[i].bay < 0 || crns[i].bay === -2) {
- crns[i].bay = 1
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
-
- var offSet = 0;
- unit = 17;
- offSet = 550;
-
-
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#crn-3").animate({left: leftVal + 'px'}, 1000);
- crn3Position = leftVal;
- break;
- case 4:
- $("#crn-4").animate({left: leftVal + 'px'}, 1000);
- crn4Position = leftVal;
- break;
- case 5:
- $("#crn-5").animate({left: leftVal + 'px'}, 1000);
- crn5Position = leftVal;
- break;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- // debugger
- var targetTop = 0;
- if (id === 16 || id === '16' || id === '016') {
- switch (target) {
- case 1:
- targetTop += 827;
- break;
- case 2:
- targetTop += 765;
- break;
- case 3:
- targetTop += 651;
- break;
- case 4:
- targetTop += 589;
- break;
- case 5:
- targetTop += 505;
- break;
- case 6:
- targetTop += 443;
- break;
- case 7:
- targetTop += 362;
- break;
- case 8:
- targetTop += 297;
- break;
- case 9:
- targetTop += 243;
- break;
- case 10:
- targetTop += 129;
- break;
- default:
- return;
- }
- } else {
- return;
- }
-
- $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
- let sitePosition = {
- 101: '68px',
- 102: '117px',
- 122: '183px',
- 104: '183px',
- 105: '232px',
- 118: '297px',
- 107: '297px',
- 108: '345px',
- 119: '355px',
- 110: '410px',
- 120: '421px',
- 111: '459px',
- 121: '479px',
- 113: '524px',
- 123: '556px',
- 114: '572px',
- 1142: '600px',
- 116: '639px',
- 117: '687px',
- }
-
- //RGV杞︾Щ鍔ㄥ姩鐢�
- function moveSite(siteId, staNo) {
- $(siteId).animate({top: sitePosition[staNo]}, 1000);
- }
-
- // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
-
- // Rgv瀹炴椂鏁版嵁鑾峰彇
- function carAnimate2() {
- // console.log("1=============1")
- $.ajax({
- url: baseUrl + "/rgv/console/rgv/site/data",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var rgvMap = res.data;
- for (var i = 0; i < rgvMap.length; i++) {
- moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
- }
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/console22.html b/src/main/webapp/views/console22.html
deleted file mode 100644
index f466a83..0000000
--- a/src/main/webapp/views/console22.html
+++ /dev/null
@@ -1,799 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../static/css/render.css">
- <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script src="../static/js/layer/layer.js"></script>
- <!--鍦板浘json-->
- <script src="../static/js/console.map22.js"></script>
- <script src="../static/js/console.js"></script>
- <script src="../static/js/common.js"></script>
-
-
-</head>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
- </div>
- <div class="head-right">
-<!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
- </div>
- </div>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part" style="width: 1920px;height:1080px;overflow: scroll">
-
- </div>
- <div id="body">
- <!-- 鎬诲紑鍏� -->
- <div class="system-state">
- <div class="body-head">鎬诲紑鍏�</div>
- <div class="switch">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
- <div class="switch_r">
- <p>绯荤粺鐘舵��</p>
- <p id="system-run-desc">绯荤粺杩愯涓�</p>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
- <div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
- </div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
-
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
- <span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span id="line-total" class="line-ss"></span>
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode1" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode2" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode3" class="table-body">
-
- </div>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈哄脊绐� -->
- <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <div id="crnWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 鍫嗗灈鏈哄彿 -->
- <div class="form-item">
- <div class="form-item-label" style>
- <span>鍫嗗灈鏈哄彿锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 绔欐簮 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>绔欐簮锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnStatus" value="">
- </div>
- </div>
- <!-- 寮傚父 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>寮傚父锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="error" value="">
- </div>
- </div>
- </form>
- </div>
- <!-- 杈撻�佽澶囧脊绐� -->
- <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <!-- 琛ㄥご -->
- <div id="siteWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 璁惧鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>璁惧鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="siteId" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鑷姩 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑷姩</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="autoing">
- </div>
- </div>
- <!-- 鏈夌墿 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鏈夌墿</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="loading">
- </div>
- </div>
- <!-- 鑳藉叆 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉叆</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canining">
- </div>
- </div>
- <!-- 鑳藉嚭 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉嚭</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canouting">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愮珯 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愮珯锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
-
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- url: baseUrl + '/console/barcode/output/site',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- tData = eval(res.data);
- if (tData.length <= 5) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#barcode1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#barcode2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#barcode3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- })
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // carAnimate();
- carAnimate2();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- alert(res.msg);
- console.log(res.msg);
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- console.log(sites[i].siteId)
- siteEl.attr("class", "site " + sites[i].siteStatus);
- // siteEl.attr("class", "site site-auto-run-id");
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
-
- if (sites[i].siteId === '16' || sites[i].siteId === '016') {
-
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
-
- if (crns[i].bay < 0 || crns[i].bay === -2) {
- crns[i].bay = 1
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
-
- var offSet = 0;
- unit = 60;
- offSet = 325;
-
-
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#crn-3").animate({left: leftVal + 'px'}, 1000);
- crn3Position = leftVal;
- break;
- case 4:
- $("#crn-4").animate({left: leftVal + 'px'}, 1000);
- crn4Position = leftVal;
- break;
- case 5:
- $("#crn-5").animate({left: leftVal + 'px'}, 1000);
- crn5Position = leftVal;
- break;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- // debugger
- var targetTop = 0;
- if (id === 16 || id === '16' || id === '016') {
- switch (target) {
- case 1:
- targetTop += 827;
- break;
- case 2:
- targetTop += 765;
- break;
- case 3:
- targetTop += 651;
- break;
- case 4:
- targetTop += 589;
- break;
- case 5:
- targetTop += 505;
- break;
- case 6:
- targetTop += 443;
- break;
- case 7:
- targetTop += 362;
- break;
- case 8:
- targetTop += 297;
- break;
- case 9:
- targetTop += 243;
- break;
- case 10:
- targetTop += 129;
- break;
- default:
- return;
- }
- } else {
- return;
- }
-
- $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
- let sitePosition = {
- 101: '68px',
- 102: '117px',
- 122: '183px',
- 104: '183px',
- 105: '232px',
- 118: '297px',
- 107: '297px',
- 108: '345px',
- 119: '355px',
- 110: '410px',
- 120: '421px',
- 111: '459px',
- 121: '479px',
- 113: '524px',
- 123: '556px',
- 114: '572px',
- 1142: '600px',
- 116: '639px',
- 117: '687px',
- }
-
- //RGV杞︾Щ鍔ㄥ姩鐢�
- function moveSite(siteId, staNo) {
- $(siteId).animate({top: sitePosition[staNo]}, 1000);
- }
-
- // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
-
- // Rgv瀹炴椂鏁版嵁鑾峰彇
- function carAnimate2() {
- // console.log("1=============1")
- $.ajax({
- url: baseUrl + "/rgv/console/rgv/site/data",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var rgvMap = res.data;
- for (var i = 0; i < rgvMap.length; i++) {
- moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
- }
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/console23.html b/src/main/webapp/views/console23.html
deleted file mode 100644
index 7eba1ac..0000000
--- a/src/main/webapp/views/console23.html
+++ /dev/null
@@ -1,799 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鑷姩浠撳簱wcs绯荤粺</title>
- <link rel="stylesheet" href="../static/css/render.css">
- <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script src="../static/js/layer/layer.js"></script>
- <!--鍦板浘json-->
- <script src="../static/js/console.map23.js"></script>
- <script src="../static/js/console.js"></script>
- <script src="../static/js/common.js"></script>
-
-
-</head>
-<body>
- <div id="main">
- <div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
- </div>
- <div class="head-right">
-<!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
- </div>
- </div>
- <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
- <div class="main-part" style="width: 1920px;height:1080px;overflow: scroll">
-
- </div>
- <div id="body">
- <!-- 鎬诲紑鍏� -->
- <div class="system-state">
- <div class="body-head">鎬诲紑鍏�</div>
- <div class="switch">
- <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
- <div class="switch_r">
- <p>绯荤粺鐘舵��</p>
- <p id="system-run-desc">绯荤粺杩愯涓�</p>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
- <div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
- </div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
-
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
- <span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span id="line-total" class="line-ss"></span>
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode1" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode2" class="table-body">
-
- </div>
- </div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode3" class="table-body">
-
- </div>
- </div>
- </div>
- </div>
- <!-- 鍫嗗灈鏈哄脊绐� -->
- <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <div id="crnWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 鍫嗗灈鏈哄彿 -->
- <div class="form-item">
- <div class="form-item-label" style>
- <span>鍫嗗灈鏈哄彿锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 绔欐簮 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>绔欐簮锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="crnStatus" value="">
- </div>
- </div>
- <!-- 寮傚父 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>寮傚父锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="error" value="">
- </div>
- </div>
- </form>
- </div>
- <!-- 杈撻�佽澶囧脊绐� -->
- <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
- <!-- 琛ㄥご -->
- <div id="siteWindow-head">
- <div class='detailed'></div>
- <button></button>
- </div>
- <form>
- <!-- 璁惧鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>璁惧鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="siteId" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鍙� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="workNo" value="">
- </div>
- </div>
- <!-- 宸ヤ綔鐘舵�� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="wrkSts" value="">
- </div>
- </div>
- <!-- 鑷姩 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑷姩</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="autoing">
- </div>
- </div>
- <!-- 鏈夌墿 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鏈夌墿</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="loading">
- </div>
- </div>
- <!-- 鑳藉叆 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉叆</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canining">
- </div>
- </div>
- <!-- 鑳藉嚭 -->
- <div class="form-item-checkbox">
- <div class="form-item-label-checkbox">
- <span>鑳藉嚭</span>
- </div>
- <div class="form-item-input-checkbox">
- <input type="checkbox" name="canouting">
- </div>
- </div>
- <!-- 鍑哄叆绫诲瀷 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="ioType" value="">
- </div>
- </div>
- <!-- 婧愮珯 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愮珯锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceStaNo" value="">
- </div>
- </div>
- <!-- 鐩爣绔� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣绔欙細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="staNo" value="">
- </div>
- </div>
- <!-- 婧愬簱浣� -->
- <div class="form-item">
- <div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="sourceLocNo" value="">
- </div>
- </div>
- <!-- 鐩爣搴撲綅 -->
- <div class="form-item">
- <div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
- </div>
- <div class="form-item-input">
- <input type="text" name="locNo" value="">
- </div>
- </div>
-
- </form>
- </div>
- </div>
-
-</body>
-
-</html>
-<script>
- getMap();
-</script>
-<script>
- setInterval(function () {
- getCodeData();
- renderBarCode();
- }, 1000)
- var tData = [],tData1 = [],tData2 = [],tData3 = [];
- function getCodeData() {
- $.ajax({
- url: baseUrl + '/console/barcode/output/site',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- tData = eval(res.data);
- if (tData.length <= 5) {
- tData1 = tData
- } else if (tData.length <= 10) {
- tData1 = tData.slice(0, 5)
- tData.splice(0, 5)
- tData2 = tData
- } else if (tData.length <= 15) {
- tData1 = tData.slice(0, 5)
- tData2 = tData.slice(6, 10)
- tData.splice(0, 10)
- tData3 = tData
- } else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
- }
- }
- }
- })
- }
- function renderBarCode() {
- for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#barcode1').append(str1)
- }
- for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#barcode2').append(str2)
- }
- for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#barcode3').append(str3)
- }
- }
-</script>
-<script type="text/javascript">
- // 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
- var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- });
- // 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
- var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
- $.ajax({
- url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
- method: 'post',
- success: function (res) {
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
-
- })
- // 寮圭獥鍏抽棴
- $('button').on('click', function () {
- $('#siteWindow').attr('style', 'display:none')
- $('#crnWindow').attr('style', 'display:none')
- })
-
-
- var crn1Position = 0;
- var crn2Position = 0;
- var crn3Position = 0;
- var crn4Position = 0;
- var crn5Position = 0;
-
- // 鍒濆鍖�
- getSitesInfo();
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- // carAnimate();
- carAnimate2();
- // 瀹炴椂璁块棶
- setInterval(function () {
- getCrnInfo();
- getSystemRunningStatus();
- getBarcodeInfo();
- getScaleInfo();
- }, 1000);
- setInterval(function () {
- getSitesInfo();
- }, 3000);
-
- // 绯荤粺杩愯寮�鍏�
- function systemSwitch() {
- if (parent.systemRunning) {
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
- } else {
- doSwitch(1); // 鍚姩wcs绯荤粺
- }
- }
-
- // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
- function doSwitch(operatorType, password) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1, '#fff']
- });
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- operatorType: operatorType,
- password: password
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- alert(res.msg);
- console.log(res.msg);
- }
- }
- });
-
- }
-
- // 鑾峰彇wcs绯荤粺杩愯鐘舵��
- function getSystemRunningStatus() {
- $.ajax({
- url: baseUrl + "/console/system/running/status",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- if (res.data.status) {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- parent.systemRunning = true;
- } else {
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- parent.systemRunning = false;
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
- function getSitesInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var sites = res.data;
- for (var i = 0; i < sites.length; i++) {
- var siteEl = $("#site-" + sites[i].siteId);
- console.log(sites[i].siteId)
- siteEl.attr("class", "site " + sites[i].siteStatus);
- // siteEl.attr("class", "site site-auto-run-id");
- if (sites[i].workNo != null && sites[i].workNo > 0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
- } else {
- siteEl.html(sites[i].siteId);
- }
-
- if (sites[i].siteId === '16' || sites[i].siteId === '016') {
-
- carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙�
- function getCrnInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- // console.log(res)
- if (res.code === 200) {
- var crns = res.data;
- for (var i = 0; i < crns.length; i++) {
- var crnEl = $("#crn-" + crns[i].crnId);
- crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
-
- if (crns[i].bay < 0 || crns[i].bay === -2) {
- crns[i].bay = 1
- }
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
-
- var offSet = 0;
- unit = 60;
- offSet = 325;
-
-
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
- function getBarcodeInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/barcode",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var barcodes = res.data;
- for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
- function getScaleInfo() {
- $.ajax({
- url: baseUrl + "/console/latest/data/scale",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
-
- if (res.code === 200) {
- var sclaes = res.data;
- for (var i = 0; i < sclaes.length; i++) {
- console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
- $("#scale-data-" + sclaes[i].scaleId).text(sclaes[i].value);
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 鍫嗗灈鏈哄亸绉诲姩鐢�
- function crnAnimate(id, leftVal) {
- // console.log(crn1Position)
- switch (id) {
- case 1:
- $("#crn-1").animate({left: leftVal + 'px'}, 1000);
- crn1Position = leftVal;
- break;
- case 2:
- $("#crn-2").animate({left: leftVal + 'px'}, 1000);
- crn2Position = leftVal;
- break;
- case 3:
- $("#crn-3").animate({left: leftVal + 'px'}, 1000);
- crn3Position = leftVal;
- break;
- case 4:
- $("#crn-4").animate({left: leftVal + 'px'}, 1000);
- crn4Position = leftVal;
- break;
- case 5:
- $("#crn-5").animate({left: leftVal + 'px'}, 1000);
- crn5Position = leftVal;
- break;
- default:
- break
- }
- }
-
- // 灏忚溅鍋忕Щ鍔ㄧ敾
- function carAnimate(id, target) {
- // debugger
- var targetTop = 0;
- if (id === 16 || id === '16' || id === '016') {
- switch (target) {
- case 1:
- targetTop += 827;
- break;
- case 2:
- targetTop += 765;
- break;
- case 3:
- targetTop += 651;
- break;
- case 4:
- targetTop += 589;
- break;
- case 5:
- targetTop += 505;
- break;
- case 6:
- targetTop += 443;
- break;
- case 7:
- targetTop += 362;
- break;
- case 8:
- targetTop += 297;
- break;
- case 9:
- targetTop += 243;
- break;
- case 10:
- targetTop += 129;
- break;
- default:
- return;
- }
- } else {
- return;
- }
-
- $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
- }
-
- //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
- let sitePosition = {
- 101: '68px',
- 102: '117px',
- 122: '183px',
- 104: '183px',
- 105: '232px',
- 118: '297px',
- 107: '297px',
- 108: '345px',
- 119: '355px',
- 110: '410px',
- 120: '421px',
- 111: '459px',
- 121: '479px',
- 113: '524px',
- 123: '556px',
- 114: '572px',
- 1142: '600px',
- 116: '639px',
- 117: '687px',
- }
-
- //RGV杞︾Щ鍔ㄥ姩鐢�
- function moveSite(siteId, staNo) {
- $(siteId).animate({top: sitePosition[staNo]}, 1000);
- }
-
- // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
-
- // Rgv瀹炴椂鏁版嵁鑾峰彇
- function carAnimate2() {
- // console.log("1=============1")
- $.ajax({
- url: baseUrl + "/rgv/console/rgv/site/data",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var rgvMap = res.data;
- for (var i = 0; i < rgvMap.length; i++) {
- moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
- }
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index 72eb83f..37064e3 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -359,42 +359,6 @@
});
}
- // 绌挎杞︽暟鎹〃鑾峰彇 ---- 琛ㄤ簩
- function getSteMsgInfo() {
- let tableEl = $('#ste-msg-table');
- $.ajax({
- url: baseUrl+ "/ste/table/ste/msg",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- var table = res.data;
- if (table.length > steMsgTableBlankRows && table.length !== steMsgTableFullRows) {
- initSteMsgTable(table.length-steMsgTableBlankRows);
- steMsgTableFullRows = table.length;
- }
- for (var i=1;i<=table.length;i++){
- var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].steNo);
- setVal(tr.children("td").eq(1), table[i-1].workNo);
- setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
- setVal(tr.children("td").eq(4), table[i-1].staNo);
- setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
- setVal(tr.children("td").eq(6), table[i-1].locNo);
- setVal(tr.children("td").eq(7), table[i-1].speed);
- setVal(tr.children("td").eq(8), table[i-1].closer);
- setVal(tr.children("td").eq(9), table[i-1].pakMk);
- }
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
// 绌挎杞︽棩蹇楄緭鍑� -----------------------------------------------------------------------
function getSteOutput() {
$.ajax({
--
Gitblit v1.9.1