From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LinuxServerInfos.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LinuxServerInfos.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LinuxServerInfos.java
index 4959be1..172033a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LinuxServerInfos.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LinuxServerInfos.java
@@ -1,47 +1,47 @@
-package com.zy.asrs.wms.system.license.entity.license;
-
-import java.net.InetAddress;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 鐢ㄤ簬鑾峰彇瀹㈡埛Windows鏈嶅姟鍣ㄧ殑鍩烘湰淇℃伅
- */
-public class LinuxServerInfos 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 {
- return SerialNumberUtil.getSerialNumber("dmidecode -t processor | grep 'ID'", "ID", ":");
- }
-
- @Override
- protected String getMainBoardSerial() throws Exception {
- return SerialNumberUtil.getSerialNumber("dmidecode |grep 'Serial Number'", "Serial Number", ":");
- }
+package com.zy.asrs.wms.system.license.entity.license;
+
+import java.net.InetAddress;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鐢ㄤ簬鑾峰彇瀹㈡埛Windows鏈嶅姟鍣ㄧ殑鍩烘湰淇℃伅
+ */
+public class LinuxServerInfos 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 {
+ return SerialNumberUtil.getSerialNumber("dmidecode -t processor | grep 'ID'", "ID", ":");
+ }
+
+ @Override
+ protected String getMainBoardSerial() throws Exception {
+ return SerialNumberUtil.getSerialNumber("dmidecode |grep 'Serial Number'", "Serial Number", ":");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1