From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 9e8d044..33b26f3 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -154,6 +154,7 @@
List<JarStateTableVo> list = new ArrayList<>();
List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
for (BasJar basJar : jars) {
+ if (basJar.getJarCode()>2) continue;
// 琛ㄦ牸琛�
JarStateTableVo vo = new JarStateTableVo();
vo.setJarNo(basJar.getJarNo()); // RGV鍙�
@@ -165,16 +166,54 @@
vo.setRegion(basJar.getRegion());
vo.setJarCode(basJar.getJarCode());
vo.setJarErr(basJar.getJarErr$());
+
vo.setJarTemperature(basJar.getJarTemperature());
vo.setJarTemperature$(basJar.getJarTemperature().toString()+"鈩�");
vo.setJarPressure(basJar.getJarPressure());
vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
vo.setJarCount(basJar.getJarCount());//鏈�澶у偍閲�
vo.setJarCount$(basJar.getJarCount().toString()+"鎵�");//鏈�澶у偍閲�
+
vo.setHoldingTime(DateUtils.convert(basJar.getHoldingTime()));//淇濇俯鏃堕棿
vo.setOpenTime(DateUtils.convert(basJar.getOpenTime()));//寮�闂ㄦ椂闂�
vo.setCloseTime(DateUtils.convert(basJar.getCloseTime()));//鍏抽棬鏃堕棿
+ vo.setLeftDoorOpen(basJar.getLeftDoorOpen());
+ vo.setLeftDoorClose(basJar.getLeftDoorClose());
+ vo.setRightDoorOpen(basJar.getRightDoorOpen());
+ vo.setRightDoorClose(basJar.getRightDoorClose());
+
+ /**
+ * 宸﹂棬(checkBox)
+ */
+ vo.setLeftDoor(basJar.getLeftDoor().equals("N")? "鍏抽棴":"鎵撳紑");
+
+ /**
+ * 鍙抽棬(checkBox)
+ */
+ vo.setRightDoor(basJar.getRightDoor().equals("N")? "鍏抽棴":"鎵撳紑");
+
+ /**
+ * 宸﹂棬鍙紑(checkBox)
+ */
+ vo.setLeftInEnable(basJar.getLeftInEnable());
+
+ /**
+ * 宸﹂棬鍙叧(checkBox)
+ */
+ vo.setLeftOutEnable(basJar.getLeftOutEnable());
+
+
+ /**
+ * 鍙抽棬鍙紑(checkBox)
+ */
+ vo.setRightInEnable(basJar.getRightInEnable());
+
+ /**
+ * 鍙抽棬鍙叧(checkBox)
+ */
+ vo.setRightOutEnable(basJar.getRightOutEnable());
+
}
return R.ok().add(list);
}
--
Gitblit v1.9.1