Showing
6 changed files
with
16 additions
and
0 deletions
| @@ -137,6 +137,9 @@ public class GetBuyoutAccountOrderBo { | @@ -137,6 +137,9 @@ public class GetBuyoutAccountOrderBo { | ||
| 137 | @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) | 137 | @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) |
| 138 | private LocalDateTime createTime; | 138 | private LocalDateTime createTime; |
| 139 | 139 | ||
| 140 | + @ApiModelProperty("是否作废") | ||
| 141 | + private Boolean deleted; | ||
| 142 | + | ||
| 140 | @ApiModelProperty("明细数据") | 143 | @ApiModelProperty("明细数据") |
| 141 | private List<LineBo> lines = new ArrayList<>(); | 144 | private List<LineBo> lines = new ArrayList<>(); |
| 142 | 145 |
| @@ -127,6 +127,9 @@ public class GetProcurementAssayReportBo extends BaseBo<ProcurementAssayReport> | @@ -127,6 +127,9 @@ public class GetProcurementAssayReportBo extends BaseBo<ProcurementAssayReport> | ||
| 127 | @ApiModelProperty("创建人ID") | 127 | @ApiModelProperty("创建人ID") |
| 128 | private String createById; | 128 | private String createById; |
| 129 | 129 | ||
| 130 | + @ApiModelProperty("是否作废") | ||
| 131 | + private Boolean deleted; | ||
| 132 | + | ||
| 130 | @ApiModelProperty("创建时间") | 133 | @ApiModelProperty("创建时间") |
| 131 | @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) | 134 | @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) |
| 132 | private LocalDateTime createTime; | 135 | private LocalDateTime createTime; |
| @@ -114,6 +114,9 @@ public class GetProcurementMaterialSettleDetailBo extends BaseBo<ProcurementMate | @@ -114,6 +114,9 @@ public class GetProcurementMaterialSettleDetailBo extends BaseBo<ProcurementMate | ||
| 114 | @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) | 114 | @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) |
| 115 | private LocalDateTime createTime; | 115 | private LocalDateTime createTime; |
| 116 | 116 | ||
| 117 | + @ApiModelProperty("是否作废") | ||
| 118 | + private Boolean deleted; | ||
| 119 | + | ||
| 117 | public GetProcurementMaterialSettleDetailBo() { | 120 | public GetProcurementMaterialSettleDetailBo() { |
| 118 | super(); | 121 | super(); |
| 119 | } | 122 | } |
| @@ -145,6 +145,9 @@ public class GetWarehouseReceiveOrderBo { | @@ -145,6 +145,9 @@ public class GetWarehouseReceiveOrderBo { | ||
| 145 | @ApiModelProperty("两日价格均差超过800提示(true=红色提醒)") | 145 | @ApiModelProperty("两日价格均差超过800提示(true=红色提醒)") |
| 146 | private Boolean priceWarn; | 146 | private Boolean priceWarn; |
| 147 | 147 | ||
| 148 | + @ApiModelProperty("是否作废") | ||
| 149 | + private Boolean deleted; | ||
| 150 | + | ||
| 148 | @ApiModelProperty("明细数据") | 151 | @ApiModelProperty("明细数据") |
| 149 | private List<LineBo> lines = new ArrayList<>(); | 152 | private List<LineBo> lines = new ArrayList<>(); |
| 150 | 153 |
| @@ -31,6 +31,7 @@ | @@ -31,6 +31,7 @@ | ||
| 31 | <result column="approval_status" property="approvalStatus"/> | 31 | <result column="approval_status" property="approvalStatus"/> |
| 32 | <result column="plan_codes" property="planCodes"/> | 32 | <result column="plan_codes" property="planCodes"/> |
| 33 | <result column="plan_ids" property="planIds"/> | 33 | <result column="plan_ids" property="planIds"/> |
| 34 | + <result column="deleted" property="deleted"/> | ||
| 34 | <result column="create_by_id" property="createById"/> | 35 | <result column="create_by_id" property="createById"/> |
| 35 | <result column="create_by" property="createBy"/> | 36 | <result column="create_by" property="createBy"/> |
| 36 | <result column="update_by_id" property="updateById"/> | 37 | <result column="update_by_id" property="updateById"/> |
| @@ -75,6 +76,7 @@ | @@ -75,6 +76,7 @@ | ||
| 75 | FROM procurement_weighing_ticket_plan pwtpi | 76 | FROM procurement_weighing_ticket_plan pwtpi |
| 76 | WHERE pwtpi.weighing_ticket_id = tb.weighing_ticket_id | 77 | WHERE pwtpi.weighing_ticket_id = tb.weighing_ticket_id |
| 77 | ) AS plan_ids, | 78 | ) AS plan_ids, |
| 79 | + tb.deleted, | ||
| 78 | tb.create_by_id, | 80 | tb.create_by_id, |
| 79 | tb.create_by, | 81 | tb.create_by, |
| 80 | tb.update_by_id, | 82 | tb.update_by_id, |
| @@ -34,6 +34,7 @@ | @@ -34,6 +34,7 @@ | ||
| 34 | <result column="zjl_name" property="zjlName"/> | 34 | <result column="zjl_name" property="zjlName"/> |
| 35 | <result column="zjl_opinion" property="zjlOpinion"/> | 35 | <result column="zjl_opinion" property="zjlOpinion"/> |
| 36 | <result column="flow_node" property="flowNode"/> | 36 | <result column="flow_node" property="flowNode"/> |
| 37 | + <result column="deleted" property="deleted"/> | ||
| 37 | <result column="approval_status" property="approvalStatus"/> | 38 | <result column="approval_status" property="approvalStatus"/> |
| 38 | <result column="create_by_id" property="createById"/> | 39 | <result column="create_by_id" property="createById"/> |
| 39 | <result column="create_by" property="createBy"/> | 40 | <result column="create_by" property="createBy"/> |
| @@ -76,6 +77,7 @@ | @@ -76,6 +77,7 @@ | ||
| 76 | tb.zjl_name, | 77 | tb.zjl_name, |
| 77 | tb.zjl_opinion, | 78 | tb.zjl_opinion, |
| 78 | tb.flow_node, | 79 | tb.flow_node, |
| 80 | + tb.deleted, | ||
| 79 | tb.approval_status, | 81 | tb.approval_status, |
| 80 | tb.create_by_id, | 82 | tb.create_by_id, |
| 81 | tb.create_by, | 83 | tb.create_by, |