From 40254eb1fc7ad9bef6e820c0ffc0cc5a63e9e53e Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 21 十月 2025 09:53:54 +0800 Subject: [PATCH] 1 --- src/main/webapp/static/js/locDetl/locDetl.js | 9 ++ src/main/webapp/views/locDetl/locDetl.html | 2 src/main/java/com/zy/asrs/entity/LocDetl.java | 153 +++++++++++++++++++++---------------- src/main/java/com/zy/asrs/task/OverYearLogScheduler.java | 17 ++++ 4 files changed, 112 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index 59974a3..f9032a2 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -7,6 +7,7 @@ import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.asrs.service.LocMastService; +import com.zy.asrs.task.OverYearLogScheduler; import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -24,161 +25,163 @@ private static final long serialVersionUID = 1L; - @ApiModelProperty(value= "搴撲綅鍙�") + @ApiModelProperty(value = "搴撲綅鍙�") @TableField("loc_no") private String locNo; - @ApiModelProperty(value= "鎵樼洏鏉$爜") + @ApiModelProperty(value = "鎵樼洏鏉$爜") private String zpallet; - @ApiModelProperty(value= "鏁伴噺") + @ApiModelProperty(value = "鏁伴噺") @ExcelProperty("鏁伴噺") private Double anfme; - @ApiModelProperty(value= "鍟嗗搧缂栧彿") + @ApiModelProperty(value = "鍟嗗搧缂栧彿") @ExcelProperty("鍟嗗搧缂栧彿") private String matnr; - @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + @ApiModelProperty(value = "鍟嗗搧鍚嶇О") @ExcelProperty("鍟嗗搧鍚嶇О") private String maktx; - @ApiModelProperty(value= "瑙勬牸") + @ApiModelProperty(value = "瑙勬牸") @ExcelProperty("瑙勬牸") private String specs; - @ApiModelProperty(value= "璐у搧鐗瑰緛") + @ApiModelProperty(value = "璐у搧鐗瑰緛") @ExcelProperty("璐у搧鐗瑰緛") private String batch; - @ApiModelProperty(value= "鍗曟嵁缂栧彿") + @ApiModelProperty(value = "鍗曟嵁缂栧彿") @ExcelProperty("鍗曟嵁缂栧彿") @TableField("order_no") private String orderNo; - @ApiModelProperty(value= "鍨嬪彿") + @ApiModelProperty(value = "鍨嬪彿") private String model; - @ApiModelProperty(value= "棰滆壊") + @ApiModelProperty(value = "棰滆壊") private String color; - @ApiModelProperty(value= "鍝佺墝") + @ApiModelProperty(value = "鍝佺墝") private String brand; - @ApiModelProperty(value= "鍗曚綅") + @ApiModelProperty(value = "鍗曚綅") private String unit; - @ApiModelProperty(value= "鍗曚环") + @ApiModelProperty(value = "鍗曚环") private Double price; - @ApiModelProperty(value= "sku") + @ApiModelProperty(value = "sku") private String sku; - @ApiModelProperty(value= "鍗曚綅閲�") + @ApiModelProperty(value = "鍗曚綅閲�") private Double units; - @ApiModelProperty(value= "鏉$爜") + @ApiModelProperty(value = "鏉$爜") private String barcode; - @ApiModelProperty(value= "浜у湴") + @ApiModelProperty(value = "浜у湴") private String origin; - @ApiModelProperty(value= "鍘傚") + @ApiModelProperty(value = "鍘傚") private String manu; - @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @ApiModelProperty(value = "鐢熶骇鏃ユ湡") @TableField("manu_date") private String manuDate; - @ApiModelProperty(value= "鍝侀」鏁�") + @ApiModelProperty(value = "鍝侀」鏁�") @TableField("item_num") private String itemNum; - @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�") + @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�") @TableField("safe_qty") private Double safeQty; - @ApiModelProperty(value= "閲嶉噺") + @ApiModelProperty(value = "閲嶉噺") private Double weight; - @ApiModelProperty(value= "闀垮害") + @ApiModelProperty(value = "闀垮害") private Double length; - @ApiModelProperty(value= "浣撶Н") + @ApiModelProperty(value = "浣撶Н") private Double volume; - @ApiModelProperty(value= "涓夋柟缂栫爜") + @ApiModelProperty(value = "涓夋柟缂栫爜") @TableField("three_code") private String threeCode; - @ApiModelProperty(value= "渚涘簲鍟�") + @ApiModelProperty(value = "渚涘簲鍟�") private String supp; - @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�") + @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�") @TableField("supp_code") private String suppCode; - @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ") + @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ") @TableField("be_batch") private Integer beBatch; - @ApiModelProperty(value= "淇濊川鏈�") + @ApiModelProperty(value = "淇濊川鏈�") @TableField("dead_time") private String deadTime; - @ApiModelProperty(value= "棰勮澶╂暟") + @ApiModelProperty(value = "棰勮澶╂暟") @TableField("dead_warn") private Integer deadWarn; - @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ") + @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ") private Integer source; - @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") + @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") private Integer inspect; - @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") + @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") private Integer danger; - @ApiModelProperty(value= "淇敼浜哄憳") + @ApiModelProperty(value = "淇敼浜哄憳") @TableField("modi_user") private Long modiUser; - @ApiModelProperty(value= "淇敼鏃堕棿") + @ApiModelProperty(value = "淇敼鏃堕棿") @TableField("modi_time") private Date modiTime; - @ApiModelProperty(value= "鍒涘缓鑰�") + @ApiModelProperty(value = "鍒涘缓鑰�") @TableField("appe_user") private Long appeUser; - @ApiModelProperty(value= "娣诲姞鏃堕棿") + @ApiModelProperty(value = "娣诲姞鏃堕棿") @TableField("appe_time") private Date appeTime; - @ApiModelProperty(value= "澶囨敞") + @ApiModelProperty(value = "澶囨敞") private String memo; - @ApiModelProperty(value= "棰勭暀1") + @ApiModelProperty(value = "棰勭暀1") private String temp1; - @ApiModelProperty(value= "棰勭暀1") + @ApiModelProperty(value = "棰勭暀1") private String temp2; - @ApiModelProperty(value= "棰勭暀1") + @ApiModelProperty(value = "棰勭暀1") private String temp3; - @ApiModelProperty(value= "棰勭暀1") + @ApiModelProperty(value = "棰勭暀1") private String temp4; - public String getLocNo$(){ + public String getLocNo$() { LocMastService service = SpringUtils.getBean(LocMastService.class); LocMast locMast = service.selectById(this.locNo); - if (!Cools.isEmpty(locMast)){ + if (!Cools.isEmpty(locMast)) { return String.valueOf(locMast.getLocNo()); } return null; } - public String getBeBatch$(){ - if (null == this.beBatch){ return null; } - switch (this.beBatch){ + public String getBeBatch$() { + if (null == this.beBatch) { + return null; + } + switch (this.beBatch) { case 1: return "鏄�"; case 0: @@ -188,9 +191,11 @@ } } - public String getSource$(){ - if (null == this.source){ return null; } - switch (this.source){ + public String getSource$() { + if (null == this.source) { + return null; + } + switch (this.source) { case 1: return "鍒堕��"; case 2: @@ -202,9 +207,11 @@ } } - public String getInspect$(){ - if (null == this.inspect){ return null; } - switch (this.inspect){ + public String getInspect$() { + if (null == this.inspect) { + return null; + } + switch (this.inspect) { case 1: return "鏄�"; case 0: @@ -214,9 +221,11 @@ } } - public String getDanger$(){ - if (null == this.danger){ return null; } - switch (this.danger){ + public String getDanger$() { + if (null == this.danger) { + return null; + } + switch (this.danger) { case 1: return "鏄�"; case 0: @@ -226,47 +235,57 @@ } } - public String getModiUser$(){ + public String getModiUser$() { UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.modiUser); - if (!Cools.isEmpty(user)){ + if (!Cools.isEmpty(user)) { return String.valueOf(user.getUsername()); } return null; } - public String getModiTime$(){ - if (Cools.isEmpty(this.modiTime)){ + public String getModiTime$() { + if (Cools.isEmpty(this.modiTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); } - public String getAppeUser$(){ + public String getAppeUser$() { UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.appeUser); - if (!Cools.isEmpty(user)){ + if (!Cools.isEmpty(user)) { return String.valueOf(user.getUsername()); } return null; } - public String getAppeTime$(){ - if (Cools.isEmpty(this.appeTime)){ + public String getAppeTime$() { + if (Cools.isEmpty(this.appeTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } - public long getStoreDate(){ - if (Cools.isEmpty(this.appeTime)){ + public long getStoreDate() { + if (Cools.isEmpty(this.appeTime)) { this.appeTime = new Date(); } long timeNow = new Date().getTime(); long timeCreate = this.appeTime.getTime(); - return (timeNow - timeCreate) /24/60/60/1000; + return (timeNow - timeCreate) / 24 / 60 / 60 / 1000; + } + + public boolean getAlarmStatus() { + if (Cools.isEmpty(this.appeTime)) { + this.appeTime = new Date(); + } + long timeNow = new Date().getTime(); + long timeCreate = this.appeTime.getTime(); + + return OverYearLogScheduler.days > ((timeNow - timeCreate) / 24 / 60 / 60 / 1000); } public void sync(Object source) { diff --git a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java index 95a8a29..7d3090a 100644 --- a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java @@ -2,6 +2,8 @@ import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.OverYearLogHandler; +import com.zy.system.entity.Config; +import com.zy.system.service.ConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -16,15 +18,28 @@ private static final Logger log = LoggerFactory.getLogger(OverYearLogScheduler.class); + public static Integer days = 60; + @Autowired private OverYearLogHandler overYearLogHandler; + @Autowired + private ConfigService configService; + @Scheduled(cron = "0/3 * * * * ? ") - private void execute(){ + private void execute() { ReturnT<String> returnT = overYearLogHandler.start(); if (!returnT.isSuccess()) { log.error(returnT.getMsg()); } } + + @Scheduled(cron = "0/2 * * * * ? ") + private void execute2() { + Config config = configService.selectConfigByCode("AlarmDays"); + if (config != null && config.getValue() != null && config.getStatus() == 1) { + days = Integer.parseInt(config.getValue()); + } + } } diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index 2ab13b0..982557b 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -74,6 +74,15 @@ res.data[_index][data.value] = 'N'; } }); + + var that = this.elem.next(); + res.data.forEach(function (item, index) { + if (item.alarmStatus) { + var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']"); + tr.css("background-color", "#FF5722"); + tr.css("color", "white"); + } + }); } }); diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html index 174bb0f..2bbb6ea 100644 --- a/src/main/webapp/views/locDetl/locDetl.html +++ b/src/main/webapp/views/locDetl/locDetl.html @@ -73,7 +73,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/locDetl/locDetl.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/locDetl/locDetl.js?v=1" charset="utf-8"></script> <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> -- Gitblit v1.9.1