From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 18 一月 2025 17:06:18 +0800 Subject: [PATCH] # 6. 大屏添加作业类型 (全盘,还是分拣 IOType) 10.平库出库时,当前平库ID是写死在Sql里,需修改 11.平库出库没有判断是否预约出库,且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细,可以再次拣货,拣货明细需添加一个拣货状态 47. 确认发货前,需判断是否已绑定至集货区 48. CTU出库后,库位103不再删除原有库位信息 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/CustomKeyStoreParam.java | 116 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 58 insertions(+), 58 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/CustomKeyStoreParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/CustomKeyStoreParam.java index 44fd97d..67c7ca2 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/CustomKeyStoreParam.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/CustomKeyStoreParam.java @@ -1,58 +1,58 @@ -package com.zy.asrs.wms.system.license.entity.license; - -import de.schlichtherle.license.AbstractKeyStoreParam; - -import java.io.*; - -/** - * 鑷畾涔塊eyStoreParam锛岀敤浜庡皢鍏閽ュ瓨鍌ㄦ枃浠跺瓨鏀惧埌鍏朵粬纾佺洏浣嶇疆鑰屼笉鏄」鐩腑 - */ -public class CustomKeyStoreParam extends AbstractKeyStoreParam { - - /** - * 鍏挜/绉侀挜鍦ㄧ鐩樹笂鐨勫瓨鍌ㄨ矾寰� - */ - private String storePath; - private String alias; - private String storePwd; - private String keyPwd; - - public CustomKeyStoreParam(Class clazz, String resource, String alias, String storePwd, String keyPwd) { - super(clazz, resource); - this.storePath = resource; - this.alias = alias; - this.storePwd = storePwd; - this.keyPwd = keyPwd; - } - - - @Override - public String getAlias() { - return alias; - } - - @Override - public String getStorePwd() { - return storePwd; - } - - @Override - public String getKeyPwd() { - return keyPwd; - } - - /** - * 澶嶅啓de.schlichtherle.license.AbstractKeyStoreParam鐨刧etStream()鏂规硶<br/> - * 鐢ㄤ簬灏嗗叕绉侀挜瀛樺偍鏂囦欢瀛樻斁鍒板叾浠栫鐩樹綅缃�屼笉鏄」鐩腑 - */ - @Override - public InputStream getStream() throws IOException { - final InputStream in = this.getClass().getClassLoader().getResourceAsStream(storePath); -// final InputStream in = new FileInputStream(new File(storePath)); - if (null == in) { - throw new FileNotFoundException(storePath); - } - - return in; - } -} +package com.zy.asrs.wms.system.license.entity.license; + +import de.schlichtherle.license.AbstractKeyStoreParam; + +import java.io.*; + +/** + * 鑷畾涔塊eyStoreParam锛岀敤浜庡皢鍏閽ュ瓨鍌ㄦ枃浠跺瓨鏀惧埌鍏朵粬纾佺洏浣嶇疆鑰屼笉鏄」鐩腑 + */ +public class CustomKeyStoreParam extends AbstractKeyStoreParam { + + /** + * 鍏挜/绉侀挜鍦ㄧ鐩樹笂鐨勫瓨鍌ㄨ矾寰� + */ + private String storePath; + private String alias; + private String storePwd; + private String keyPwd; + + public CustomKeyStoreParam(Class clazz, String resource, String alias, String storePwd, String keyPwd) { + super(clazz, resource); + this.storePath = resource; + this.alias = alias; + this.storePwd = storePwd; + this.keyPwd = keyPwd; + } + + + @Override + public String getAlias() { + return alias; + } + + @Override + public String getStorePwd() { + return storePwd; + } + + @Override + public String getKeyPwd() { + return keyPwd; + } + + /** + * 澶嶅啓de.schlichtherle.license.AbstractKeyStoreParam鐨刧etStream()鏂规硶<br/> + * 鐢ㄤ簬灏嗗叕绉侀挜瀛樺偍鏂囦欢瀛樻斁鍒板叾浠栫鐩樹綅缃�屼笉鏄」鐩腑 + */ + @Override + public InputStream getStream() throws IOException { + final InputStream in = this.getClass().getClassLoader().getResourceAsStream(storePath); +// final InputStream in = new FileInputStream(new File(storePath)); + if (null == in) { + throw new FileNotFoundException(storePath); + } + + return in; + } +} -- Gitblit v1.9.1