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/LicenseCreatorParam.java | 192 ++++++++++++++++++++++++------------------------ 1 files changed, 96 insertions(+), 96 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java index da5477f..75c04c9 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java @@ -1,96 +1,96 @@ -package com.zy.asrs.wms.system.license.entity.license; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * License鐢熸垚绫婚渶瑕佺殑鍙傛暟 - */ -@Data -public class LicenseCreatorParam implements Serializable { - - private static final long serialVersionUID = -7793154252684580872L; - /** - * 璇佷功subject - */ - private String subject; - - /** - * 瀵嗛挜鍒О - */ - private String privateAlias; - - /** - * 瀵嗛挜瀵嗙爜锛堥渶瑕佸Ε鍠勪繚绠★紝涓嶈兘璁╀娇鐢ㄨ�呯煡閬擄級 - */ - private String keyPass; - - /** - * 璁块棶绉橀挜搴撶殑瀵嗙爜 - */ - private String storePass; - - /** - * 璇佷功鐢熸垚璺緞 - */ - private String licensePath; - - /** - * 瀵嗛挜搴撳瓨鍌ㄨ矾寰� - */ - private String privateKeysStorePath; - - /** - * 璇佷功鐢熸晥鏃堕棿 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date issuedTime = new Date(); - - /** - * 璇佷功澶辨晥鏃堕棿 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date expiryTime; - - /** - * 鐢ㄦ埛绫诲瀷 - */ - private String consumerType = "user"; - - /** - * 鐢ㄦ埛鏁伴噺 - */ - private Integer consumerAmount = 1; - - /** - * 鎻忚堪淇℃伅 - */ - private String description = ""; - - /** - * 棰濆鐨勬湇鍔″櫒纭欢鏍¢獙淇℃伅 - */ - private LicenseCheck licenseCheck; - - @Override - public String toString() { - return "LicenseCreatorParam{" + - "subject='" + subject + '\'' + - ", privateAlias='" + privateAlias + '\'' + - ", keyPass='" + keyPass + '\'' + - ", storePass='" + storePass + '\'' + - ", licensePath='" + licensePath + '\'' + - ", privateKeysStorePath='" + privateKeysStorePath + '\'' + - ", issuedTime=" + issuedTime + - ", expiryTime=" + expiryTime + - ", consumerType='" + consumerType + '\'' + - ", consumerAmount=" + consumerAmount + - ", description='" + description + '\'' + - ", licenseCheck=" + licenseCheck + - '}'; - } - -} +package com.zy.asrs.wms.system.license.entity.license; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * License鐢熸垚绫婚渶瑕佺殑鍙傛暟 + */ +@Data +public class LicenseCreatorParam implements Serializable { + + private static final long serialVersionUID = -7793154252684580872L; + /** + * 璇佷功subject + */ + private String subject; + + /** + * 瀵嗛挜鍒О + */ + private String privateAlias; + + /** + * 瀵嗛挜瀵嗙爜锛堥渶瑕佸Ε鍠勪繚绠★紝涓嶈兘璁╀娇鐢ㄨ�呯煡閬擄級 + */ + private String keyPass; + + /** + * 璁块棶绉橀挜搴撶殑瀵嗙爜 + */ + private String storePass; + + /** + * 璇佷功鐢熸垚璺緞 + */ + private String licensePath; + + /** + * 瀵嗛挜搴撳瓨鍌ㄨ矾寰� + */ + private String privateKeysStorePath; + + /** + * 璇佷功鐢熸晥鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date issuedTime = new Date(); + + /** + * 璇佷功澶辨晥鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date expiryTime; + + /** + * 鐢ㄦ埛绫诲瀷 + */ + private String consumerType = "user"; + + /** + * 鐢ㄦ埛鏁伴噺 + */ + private Integer consumerAmount = 1; + + /** + * 鎻忚堪淇℃伅 + */ + private String description = ""; + + /** + * 棰濆鐨勬湇鍔″櫒纭欢鏍¢獙淇℃伅 + */ + private LicenseCheck licenseCheck; + + @Override + public String toString() { + return "LicenseCreatorParam{" + + "subject='" + subject + '\'' + + ", privateAlias='" + privateAlias + '\'' + + ", keyPass='" + keyPass + '\'' + + ", storePass='" + storePass + '\'' + + ", licensePath='" + licensePath + '\'' + + ", privateKeysStorePath='" + privateKeysStorePath + '\'' + + ", issuedTime=" + issuedTime + + ", expiryTime=" + expiryTime + + ", consumerType='" + consumerType + '\'' + + ", consumerAmount=" + consumerAmount + + ", description='" + description + '\'' + + ", licenseCheck=" + licenseCheck + + '}'; + } + +} -- Gitblit v1.9.1