diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java
index 434ec0e1e..c5d38f1dc 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java
@@ -773,4 +773,24 @@ public class BusinessDocumentOrder extends BaseVOEntity{
@ApiModelProperty("推送人姓名")
private String pushByName;
+
+ @ApiModelProperty("删改单申请类型:0-改单 1-删除 2-作废")
+ private Integer reviseApplyType;
+
+ @ApiModelProperty("删改单申请状态:0-未申请 1-申请成功 2-申请失败")
+ private Integer reviseApplyStatus;
+
+ @ApiModelProperty("删改单申请人")
+ private String reviseApplyBy;
+
+ @ApiModelProperty("删改单申请人姓名")
+ private String reviseApplyByName;
+
+ @ApiModelProperty("删改单申请原因")
+ private String reviseApplyReason;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("删改单申请时间")
+ private Date reviseApplyTime;
}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
index ccac29933..861817d6f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
@@ -800,4 +800,24 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
@ApiModelProperty("商品类型")
private Integer productType;
+ @ApiModelProperty("删改单申请类型:0-改单 1-删除 2-作废")
+ private Integer reviseApplyType;
+
+ @ApiModelProperty("删改单申请状态:0-未申请 1-申请成功 2-申请失败")
+ private Integer reviseApplyStatus;
+
+ @ApiModelProperty("删改单申请人")
+ private String reviseApplyBy;
+
+ @ApiModelProperty("删改单申请人姓名")
+ private String reviseApplyByName;
+
+ @ApiModelProperty("删改单申请原因")
+ private String reviseApplyReason;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("删改单申请时间")
+ private Date reviseApplyTime;
+
}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
index c27e9f254..ee66a54ea 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
@@ -843,4 +843,25 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeEnd;
+
+ @ApiModelProperty("删改单申请类型:0-改单 1-删除 2-作废")
+ private Integer reviseApplyType;
+
+ @ApiModelProperty("删改单申请状态:0-未申请 1-申请成功 2-申请失败")
+ private Integer reviseApplyStatus;
+
+ @ApiModelProperty("删改单申请人")
+ private String reviseApplyBy;
+
+ @ApiModelProperty("删改单申请人姓名")
+ private String reviseApplyByName;
+
+ @ApiModelProperty("删改单申请原因")
+ private String reviseApplyReason;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("删改单申请时间")
+ private Date reviseApplyTime;
+
}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
index 7279b8a20..2f3e9cb4a 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
@@ -860,4 +860,24 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeEnd;
+
+ @ApiModelProperty("删改单申请类型:0-改单 1-删除 2-作废")
+ private Integer reviseApplyType;
+
+ @ApiModelProperty("删改单申请状态:0-未申请 1-申请成功 2-申请失败")
+ private Integer reviseApplyStatus;
+
+ @ApiModelProperty("删改单申请人")
+ private String reviseApplyBy;
+
+ @ApiModelProperty("删改单申请人姓名")
+ private String reviseApplyByName;
+
+ @ApiModelProperty("删改单申请原因")
+ private String reviseApplyReason;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("删改单申请时间")
+ private Date reviseApplyTime;
}
diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
index bfe739722..fcc87175f 100644
--- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
@@ -175,6 +175,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
@@ -1227,6 +1233,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and IE_TYPE = #{ieType}
+
+ and REVISE_APPLY_TYPE = #{reviseApplyType}
+