diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/entity/ElectronicSignature.java b/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/entity/ElectronicSignature.java index 2b871784b..65c987164 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/entity/ElectronicSignature.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/entity/ElectronicSignature.java @@ -45,7 +45,7 @@ public class ElectronicSignature extends BaseVOEntity { @ApiModelProperty("签名备注") private String signatureRemark; - @ApiModelProperty("签名方式:1-电子签名 2-附件上传 3-扫二维码 4-系统自动") + @ApiModelProperty("签名方式:1-扫描二维码 2-电子签名 3-打印手写签名 4-超时自动签名") private Integer signatureMode; @ApiModelProperty("组织ID") @@ -68,4 +68,4 @@ public class ElectronicSignature extends BaseVOEntity { @ApiModelProperty("备注") private String remark; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureBatchSignDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureBatchSignDTO.java index deaed38ca..4f99415b8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureBatchSignDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureBatchSignDTO.java @@ -25,6 +25,6 @@ public class ElectronicSignatureBatchSignDTO { @ApiModelProperty("签名备注") private String signatureRemark; - @ApiModelProperty("签名方式:1-电子签名 2-附件上传 3-扫二维码 4-系统自动") + @ApiModelProperty("签名方式:1-扫描二维码 2-电子签名 3-打印手写签名 4-超时自动签名") private Integer signatureMode; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureQueryDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureQueryDTO.java index 9abef62cb..54c33b6de 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureQueryDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureQueryDTO.java @@ -22,7 +22,7 @@ public class ElectronicSignatureQueryDTO { @ApiModelProperty("签名状态:1-待签名 2-已签名") private Integer signatureStatus; - @ApiModelProperty("签名方式:1-电子签名 2-附件上传 3-扫二维码 4-系统自动") + @ApiModelProperty("签名方式:1-扫描二维码 2-电子签名 3-打印手写签名 4-超时自动签名") private Integer signatureMode; @ApiModelProperty("组织ID") @@ -52,4 +52,4 @@ public class ElectronicSignatureQueryDTO { @ApiModelProperty("每页条数") private Integer pageSize; -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureVO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureVO.java index 626cb7543..147e1bb73 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureVO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/electronicSignature/ElectronicSignatureVO.java @@ -45,7 +45,7 @@ public class ElectronicSignatureVO { @ApiModelProperty("签名备注") private String signatureRemark; - @ApiModelProperty("签名方式:1-电子签名 2-附件上传 3-扫二维码 4-系统自动") + @ApiModelProperty("签名方式:1-扫描二维码 2-电子签名 3-打印手写签名 4-超时自动签名") private Integer signatureMode; @ApiModelProperty("签名方式名称") @@ -124,4 +124,4 @@ public class ElectronicSignatureVO { @ApiModelProperty("库位名称") private String storageLocationName; } -} +} \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java index 31842f80e..2415cf6ed 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java @@ -215,10 +215,10 @@ public class ElectronicSignatureApi extends BaseController { // 签名方式名称 if (entity.getSignatureMode() != null) { switch (entity.getSignatureMode()) { - case 1: vo.setSignatureModeName("电子签名"); break; - case 2: vo.setSignatureModeName("附件上传"); break; - case 3: vo.setSignatureModeName("扫二维码"); break; - case 4: vo.setSignatureModeName("系统自动"); break; + case 1: vo.setSignatureModeName("扫描二维码"); break; + case 2: vo.setSignatureModeName("电子签名"); break; + case 3: vo.setSignatureModeName("打印手写签名"); break; + case 4: vo.setSignatureModeName("超时自动签名"); break; default: break; } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/signature/BatchSignatureDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/signature/BatchSignatureDTO.java index 18fb841b4..39be83601 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/signature/BatchSignatureDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/signature/BatchSignatureDTO.java @@ -39,6 +39,6 @@ public class BatchSignatureDTO { @ApiModelProperty("签名备注") private String signatureRemark; - @ApiModelProperty("签名方式:1-电子签名 2-附件上传 3-扫二维码 4-系统自动") + @ApiModelProperty("签名方式:1-扫描二维码 2-电子签名 3-打印手写签名 4-超时自动签名") private Integer signatureMode; -} +} \ No newline at end of file