From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 6d0c904..9899229 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -63,7 +63,19 @@
*/
@RequestMapping(value = "/getLicenseDays")
public R getLicenseDays() {
- return R.ok(licenseTimer.getLicenseDays());
+ LicenseVerify licenseVerify = new LicenseVerify();
+ LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
+ if (verifyInfo == null) {
+ return R.error();
+ }
+
+ Date start = new Date();
+ Date end = verifyInfo.getNotAfter();
+ Long starTime = start.getTime();
+ Long endTime = end.getTime();
+ Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+ int day = (int) (num / 24 / 60 / 60 / 1000);
+ return R.ok().add(day);
}
@RequestMapping(value = "/updateLicense")
--
Gitblit v1.9.1