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/LicenseCreator.java | 170 ++++++++++++++++++++++++++++----------------------------
1 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreator.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreator.java
index 927ddb2..2090af9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreator.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreator.java
@@ -1,86 +1,86 @@
-package com.zy.asrs.wms.system.license.entity.license;
-
-import de.schlichtherle.license.*;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import javax.security.auth.x500.X500Principal;
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.prefs.Preferences;
-
-/**
- * License鐢熸垚绫�
- */
-public class LicenseCreator {
- private static Logger logger = LogManager.getLogger(LicenseCreator.class);
- private final static X500Principal DEFAULT_HOLDER_AND_ISSUER = new X500Principal("CN=localhost, OU=localhost, O=localhost, L=SH, ST=SH, C=CN");
- private LicenseCreatorParam param;
-
- public LicenseCreator(LicenseCreatorParam param) {
- this.param = param;
- }
-
- /**
- * 鐢熸垚License璇佷功
- */
- public boolean generateLicense(){
- try {
- LicenseManager licenseManager = new CustomLicenseManager(initLicenseParam());
- LicenseContent licenseContent = initLicenseContent();
-
- licenseManager.store(licenseContent,new File(param.getLicensePath()));
-
- return true;
- }catch (Exception e){
- logger.error(MessageFormat.format("璇佷功鐢熸垚澶辫触锛歿0}",param),e);
- return false;
- }
- }
-
- /**
- * 鍒濆鍖栬瘉涔︾敓鎴愬弬鏁�
- */
- private LicenseParam initLicenseParam(){
- Preferences preferences = Preferences.userNodeForPackage(LicenseCreator.class);
-
- //璁剧疆瀵硅瘉涔﹀唴瀹瑰姞瀵嗙殑绉橀挜
- CipherParam cipherParam = new DefaultCipherParam(param.getStorePass());
-
- KeyStoreParam privateStoreParam = new CustomKeyStoreParam(LicenseCreator.class
- ,param.getPrivateKeysStorePath()
- ,param.getPrivateAlias()
- ,param.getStorePass()
- ,param.getKeyPass());
-
- LicenseParam licenseParam = new DefaultLicenseParam(param.getSubject()
- ,preferences
- ,privateStoreParam
- ,cipherParam);
-
- return licenseParam;
- }
-
- /**
- * 璁剧疆璇佷功鐢熸垚姝ｆ枃淇℃伅
- */
- private LicenseContent initLicenseContent(){
- LicenseContent licenseContent = new LicenseContent();
- licenseContent.setHolder(DEFAULT_HOLDER_AND_ISSUER);
- licenseContent.setIssuer(DEFAULT_HOLDER_AND_ISSUER);
-
- licenseContent.setSubject(param.getSubject());
- licenseContent.setIssued(param.getIssuedTime());
- licenseContent.setNotBefore(param.getIssuedTime());
- licenseContent.setNotAfter(param.getExpiryTime());
- licenseContent.setConsumerType(param.getConsumerType());
- licenseContent.setConsumerAmount(param.getConsumerAmount());
- licenseContent.setInfo(param.getDescription());
-
- //鎵╁睍鏍￠獙鏈嶅姟鍣ㄧ‖浠朵俊鎭�
- licenseContent.setExtra(param.getLicenseCheck());
-
- return licenseContent;
- }
-
+package com.zy.asrs.wms.system.license.entity.license;
+
+import de.schlichtherle.license.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.security.auth.x500.X500Principal;
+import java.io.File;
+import java.text.MessageFormat;
+import java.util.prefs.Preferences;
+
+/**
+ * License鐢熸垚绫�
+ */
+public class LicenseCreator {
+ private static Logger logger = LogManager.getLogger(LicenseCreator.class);
+ private final static X500Principal DEFAULT_HOLDER_AND_ISSUER = new X500Principal("CN=localhost, OU=localhost, O=localhost, L=SH, ST=SH, C=CN");
+ private LicenseCreatorParam param;
+
+ public LicenseCreator(LicenseCreatorParam param) {
+ this.param = param;
+ }
+
+ /**
+ * 鐢熸垚License璇佷功
+ */
+ public boolean generateLicense(){
+ try {
+ LicenseManager licenseManager = new CustomLicenseManager(initLicenseParam());
+ LicenseContent licenseContent = initLicenseContent();
+
+ licenseManager.store(licenseContent,new File(param.getLicensePath()));
+
+ return true;
+ }catch (Exception e){
+ logger.error(MessageFormat.format("璇佷功鐢熸垚澶辫触锛歿0}",param),e);
+ return false;
+ }
+ }
+
+ /**
+ * 鍒濆鍖栬瘉涔︾敓鎴愬弬鏁�
+ */
+ private LicenseParam initLicenseParam(){
+ Preferences preferences = Preferences.userNodeForPackage(LicenseCreator.class);
+
+ //璁剧疆瀵硅瘉涔﹀唴瀹瑰姞瀵嗙殑绉橀挜
+ CipherParam cipherParam = new DefaultCipherParam(param.getStorePass());
+
+ KeyStoreParam privateStoreParam = new CustomKeyStoreParam(LicenseCreator.class
+ ,param.getPrivateKeysStorePath()
+ ,param.getPrivateAlias()
+ ,param.getStorePass()
+ ,param.getKeyPass());
+
+ LicenseParam licenseParam = new DefaultLicenseParam(param.getSubject()
+ ,preferences
+ ,privateStoreParam
+ ,cipherParam);
+
+ return licenseParam;
+ }
+
+ /**
+ * 璁剧疆璇佷功鐢熸垚姝ｆ枃淇℃伅
+ */
+ private LicenseContent initLicenseContent(){
+ LicenseContent licenseContent = new LicenseContent();
+ licenseContent.setHolder(DEFAULT_HOLDER_AND_ISSUER);
+ licenseContent.setIssuer(DEFAULT_HOLDER_AND_ISSUER);
+
+ licenseContent.setSubject(param.getSubject());
+ licenseContent.setIssued(param.getIssuedTime());
+ licenseContent.setNotBefore(param.getIssuedTime());
+ licenseContent.setNotAfter(param.getExpiryTime());
+ licenseContent.setConsumerType(param.getConsumerType());
+ licenseContent.setConsumerAmount(param.getConsumerAmount());
+ licenseContent.setInfo(param.getDescription());
+
+ //鎵╁睍鏍￠獙鏈嶅姟鍣ㄧ‖浠朵俊鎭�
+ licenseContent.setExtra(param.getLicenseCheck());
+
+ return licenseContent;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1