From 1596ce91095ad30f781006a2cfa5d856d3ac9416 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 09 九月 2023 11:00:45 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/resources/mapper/BasLiftMapper.xml | 38 +-
src/main/java/com/zy/asrs/entity/BasShuttle.java | 353 ++++++++++++++------------
src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js | 1
src/main/java/com/zy/asrs/entity/BasLiftErrLog.java | 10
src/main/resources/mapper/BasShuttleOptMapper.xml | 1
src/main/resources/mapper/BasLiftOptMapper.xml | 1
src/main/resources/mapper/BasShuttleErrLogMapper.xml | 2
src/main/webapp/static/js/basLiftOpt/basLiftOpt.js | 1
src/main/resources/mapper/BasShuttleMapper.xml | 41 +-
src/main/java/com/zy/asrs/entity/BasShuttleOpt.java | 10
src/main/java/com/zy/asrs/entity/BasLift.java | 236 ++++++-----------
src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js | 1
src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js | 1
src/main/webapp/views/home/map.html | 8
src/main/java/com/zy/asrs/entity/BasLiftOpt.java | 10
src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java | 11
src/main/resources/mapper/BasLiftErrLogMapper.xml | 1
17 files changed, 359 insertions(+), 367 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java
index 5bfe9ba..2bf61ab 100644
--- a/src/main/java/com/zy/asrs/entity/BasLift.java
+++ b/src/main/java/com/zy/asrs/entity/BasLift.java
@@ -71,152 +71,120 @@
private Integer pakMk;
/**
- * 鎻愬崌鏈洪攣瀹�
+ * 鎻愬崌鏈哄潗鏍�
*/
- @ApiModelProperty(value= "鎻愬崌鏈洪攣瀹�")
- @TableField("lift_lock")
- private Integer liftLock;
+ @ApiModelProperty(value= "鎻愬崌鏈哄潗鏍�")
+ @TableField("point")
+ private String point;
/**
- * 浣嶇疆鍒拌揪鍙嶉
+ * 妯″紡
*/
- @ApiModelProperty(value= "浣嶇疆鍒拌揪鍙嶉")
- @TableField("position_arrival_feedback")
- private Integer positionArrivalFeedback;
+ @ApiModelProperty(value= "妯″紡")
+ @TableField("model")
+ private Boolean model;
/**
- * 鍑嗗灏辩华
+ * 蹇欓棽
*/
- @ApiModelProperty(value= "鍑嗗灏辩华")
- private Integer ready;
+ @ApiModelProperty(value= "蹇欓棽")
+ @TableField("busy")
+ private Boolean busy;
/**
- * 杩愯涓�
+ * 鍓嶈秴闄�
*/
- @ApiModelProperty(value= "杩愯涓�")
- private Integer running;
+ @ApiModelProperty(value= "鍓嶈秴闄�")
+ @TableField("front_overrun")
+ private Boolean frontOverrun;
/**
- * 鑱旀満/鍗曟満
+ * 鍚庤秴闄�
*/
- @ApiModelProperty(value= "鑱旀満/鍗曟満")
- private Integer mode;
+ @ApiModelProperty(value= "鍚庤秴闄�")
+ @TableField("back_overrun")
+ private Boolean backOverrun;
/**
- * 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
+ * 宸﹁秴闄�
*/
- @ApiModelProperty(value= "杈撻�佺嚎鍓嶇鍏夌數鏈夎揣")
- @TableField("line_front_has_stock")
- private Integer lineFrontHasStock;
+ @ApiModelProperty(value= "宸﹁秴闄�")
+ @TableField("left_overrun")
+ private Boolean leftOverrun;
/**
- * 杈撻�佺嚎姝ｈ浆鍙嶉
+ * 鍙宠秴闄�
*/
- @ApiModelProperty(value= "杈撻�佺嚎姝ｈ浆鍙嶉")
- @TableField("forward_rotation_feedback")
- private Integer forwardRotationFeedback;
+ @ApiModelProperty(value= "鍙宠秴闄�")
+ @TableField("right_overrun")
+ private Boolean rightOverrun;
/**
- * 杈撻�佺嚎鍙嶈浆鍙嶉
+ * 瓒呴珮
*/
- @ApiModelProperty(value= "杈撻�佺嚎鍙嶈浆鍙嶉")
- @TableField("reverse_feedback")
- private Integer reverseFeedback;
+ @ApiModelProperty(value= "瓒呴珮")
+ @TableField("over_height")
+ private Boolean overHeight;
/**
- * 杈撻�佺嚎鐢垫満杩囪浇
+ * 瓒呴噸
*/
- @ApiModelProperty(value= "杈撻�佺嚎鐢垫満杩囪浇")
- @TableField("motor_overload")
- private Integer motorOverload;
+ @ApiModelProperty(value= "瓒呴噸")
+ @TableField("over_weight")
+ private Boolean overWeight;
/**
- * 杈撻�佺嚎鏈鍏夌數鏈夎揣
+ * 鏈夋墭鐩�
*/
- @ApiModelProperty(value= "杈撻�佺嚎鏈鍏夌數鏈夎揣")
- @TableField("line_end_has_stock")
- private Integer lineEndHasStock;
+ @ApiModelProperty(value= "鏈夋墭鐩�")
+ @TableField("has_tray")
+ private Boolean hasTray;
/**
- * 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
+ * 鏈夊皬杞�
*/
- @ApiModelProperty(value= "杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�")
- @TableField("in_convey_line_card_tray_alarm")
- private Integer inConveyLineCardTrayAlarm;
+ @ApiModelProperty(value= "鏈夊皬杞�")
+ @TableField("has_car")
+ private Boolean hasCar;
/**
- * 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
+ * 璁惧鏁呴殰
*/
- @ApiModelProperty(value= "鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�")
- @TableField("out_convey_line_card_tray_alarm")
- private Integer outConveyLineCardTrayAlarm;
+ @ApiModelProperty(value= "璁惧鏁呴殰")
+ @TableField("device_error")
+ private Boolean deviceError;
/**
- * 骞冲彴浣嶇疆鍋忓樊鎶ヨ
+ * 浠诲姟鍦板潃
*/
- @ApiModelProperty(value= "骞冲彴浣嶇疆鍋忓樊鎶ヨ")
- @TableField("plat_position_deviation_alarm")
- private Integer platPositionDeviationAlarm;
+ @ApiModelProperty(value= "浠诲姟鍦板潃")
+ @TableField("task_address")
+ private Integer taskAddress;
/**
- * 骞冲彴鎵煩鍋忓樊鎶ヨ
+ * 鐩殑鍦板潃
*/
- @ApiModelProperty(value= "骞冲彴鎵煩鍋忓樊鎶ヨ")
- @TableField("plat_torque_deviation_alarm")
- private Integer platTorqueDeviationAlarm;
+ @ApiModelProperty(value= "鐩殑鍦板潃")
+ @TableField("dist_address")
+ private Integer distAddress;
/**
- * 骞冲彴鍥涘悜杞︽娴�
+ * 宸插畬鎴愪换鍔″彿
*/
- @ApiModelProperty(value= "骞冲彴鍥涘悜杞︽娴�")
- @TableField("plat_shuttle_check")
- private Integer platShuttleCheck;
+ @ApiModelProperty(value= "宸插畬鎴愪换鍔″彿")
+ @TableField("complete_task_no")
+ private Integer completeTaskNo;
/**
- * 鏈氨缁姸鎬�
+ * 妤煎眰
*/
- @ApiModelProperty(value= "鏈氨缁姸鎬�")
- @TableField("not_ready")
- private Integer notReady;
-
- /**
- * 浼烘湇1閿欒
- */
- @ApiModelProperty(value= "浼烘湇1閿欒")
- @TableField("servo_error1")
- private Integer servoError1;
-
- /**
- * 浼烘湇2閿欒
- */
- @ApiModelProperty(value= "浼烘湇2閿欒")
- @TableField("servo_error2")
- private Integer servoError2;
-
- /**
- * 浼烘湇3閿欒
- */
- @ApiModelProperty(value= "浼烘湇3閿欒")
- @TableField("servo_error3")
- private Integer servoError3;
-
- /**
- * 浼烘湇4閿欒
- */
- @ApiModelProperty(value= "浼烘湇4閿欒")
- @TableField("servo_error4")
- private Integer servoError4;
-
- /**
- * 鎻愬崌鏈哄疄闄呴�熷害鍙嶉
- */
- @ApiModelProperty(value= "鎻愬崌鏈哄疄闄呴�熷害鍙嶉")
- @TableField("lift_actual_speed")
- private Integer liftActualSpeed;
+ @ApiModelProperty(value= "妤煎眰")
+ @TableField("lev")
+ private Integer lev;
public BasLift() {}
- public BasLift(Integer liftNo,Integer status,Integer wrkNo,Date updateTime,Long updateBy,String memo,Integer pakMk,Integer liftLock,Integer positionArrivalFeedback,Integer ready,Integer running,Integer mode,Integer lineFrontHasStock,Integer forwardRotationFeedback,Integer reverseFeedback,Integer motorOverload,Integer lineEndHasStock,Integer inConveyLineCardTrayAlarm,Integer outConveyLineCardTrayAlarm,Integer platPositionDeviationAlarm,Integer platTorqueDeviationAlarm,Integer platShuttleCheck,Integer notReady,Integer servoError1,Integer servoError2,Integer servoError3,Integer servoError4,Integer liftActualSpeed) {
+ public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Integer pakMk, String point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) {
this.liftNo = liftNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -224,30 +192,25 @@
this.updateBy = updateBy;
this.memo = memo;
this.pakMk = pakMk;
- this.liftLock = liftLock;
- this.positionArrivalFeedback = positionArrivalFeedback;
- this.ready = ready;
- this.running = running;
- this.mode = mode;
- this.lineFrontHasStock = lineFrontHasStock;
- this.forwardRotationFeedback = forwardRotationFeedback;
- this.reverseFeedback = reverseFeedback;
- this.motorOverload = motorOverload;
- this.lineEndHasStock = lineEndHasStock;
- this.inConveyLineCardTrayAlarm = inConveyLineCardTrayAlarm;
- this.outConveyLineCardTrayAlarm = outConveyLineCardTrayAlarm;
- this.platPositionDeviationAlarm = platPositionDeviationAlarm;
- this.platTorqueDeviationAlarm = platTorqueDeviationAlarm;
- this.platShuttleCheck = platShuttleCheck;
- this.notReady = notReady;
- this.servoError1 = servoError1;
- this.servoError2 = servoError2;
- this.servoError3 = servoError3;
- this.servoError4 = servoError4;
- this.liftActualSpeed = liftActualSpeed;
+ this.point = point;
+ this.model = model;
+ this.busy = busy;
+ this.frontOverrun = frontOverrun;
+ this.backOverrun = backOverrun;
+ this.leftOverrun = leftOverrun;
+ this.rightOverrun = rightOverrun;
+ this.overHeight = overHeight;
+ this.overWeight = overWeight;
+ this.hasTray = hasTray;
+ this.hasCar = hasCar;
+ this.deviceError = deviceError;
+ this.taskAddress = taskAddress;
+ this.distAddress = distAddress;
+ this.completeTaskNo = completeTaskNo;
+ this.lev = lev;
}
-// BasLift basLift = new BasLift(
+ // BasLift basLift = new BasLift(
// null, // 鎻愬崌鏈哄彿[闈炵┖]
// null, // 褰撳墠浠诲姟鐘舵��
// null, // 浠诲姟鍙�
@@ -299,41 +262,6 @@
return "";
}
return this.pakMk == 1 ? "Y" : "N";
- }
-
- public String getLiftLock$() {
- if (Cools.isEmpty(this.liftLock)){
- return "";
- }
- return this.liftLock == 1 ? "Y" : "N";
- }
-
- public String getReady$() {
- if (Cools.isEmpty(this.ready)){
- return "";
- }
- return this.ready == 1 ? "Y" : "N";
- }
-
- public String getRunning$() {
- if (Cools.isEmpty(this.running)){
- return "";
- }
- return this.running == 1 ? "Y" : "N";
- }
-
- public String getMode$() {
- if (Cools.isEmpty(this.mode)){
- return "";
- }
- return this.mode == 1 ? "鑱旀満" : "鍗曟満";
- }
-
- public String getNotReady$() {
- if (Cools.isEmpty(this.notReady)){
- return "";
- }
- return this.notReady == 1 ? "Y" : "N";
}
}
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java b/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
index 4ccafad..6976152 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
@@ -186,9 +186,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasLiftErrLog() {}
- public BasLiftErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer liftNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasLiftErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer liftNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, String systemStatus) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -210,6 +217,7 @@
this.updateTime = updateTime;
this.updateBy = updateBy;
this.memo = memo;
+ this.systemStatus = systemStatus;
}
// BasLiftErrLog basLiftErrLog = new BasLiftErrLog(
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
index 47a3045..89fe287 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
@@ -76,9 +76,16 @@
@ApiModelProperty(value= "鍛戒护")
private String command;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasLiftOpt() {}
- public BasLiftOpt(Integer wrkNo,Integer liftNo,Date sendTime,Date updateTime,Long updateBy,String memo,String command) {
+ public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
this.wrkNo = wrkNo;
this.liftNo = liftNo;
this.sendTime = sendTime;
@@ -86,6 +93,7 @@
this.updateBy = updateBy;
this.memo = memo;
this.command = command;
+ this.systemStatus = systemStatus;
}
// BasLiftOpt basLiftOpt = new BasLiftOpt(
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
index 64d219f..8a25578 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttle.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -121,134 +121,176 @@
private Boolean pakMk;
/**
- * 灏忚溅蹇欑姸鎬佷綅
- */
- @ApiModelProperty(value= "灏忚溅蹇欑姸鎬佷綅")
- @TableField("busy_status")
- private Integer busyStatus;
-
- /**
- * 褰撳墠浜岀淮鐮�
- */
- @ApiModelProperty(value= "褰撳墠浜岀淮鐮�")
- @TableField("current_code")
- private Integer currentCode;
-
- /**
- * 鐢垫睜鐢甸噺鐧惧垎姣�
- */
- @ApiModelProperty(value= "鐢垫睜鐢甸噺鐧惧垎姣�")
- @TableField("battery_power")
- private Integer batteryPower;
-
- /**
- * 鐢垫睜娓╁害
- */
- @ApiModelProperty(value= "鐢垫睜娓╁害")
- @TableField("battery_temp")
- private Integer batteryTemp;
-
- /**
- * 閿欒缂栧彿
- */
- @ApiModelProperty(value= "閿欒缂栧彿")
- @TableField("error_code")
- private Integer errorCode;
-
- /**
- * Plc杈撳嚭鐘舵�両O
- */
- @ApiModelProperty(value= "Plc杈撳嚭鐘舵�両O")
- @TableField("plc_output_status_io")
- private Integer plcOutputStatusIo;
-
- /**
- * 閿欒淇℃伅鐮�
- */
- @ApiModelProperty(value= "閿欒淇℃伅鐮�")
- @TableField("status_error_code")
- private Integer statusErrorCode;
-
- /**
- * PLC杈撳叆鐘舵��
- */
- @ApiModelProperty(value= "PLC杈撳叆鐘舵��")
- @TableField("plc_input_status")
- private Integer plcInputStatus;
-
- /**
- * 褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��
- */
- @ApiModelProperty(value= "褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��")
- @TableField("current_or_before_code")
- private Integer currentOrBeforeCode;
-
- /**
- * 璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
- */
- @ApiModelProperty(value= "璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�")
- @TableField("code_offset_x")
- private Integer codeOffsetX;
-
- /**
- * 璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
- */
- @ApiModelProperty(value= "璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�")
- @TableField("code_offset_y")
- private Integer codeOffsetY;
-
- /**
- * 褰撳墠鐨勭數鍘嬪��
- */
- @ApiModelProperty(value= "褰撳墠鐨勭數鍘嬪��")
- @TableField("current_voltage")
- private Integer currentVoltage;
-
- /**
- * 褰撳墠鐨勬ā鎷熼噺鍊�
- */
- @ApiModelProperty(value= "褰撳墠鐨勬ā鎷熼噺鍊�")
- @TableField("current_analog_value")
- private Integer currentAnalogValue;
-
- /**
- * 褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
- */
- @ApiModelProperty(value= "褰撳墠鐨勫崌闄嶄己鏈嶉�熷害")
- @TableField("current_lift_servo_speed")
- private Integer currentLiftServoSpeed;
-
- /**
- * 褰撳墠鐨勮璧颁己鏈嶉�熷害
- */
- @ApiModelProperty(value= "褰撳墠鐨勮璧颁己鏈嶉�熷害")
- @TableField("current_move_servo_speed")
- private Integer currentMoveServoSpeed;
-
- /**
- * 褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
- */
- @ApiModelProperty(value= "褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼")
- @TableField("current_lift_servo_load")
- private Integer currentLiftServoLoad;
-
- /**
- * 褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
- */
- @ApiModelProperty(value= "褰撳墠鐨勮璧颁己鏈嶈礋杞界巼")
- @TableField("current_move_servo_load")
- private Integer currentMoveServoLoad;
-
- /**
* 灏忚溅杩愯閫熷害
*/
@ApiModelProperty(value= "灏忚溅杩愯閫熷害")
@TableField("run_speed")
private Integer runSpeed;
+ /**
+ * 鐗涚溂-宸ヤ綔妯″紡
+ */
+ @ApiModelProperty(value= "宸ヤ綔妯″紡")
+ @TableField("working_mode")
+ private Integer workingMode;
+
+ /**
+ * 鐗涚溂-杩愯鐘舵��
+ */
+ @ApiModelProperty(value= "杩愯鐘舵��")
+ @TableField("free")
+ private Integer free;
+
+ /**
+ * 鐗涚溂-褰撳墠閫熷害
+ */
+ @ApiModelProperty(value= "褰撳墠閫熷害")
+ @TableField("speed")
+ private Integer speed;
+
+ /**
+ * 鐗涚溂-璐熻浇鐘舵��
+ */
+ @ApiModelProperty(value= "璐熻浇鐘舵��")
+ @TableField("load_state")
+ private Integer loadState;
+
+ /**
+ * 鐗涚溂-绠″埗鐘舵��
+ */
+ @ApiModelProperty(value= "绠″埗鐘舵��")
+ @TableField("suspend_state")
+ private Integer suspendState;
+
+ /**
+ * 鐗涚溂-椤跺崌浣嶇疆
+ */
+ @ApiModelProperty(value= "椤跺崌浣嶇疆")
+ @TableField("lift_position")
+ private Integer liftPosition;
+
+ /**
+ * 鐗涚溂-杩愯鏂瑰悜
+ */
+ @ApiModelProperty(value= "杩愯鏂瑰悜")
+ @TableField("run_dir")
+ private Integer runDir;
+
+ /**
+ * 鐗涚溂-杩愯鏂瑰悜
+ */
+ @ApiModelProperty(value= "杩愯鏂瑰悜")
+ @TableField("run_dir2")
+ private Integer runDir2;
+
+ /**
+ * 鐗涚溂-鍏呯數鐘舵��
+ */
+ @ApiModelProperty(value= "鍏呯數鐘舵��")
+ @TableField("charg_state")
+ private Integer chargState;
+
+ /**
+ * 鐗涚溂-鐢垫睜鐢甸噺
+ */
+ @ApiModelProperty(value= "鐢垫睜鐢甸噺")
+ @TableField("power_percent")
+ private Integer powerPercent;
+
+ /**
+ * 鐗涚溂-鏈�楂樼數鑺數鍘�
+ */
+ @ApiModelProperty(value= "鏈�楂樼數鑺數鍘�")
+ @TableField("max_cell_voltage")
+ private Integer maxCellVoltage;
+
+ /**
+ * 鐗涚溂-鏈�浣庣數鑺數鍘�
+ */
+ @ApiModelProperty(value= "鏈�浣庣數鑺數鍘�")
+ @TableField("min_cell_voltage")
+ private Integer minCellVoltage;
+
+ /**
+ * 鐗涚溂-鐢垫睜鐢靛帇
+ */
+ @ApiModelProperty(value= "鐢垫睜鐢靛帇")
+ @TableField("voltage")
+ private Integer voltage;
+
+ /**
+ * 鐗涚溂-鍏呮斁鐢靛惊鐜鏁�
+ */
+ @ApiModelProperty(value= "鍏呮斁鐢靛惊鐜鏁�")
+ @TableField("charge_cycle_times")
+ private Integer chargeCycleTimes;
+
+ /**
+ * 鐗涚溂-鍓╀綑鐢甸噺
+ */
+ @ApiModelProperty(value= "鍓╀綑鐢甸噺")
+ @TableField("surplus_quantity")
+ private Integer surplusQuantity;
+
+ /**
+ * 鐗涚溂-鎬荤數閲�
+ */
+ @ApiModelProperty(value= "鎬荤數閲�")
+ @TableField("count_quantity")
+ private Integer countQuantity;
+
+ /**
+ * 鐗涚溂-瀹為檯搴撲綅
+ */
+ @ApiModelProperty(value= "瀹為檯搴撲綅")
+ @TableField("point")
+ private String point;
+
+ /**
+ * 鐗涚溂-瀹為檯鍧愭爣
+ */
+ @ApiModelProperty(value= "瀹為檯鍧愭爣")
+ @TableField("coord")
+ private String coord;
+
+ /**
+ * 鐗涚溂-浠诲姟鐩殑搴撲綅
+ */
+ @ApiModelProperty(value= "浠诲姟鐩殑搴撲綅")
+ @TableField("task")
+ private String task;
+
+ /**
+ * 鐗涚溂-浠诲姟鐘舵��
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵��")
+ @TableField("task_state")
+ private Integer taskState;
+
+ /**
+ * 鐗涚溂-鏁呴殰鐘舵��
+ */
+ @ApiModelProperty(value= "鏁呴殰鐘舵��")
+ @TableField("err_state")
+ private Integer errState;
+
+ /**
+ * 鐗涚溂-鎬婚噷绋嬫暟
+ */
+ @ApiModelProperty(value= "鎬婚噷绋嬫暟")
+ @TableField("status_sum")
+ private String statusSum;
+
+ /**
+ * 鐗涚溂-闈炶嚜鍔ㄧ姸鎬佹椂闂磋鏃�
+ */
+ @ApiModelProperty(value= "闈炶嚜鍔ㄧ姸鎬佹椂闂磋鏃�")
+ @TableField("err_time")
+ private Integer errTime;
+
public BasShuttle() {}
- public BasShuttle(Integer shuttleNo,Integer status,Integer shuttleStatus,Integer wrkNo,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer liftNo,Boolean pakMk,Integer busyStatus,Integer currentCode,Integer batteryPower,Integer batteryTemp,Integer errorCode,Integer plcOutputStatusIo,Integer statusErrorCode,Integer plcInputStatus,Integer currentOrBeforeCode,Integer codeOffsetX,Integer codeOffsetY,Integer currentVoltage,Integer currentAnalogValue,Integer currentLiftServoSpeed,Integer currentMoveServoSpeed,Integer currentLiftServoLoad,Integer currentMoveServoLoad) {
+ public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer liftNo, Boolean pakMk, Integer runSpeed, Integer workingMode, Integer free, Integer speed, Integer loadState, Integer suspendState, Integer liftPosition, Integer runDir, Integer runDir2, Integer chargState, Integer powerPercent, Integer maxCellVoltage, Integer minCellVoltage, Integer voltage, Integer chargeCycleTimes, Integer surplusQuantity, Integer countQuantity, String point, String coord, String task, Integer taskState, Integer errState, String statusSum, Integer errTime) {
this.shuttleNo = shuttleNo;
this.status = status;
this.shuttleStatus = shuttleStatus;
@@ -263,26 +305,33 @@
this.memo = memo;
this.liftNo = liftNo;
this.pakMk = pakMk;
- this.busyStatus = busyStatus;
- this.currentCode = currentCode;
- this.batteryPower = batteryPower;
- this.batteryTemp = batteryTemp;
- this.errorCode = errorCode;
- this.plcOutputStatusIo = plcOutputStatusIo;
- this.statusErrorCode = statusErrorCode;
- this.plcInputStatus = plcInputStatus;
- this.currentOrBeforeCode = currentOrBeforeCode;
- this.codeOffsetX = codeOffsetX;
- this.codeOffsetY = codeOffsetY;
- this.currentVoltage = currentVoltage;
- this.currentAnalogValue = currentAnalogValue;
- this.currentLiftServoSpeed = currentLiftServoSpeed;
- this.currentMoveServoSpeed = currentMoveServoSpeed;
- this.currentLiftServoLoad = currentLiftServoLoad;
- this.currentMoveServoLoad = currentMoveServoLoad;
+ this.runSpeed = runSpeed;
+ this.workingMode = workingMode;
+ this.free = free;
+ this.speed = speed;
+ this.loadState = loadState;
+ this.suspendState = suspendState;
+ this.liftPosition = liftPosition;
+ this.runDir = runDir;
+ this.runDir2 = runDir2;
+ this.chargState = chargState;
+ this.powerPercent = powerPercent;
+ this.maxCellVoltage = maxCellVoltage;
+ this.minCellVoltage = minCellVoltage;
+ this.voltage = voltage;
+ this.chargeCycleTimes = chargeCycleTimes;
+ this.surplusQuantity = surplusQuantity;
+ this.countQuantity = countQuantity;
+ this.point = point;
+ this.coord = coord;
+ this.task = task;
+ this.taskState = taskState;
+ this.errState = errState;
+ this.statusSum = statusSum;
+ this.errTime = errTime;
}
-// BasShuttle basShuttle = new BasShuttle(
+ // BasShuttle basShuttle = new BasShuttle(
// null, // 鍥涘悜绌挎杞﹀彿[闈炵┖]
// null, // 鐘舵��
// null, // 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
@@ -358,34 +407,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBusyStatus$() {
- if (Cools.isEmpty(this.busyStatus)){
- return "";
- }
- switch (this.busyStatus){
- case 1:
- return "蹇欑";
- case 0:
- return "绌洪棽";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getBatteryPower$() {
- if (Cools.isEmpty(this.batteryPower)){
- return "";
- }
- return (this.batteryPower * 0.1) + "%";
- }
-
- public String getBatteryTemp$() {
- if (Cools.isEmpty(this.batteryTemp)){
- return "";
- }
- return (this.batteryTemp * 0.1) + "%";
}
public int getPakMk() {
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
index 49a03fd..5c45c22 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
@@ -186,9 +186,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasShuttleErrLog() {}
- public BasShuttleErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer shuttleNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasShuttleErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer shuttleNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, String systemStatus) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -210,6 +217,7 @@
this.updateTime = updateTime;
this.updateBy = updateBy;
this.memo = memo;
+ this.systemStatus = systemStatus;
}
// BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
@@ -217,6 +225,7 @@
// null, // 宸ヤ綔鍙�
// null, // 鍙戠敓鏃堕棿
// null, // 缁撴潫鏃堕棿
+
// null, // 宸ヤ綔鐘舵��
// null, // 鍏ュ嚭搴撶被鍨�
// null, // 绌挎杞�
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
index c1e01cf..e0dac67 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
@@ -99,9 +99,16 @@
@ApiModelProperty(value= "鍛戒护")
private String command;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasShuttleOpt() {}
- public BasShuttleOpt(Integer wrkNo,Integer shuttleNo, Date sendTime,String mode,String sourceLocNo,String distLocNo, Date updateTime, Long updateBy, String memo,String command) {
+ public BasShuttleOpt(Integer wrkNo, Integer shuttleNo, Date sendTime, String mode, String sourceLocNo, String distLocNo, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
this.wrkNo = wrkNo;
this.shuttleNo = shuttleNo;
this.sendTime = sendTime;
@@ -112,6 +119,7 @@
this.updateBy = updateBy;
this.memo = memo;
this.command = command;
+ this.systemStatus = systemStatus;
}
// BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
diff --git a/src/main/resources/mapper/BasLiftErrLogMapper.xml b/src/main/resources/mapper/BasLiftErrLogMapper.xml
index b427434..68c620f 100644
--- a/src/main/resources/mapper/BasLiftErrLogMapper.xml
+++ b/src/main/resources/mapper/BasLiftErrLogMapper.xml
@@ -26,6 +26,7 @@
<result column="update_time" property="updateTime" />
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/resources/mapper/BasLiftMapper.xml b/src/main/resources/mapper/BasLiftMapper.xml
index caae4e5..8c2d9e1 100644
--- a/src/main/resources/mapper/BasLiftMapper.xml
+++ b/src/main/resources/mapper/BasLiftMapper.xml
@@ -11,27 +11,23 @@
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
<result column="pak_mk" property="pakMk" />
- <result column="lift_lock" property="liftLock" />
- <result column="position_arrival_feedback" property="positionArrivalFeedback" />
- <result column="ready" property="ready" />
- <result column="running" property="running" />
- <result column="mode" property="mode" />
- <result column="line_front_has_stock" property="lineFrontHasStock" />
- <result column="forward_rotation_feedback" property="forwardRotationFeedback" />
- <result column="reverse_feedback" property="reverseFeedback" />
- <result column="motor_overload" property="motorOverload" />
- <result column="line_end_has_stock" property="lineEndHasStock" />
- <result column="in_convey_line_card_tray_alarm" property="inConveyLineCardTrayAlarm" />
- <result column="out_convey_line_card_tray_alarm" property="outConveyLineCardTrayAlarm" />
- <result column="plat_position_deviation_alarm" property="platPositionDeviationAlarm" />
- <result column="plat_torque_deviation_alarm" property="platTorqueDeviationAlarm" />
- <result column="plat_shuttle_check" property="platShuttleCheck" />
- <result column="not_ready" property="notReady" />
- <result column="servo_error1" property="servoError1" />
- <result column="servo_error2" property="servoError2" />
- <result column="servo_error3" property="servoError3" />
- <result column="servo_error4" property="servoError4" />
- <result column="lift_actual_speed" property="liftActualSpeed" />
+
+ <result column="point" property="point" />
+ <result column="model" property="model" />
+ <result column="busy" property="busy" />
+ <result column="front_overrun" property="frontOverrun" />
+ <result column="back_overrun" property="backOverrun" />
+ <result column="left_overrun" property="leftOverrun" />
+ <result column="right_overrun" property="rightOverrun" />
+ <result column="over_height" property="overHeight" />
+ <result column="over_weight" property="overWeight" />
+ <result column="has_tray" property="hasTray" />
+ <result column="has_car" property="hasCar" />
+ <result column="device_error" property="deviceError" />
+ <result column="task_address" property="taskAddress" />
+ <result column="dist_address" property="distAddress" />
+ <result column="complete_task_no" property="completeTaskNo" />
+ <result column="lev" property="lev" />
</resultMap>
diff --git a/src/main/resources/mapper/BasLiftOptMapper.xml b/src/main/resources/mapper/BasLiftOptMapper.xml
index b2f2cc4..0d9fa3f 100644
--- a/src/main/resources/mapper/BasLiftOptMapper.xml
+++ b/src/main/resources/mapper/BasLiftOptMapper.xml
@@ -12,6 +12,7 @@
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
<result column="command" property="command" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/resources/mapper/BasShuttleErrLogMapper.xml b/src/main/resources/mapper/BasShuttleErrLogMapper.xml
index e554833..ba98429 100644
--- a/src/main/resources/mapper/BasShuttleErrLogMapper.xml
+++ b/src/main/resources/mapper/BasShuttleErrLogMapper.xml
@@ -11,7 +11,6 @@
<result column="end_time" property="endTime" />
<result column="wrk_sts" property="wrkSts" />
<result column="io_type" property="ioType" />
- <result column="ste_no" property="steNo" />
<result column="plc_no" property="plcNo" />
<result column="loc_no" property="locNo" />
<result column="sta_no" property="staNo" />
@@ -26,6 +25,7 @@
<result column="update_time" property="updateTime" />
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/resources/mapper/BasShuttleMapper.xml b/src/main/resources/mapper/BasShuttleMapper.xml
index 181726d..bbd7552 100644
--- a/src/main/resources/mapper/BasShuttleMapper.xml
+++ b/src/main/resources/mapper/BasShuttleMapper.xml
@@ -18,23 +18,30 @@
<result column="memo" property="memo" />
<result column="lift_no" property="liftNo" />
<result column="pak_mk" property="pakMk" />
- <result column="busy_status" property="busyStatus" />
- <result column="current_code" property="currentCode" />
- <result column="battery_power" property="batteryPower" />
- <result column="battery_temp" property="batteryTemp" />
- <result column="error_code" property="errorCode" />
- <result column="plc_output_status_io" property="plcOutputStatusIo" />
- <result column="status_error_code" property="statusErrorCode" />
- <result column="plc_input_status" property="plcInputStatus" />
- <result column="current_or_before_code" property="currentOrBeforeCode" />
- <result column="code_offset_x" property="codeOffsetX" />
- <result column="code_offset_y" property="codeOffsetY" />
- <result column="current_voltage" property="currentVoltage" />
- <result column="current_analog_value" property="currentAnalogValue" />
- <result column="current_lift_servo_speed" property="currentLiftServoSpeed" />
- <result column="current_move_servo_speed" property="currentMoveServoSpeed" />
- <result column="current_lift_servo_load" property="currentLiftServoLoad" />
- <result column="current_move_servo_load" property="currentMoveServoLoad" />
+
+ <result column="working_mode" property="workingMode" />
+ <result column="free" property="free" />
+ <result column="speed" property="speed" />
+ <result column="load_state" property="loadState" />
+ <result column="suspend_state" property="suspendState" />
+ <result column="lift_position" property="liftPosition" />
+ <result column="run_dir" property="runDir" />
+ <result column="run_dir2" property="runDir2" />
+ <result column="charg_state" property="chargState" />
+ <result column="power_percent" property="powerPercent" />
+ <result column="max_cell_voltage" property="maxCellVoltage" />
+ <result column="min_cell_voltage" property="minCellVoltage" />
+ <result column="voltage" property="voltage" />
+ <result column="charge_cycle_times" property="chargeCycleTimes" />
+ <result column="surplus_quantity" property="surplusQuantity" />
+ <result column="count_quantity" property="countQuantity" />
+ <result column="point" property="point" />
+ <result column="coord" property="coord" />
+ <result column="task" property="task" />
+ <result column="task_state" property="taskState" />
+ <result column="err_state" property="errState" />
+ <result column="status_sum" property="statusSum" />
+ <result column="err_time" property="errTime" />
</resultMap>
diff --git a/src/main/resources/mapper/BasShuttleOptMapper.xml b/src/main/resources/mapper/BasShuttleOptMapper.xml
index dd0694a..a072104 100644
--- a/src/main/resources/mapper/BasShuttleOptMapper.xml
+++ b/src/main/resources/mapper/BasShuttleOptMapper.xml
@@ -15,6 +15,7 @@
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
<result column="command" property="command" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js b/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js
index c61794d..6406a58 100644
--- a/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js
+++ b/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js
@@ -39,6 +39,7 @@
,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
,{field: 'error', align: 'center',title: '寮傚父'}
,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
index 645a9db..6b277cc 100644
--- a/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
+++ b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
@@ -30,6 +30,7 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
,{field: 'command', align: 'center',title: '鍛戒护'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
// ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
index a158b94..241c6bb 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
@@ -39,6 +39,7 @@
,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
,{field: 'error', align: 'center',title: '寮傚父'}
,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
index bdf3e33..6fbeae0 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
@@ -27,6 +27,7 @@
,{field: 'sourceLocNo', align: 'center',title: '璧风偣搴撲綅'}
,{field: 'distLocNo', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'command', align: 'center',title: '鍛戒护'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index bf23ea1..e214aa3 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -17,14 +17,14 @@
.pointContainer {
display: flex;
justify-content: center;
- margin-top: 1px;
+ /*margin-top: 1px;*/
}
.pointBox {
background: #bababa;
width: 40px;
height: 40px;
- margin-right: 1px;
+ /*margin-right: 1px;*/
display: flex;
justify-content: center;
align-items: center;
@@ -434,7 +434,7 @@
<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 10" :style="{background: currentLev==10?'red':''}">10F</button></div>
</div>
</div>
- <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2000 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
+ <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2100 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
<el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
<div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
<div class="hoverCard" style="width: 100%;">
@@ -650,7 +650,7 @@
created(){
this.init()
- this.getOutSite()
+ // this.getOutSite()
},
watch: {
map: {
--
Gitblit v1.9.1