From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java | 214 +++++++++++++++++++++++++----------------------------
1 files changed, 102 insertions(+), 112 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java
index bc1be94..32ccfe6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java
@@ -1,113 +1,103 @@
-package com.zy.asrs.wms.system.license.controller;
-
-import com.zy.asrs.wms.system.license.LicenseCheckListener;
-import com.zy.asrs.wms.system.license.entity.license.*;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import de.schlichtherle.license.LicenseContent;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-
-/**
- *
- * 鐢ㄤ簬鐢熸垚璇佷功鏂囦欢锛屼笉鑳芥斁鍦ㄧ粰瀹㈡埛閮ㄧ讲鐨勪唬鐮侀噷
- */
-@RestController
-@RequestMapping("/api/license")
-public class LicenseCreatorController {
-
- @Value("${license.licensePath}")
- private String licensePath;
-
- @Autowired
- private LicenseCheckListener licenseCheckListener;
-
- /**
- * 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
- * @param osName 鎿嶄綔绯荤粺绫诲瀷锛屽鏋滀负绌哄垯鑷姩鍒ゆ柇
- */
- @RequestMapping(value = "/getServerInfos",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
- public LicenseCheck getServerInfos(@RequestParam(value = "osName",required = false) String osName) {
- //鎿嶄綔绯荤粺绫诲瀷
- if(Cools.isEmpty(osName)){
- osName = System.getProperty("os.name");
- }
- osName = osName.toLowerCase();
-
- AbstractServerInfos abstractServerInfos = null;
-
- //鏍规嵁涓嶅悓鎿嶄綔绯荤粺绫诲瀷閫夋嫨涓嶅悓鐨勬暟鎹幏鍙栨柟娉�
- if (osName.startsWith("windows")) {
- abstractServerInfos = new WindowsServerInfos();
- } else if (osName.startsWith("linux")) {
-// abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
- abstractServerInfos = new WindowsServerInfos();
- }
-
- return abstractServerInfos.getServerInfos();
- }
-
- /**
- * 鑾峰彇璁稿彲璇佹湁鏁堟湡澶╂暟
- */
- @RequestMapping(value = "/getLicenseDays")
- public R 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")
- public R updateLicense(@RequestParam("file") MultipartFile[] files){
- MultipartFile file = files[0];
-
- String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
- File licensePathFile = new File(licensePathFileName);
- //鏈嶅姟鍣ㄧ淇濆瓨鐨勬枃浠跺璞�
- File serverFile = new File(licensePathFile.getPath());
- if (serverFile.exists()) {
- try {
- serverFile.delete();//瀛樺湪鏂囦欢锛屽垹闄�
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- try {
- //鍒涘缓鏂囦欢
- serverFile.createNewFile();
- //灏嗕笂浼犵殑鏂囦欢鍐欏叆鍒版湇鍔″櫒绔枃浠跺唴
- file.transferTo(serverFile);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- //閲嶆柊鍔犺浇璁稿彲璇�
- boolean loadedLicense = licenseCheckListener.loadLicense();
- if (loadedLicense) {
- return R.ok();
- }
- return R.error("璁稿彲璇佹洿鏂板け璐�");
- }
-
+package com.zy.asrs.wms.system.license.controller;
+
+import com.zy.asrs.wms.system.license.LicenseCheckListener;
+import com.zy.asrs.wms.system.license.entity.license.*;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.system.license.timer.LicenseTimer;
+import de.schlichtherle.license.LicenseContent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ *
+ * 鐢ㄤ簬鐢熸垚璇佷功鏂囦欢锛屼笉鑳芥斁鍦ㄧ粰瀹㈡埛閮ㄧ讲鐨勪唬鐮侀噷
+ */
+@RestController
+@RequestMapping("/api/license")
+public class LicenseCreatorController {
+
+ @Value("${license.licensePath}")
+ private String licensePath;
+ @Autowired
+ private LicenseCheckListener licenseCheckListener;
+ @Autowired
+ private LicenseTimer licenseTimer;
+
+ /**
+ * 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
+ * @param osName 鎿嶄綔绯荤粺绫诲瀷锛屽鏋滀负绌哄垯鑷姩鍒ゆ柇
+ */
+ @RequestMapping(value = "/getServerInfos",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
+ public LicenseCheck getServerInfos(@RequestParam(value = "osName",required = false) String osName) {
+ //鎿嶄綔绯荤粺绫诲瀷
+ if(Cools.isEmpty(osName)){
+ osName = System.getProperty("os.name");
+ }
+ osName = osName.toLowerCase();
+
+ AbstractServerInfos abstractServerInfos = null;
+
+ //鏍规嵁涓嶅悓鎿嶄綔绯荤粺绫诲瀷閫夋嫨涓嶅悓鐨勬暟鎹幏鍙栨柟娉�
+ if (osName.startsWith("windows")) {
+ abstractServerInfos = new WindowsServerInfos();
+ } else if (osName.startsWith("linux")) {
+ abstractServerInfos = new LinuxServerInfos();
+ }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ abstractServerInfos = new WindowsServerInfos();
+ }
+
+ return abstractServerInfos.getServerInfos();
+ }
+
+ /**
+ * 鑾峰彇璁稿彲璇佹湁鏁堟湡澶╂暟
+ */
+ @RequestMapping(value = "/getLicenseDays")
+ public R getLicenseDays() {
+ return R.ok().add(licenseTimer.getLicenseDays());
+ }
+
+ @RequestMapping(value = "/updateLicense")
+ public R updateLicense(@RequestParam("file") MultipartFile[] files){
+ MultipartFile file = files[0];
+
+ String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
+ File licensePathFile = new File(licensePathFileName);
+ //鏈嶅姟鍣ㄧ淇濆瓨鐨勬枃浠跺璞�
+ File serverFile = new File(licensePathFile.getPath());
+ if (serverFile.exists()) {
+ try {
+ serverFile.delete();//瀛樺湪鏂囦欢锛屽垹闄�
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ try {
+ //鍒涘缓鏂囦欢
+ serverFile.createNewFile();
+ //灏嗕笂浼犵殑鏂囦欢鍐欏叆鍒版湇鍔″櫒绔枃浠跺唴
+ file.transferTo(serverFile);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ //閲嶆柊鍔犺浇璁稿彲璇�
+ boolean loadedLicense = licenseCheckListener.loadLicense();
+ if (loadedLicense) {
+ return R.ok();
+ }
+ return R.error("璁稿彲璇佹洿鏂板け璐�");
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1