From af700f7957d1159e06eea94526efd48e10188b66 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期一, 29 一月 2024 20:18:55 +0800 Subject: [PATCH] # --- src/main/webapp/static/wcs/js/common.js | 2 +- src/main/java/com/zy/asrs/controller/OpenController.java | 7 +++---- src/main/webapp/static/wcs/js/console.map.js | 2 +- src/main/java/com/zy/asrs/entity/BasCrnp.java | 11 +++++++++++ src/main/webapp/static/wms/js/common.js | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index cbf0609..eb2cd6c 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -24,10 +24,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.sql.ResultSetMetaData; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Slf4j @RestController @@ -383,6 +380,7 @@ map.put("devStatus", basDevp.getAutoing().equals("Y")? 1:0); map.put("errorCode", 0); map.put("errorMsg", ""); + map.put("newDate",new Date()); list.add(map); } List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>()); @@ -393,6 +391,7 @@ map.put("devStatus", basCrnp.getCrnSts()); map.put("errorCode", 0); map.put("errorMsg", ""); + map.put("newDate",new Date()); list.add(map); } return R.ok(list); diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java index 2ce3c36..0f37f95 100644 --- a/src/main/java/com/zy/asrs/entity/BasCrnp.java +++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java @@ -196,6 +196,17 @@ // null // // ); + public String getcrnSts$(){ + if(this.crnSts==1){ + return "鍗曟満"; + }else if(this.crnSts==2){ + return "鎵嬪姩"; + }else if(this.crnSts==3){ + return "鑱旀満"; + }else { + return "鏈煡"; + } + } public Integer getCrnNo() { return crnNo; } diff --git a/src/main/webapp/static/wcs/js/common.js b/src/main/webapp/static/wcs/js/common.js index dd0efd0..3fe5057 100644 --- a/src/main/webapp/static/wcs/js/common.js +++ b/src/main/webapp/static/wcs/js/common.js @@ -1,4 +1,4 @@ -var baseUrl = "/wcs"; +var baseUrl = "/wxwcs"; // 璧嬪�� function setVal(el, val) { diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js index d6e75f0..aa027a6 100644 --- a/src/main/webapp/static/wcs/js/console.map.js +++ b/src/main/webapp/static/wcs/js/console.map.js @@ -1,5 +1,5 @@ mapInfo = { - "mapName": "rywxwcs", + "mapName": "wxwcs", "rackCount": 13, "crnCount": 4, "stbCount": 4, diff --git a/src/main/webapp/static/wms/js/common.js b/src/main/webapp/static/wms/js/common.js index fcb5b63..a163565 100644 --- a/src/main/webapp/static/wms/js/common.js +++ b/src/main/webapp/static/wms/js/common.js @@ -1,4 +1,4 @@ -var baseUrl = "/wcs"; +var baseUrl = "/wxwcs"; // 璇︽儏绐楀彛-楂樺害 var detailHeight = '80%'; -- Gitblit v1.9.1