From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/WindowsServerInfos.java | 168 ++++++++++++++++++++++++++++----------------------------
1 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/WindowsServerInfos.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/WindowsServerInfos.java
index c58f093..04fe5c4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/WindowsServerInfos.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/WindowsServerInfos.java
@@ -1,85 +1,85 @@
-package com.zy.asrs.wms.system.license.entity.license;
-
-import java.net.InetAddress;
-import java.util.List;
-import java.util.Scanner;
-import java.util.stream.Collectors;
-
-/**
- * 鐢ㄤ簬鑾峰彇瀹㈡埛Windows鏈嶅姟鍣ㄧ殑鍩烘湰淇℃伅
- */
-public class WindowsServerInfos extends AbstractServerInfos {
-
- @Override
- protected List<String> getIpAddress() throws Exception {
- List<String> result = null;
-
- //鑾峰彇鎵�鏈夌綉缁滄帴鍙�
- List<InetAddress> inetAddresses = getLocalAllInetAddress();
-
- if(inetAddresses != null && inetAddresses.size() > 0){
- result = inetAddresses.stream().map(InetAddress::getHostAddress).distinct().map(String::toLowerCase).collect(Collectors.toList());
- }
-
- return result;
- }
-
- @Override
- protected List<String> getMacAddress() throws Exception {
- List<String> result = null;
-
- //1. 鑾峰彇鎵�鏈夌綉缁滄帴鍙�
- List<InetAddress> inetAddresses = getLocalAllInetAddress();
-
- if(inetAddresses != null && inetAddresses.size() > 0){
- //2. 鑾峰彇鎵�鏈夌綉缁滄帴鍙ｇ殑Mac鍦板潃
- result = inetAddresses.stream().map(this::getMacByInetAddress).distinct().collect(Collectors.toList());
- }
-
- return result;
- }
-
- @Override
- protected String getCPUSerial() throws Exception {
- //搴忓垪鍙�
- String serialNumber = "";
-
- //浣跨敤WMIC鑾峰彇CPU搴忓垪鍙�
- Process process = Runtime.getRuntime().exec("wmic cpu get processorid");
- process.getOutputStream().close();
- Scanner scanner = new Scanner(process.getInputStream());
-
- if(scanner.hasNext()){
- scanner.next();
- }
-
- if(scanner.hasNext()){
- serialNumber = scanner.next().trim();
- }
-
- scanner.close();
- return serialNumber;
- }
-
- @Override
- protected String getMainBoardSerial() throws Exception {
- //搴忓垪鍙�
- String serialNumber = "";
-
- //浣跨敤WMIC鑾峰彇涓绘澘搴忓垪鍙�
- Process process = Runtime.getRuntime().exec("wmic baseboard get serialnumber");
- process.getOutputStream().close();
- Scanner scanner = new Scanner(process.getInputStream());
-
- if(scanner.hasNext()){
- scanner.next();
- }
-
- if(scanner.hasNext()){
- serialNumber = scanner.next().trim();
- }
-
- scanner.close();
- return serialNumber;
- }
+package com.zy.asrs.wms.system.license.entity.license;
+
+import java.net.InetAddress;
+import java.util.List;
+import java.util.Scanner;
+import java.util.stream.Collectors;
+
+/**
+ * 鐢ㄤ簬鑾峰彇瀹㈡埛Windows鏈嶅姟鍣ㄧ殑鍩烘湰淇℃伅
+ */
+public class WindowsServerInfos extends AbstractServerInfos {
+
+ @Override
+ protected List<String> getIpAddress() throws Exception {
+ List<String> result = null;
+
+ //鑾峰彇鎵�鏈夌綉缁滄帴鍙�
+ List<InetAddress> inetAddresses = getLocalAllInetAddress();
+
+ if(inetAddresses != null && inetAddresses.size() > 0){
+ result = inetAddresses.stream().map(InetAddress::getHostAddress).distinct().map(String::toLowerCase).collect(Collectors.toList());
+ }
+
+ return result;
+ }
+
+ @Override
+ protected List<String> getMacAddress() throws Exception {
+ List<String> result = null;
+
+ //1. 鑾峰彇鎵�鏈夌綉缁滄帴鍙�
+ List<InetAddress> inetAddresses = getLocalAllInetAddress();
+
+ if(inetAddresses != null && inetAddresses.size() > 0){
+ //2. 鑾峰彇鎵�鏈夌綉缁滄帴鍙ｇ殑Mac鍦板潃
+ result = inetAddresses.stream().map(this::getMacByInetAddress).distinct().collect(Collectors.toList());
+ }
+
+ return result;
+ }
+
+ @Override
+ protected String getCPUSerial() throws Exception {
+ //搴忓垪鍙�
+ String serialNumber = "";
+
+ //浣跨敤WMIC鑾峰彇CPU搴忓垪鍙�
+ Process process = Runtime.getRuntime().exec("wmic cpu get processorid");
+ process.getOutputStream().close();
+ Scanner scanner = new Scanner(process.getInputStream());
+
+ if(scanner.hasNext()){
+ scanner.next();
+ }
+
+ if(scanner.hasNext()){
+ serialNumber = scanner.next().trim();
+ }
+
+ scanner.close();
+ return serialNumber;
+ }
+
+ @Override
+ protected String getMainBoardSerial() throws Exception {
+ //搴忓垪鍙�
+ String serialNumber = "";
+
+ //浣跨敤WMIC鑾峰彇涓绘澘搴忓垪鍙�
+ Process process = Runtime.getRuntime().exec("wmic baseboard get serialnumber");
+ process.getOutputStream().close();
+ Scanner scanner = new Scanner(process.getInputStream());
+
+ if(scanner.hasNext()){
+ scanner.next();
+ }
+
+ if(scanner.hasNext()){
+ serialNumber = scanner.next().trim();
+ }
+
+ scanner.close();
+ return serialNumber;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1