Commit 94a5d55782a8f517a7539d2ba746b270c8652dbf

Authored by 房远帅
1 parent cf703186

采购计划:上传附件

@@ -1928,6 +1928,8 @@ CREATE TABLE `procurement_plan` @@ -1928,6 +1928,8 @@ CREATE TABLE `procurement_plan`
1928 `frozen` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否冻结 0否 1是', 1928 `frozen` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否冻结 0否 1是',
1929 `plan_type` varchar(50) DEFAULT NULL COMMENT '计划类型: 补、变、补 变', 1929 `plan_type` varchar(50) DEFAULT NULL COMMENT '计划类型: 补、变、补 变',
1930 `workshop_id` varchar(50) DEFAULT NULL COMMENT '分厂ID', 1930 `workshop_id` varchar(50) DEFAULT NULL COMMENT '分厂ID',
  1931 + `attachment_file_ids` text DEFAULT NULL COMMENT '附件文件ID集合',
  1932 + `attachment_file_names` text DEFAULT NULL COMMENT '附件文件名称集合',
1931 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID', 1933 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID',
1932 `create_by` varchar(64) DEFAULT NULL COMMENT '创建人', 1934 `create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
1933 `update_by_id` varchar(32) DEFAULT NULL COMMENT '更新人ID', 1935 `update_by_id` varchar(32) DEFAULT NULL COMMENT '更新人ID',
@@ -345,6 +345,18 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> { @@ -345,6 +345,18 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
345 private String workshopId; 345 private String workshopId;
346 346
347 /** 347 /**
  348 + * 附件文件ID集合
  349 + */
  350 + @ApiModelProperty("附件文件ID集合")
  351 + private String attachmentFileIds;
  352 +
  353 + /**
  354 + * 附件文件名称集合
  355 + */
  356 + @ApiModelProperty("附件文件名称集合")
  357 + private String attachmentFileNames;
  358 +
  359 + /**
348 * 创建人ID 360 * 创建人ID
349 */ 361 */
350 @ApiModelProperty("创建人ID") 362 @ApiModelProperty("创建人ID")
@@ -94,8 +94,8 @@ public class ProcurementPlanController extends DefaultBaseController { @@ -94,8 +94,8 @@ public class ProcurementPlanController extends DefaultBaseController {
94 /** 94 /**
95 * 修改 95 * 修改
96 */ 96 */
97 - @ApiOperation("修改/选择分厂")  
98 - @HasPermission({"plan-manage:domestic-plan:supple","plan-manage:domestic-plan:split"}) 97 + @ApiOperation("修改/选择分厂/上传附件")
  98 + @HasPermission({"plan-manage:domestic-plan:supple", "plan-manage:domestic-plan:split", "plan-manage:domestic-plan:upload"})
99 @PutMapping 99 @PutMapping
100 public InvokeResult<Void> update(@RequestBody @Valid UpdateProcurementPlanVo vo) { 100 public InvokeResult<Void> update(@RequestBody @Valid UpdateProcurementPlanVo vo) {
101 101
@@ -288,6 +288,16 @@ public class ProcurementPlan extends BaseEntity implements BaseDto { @@ -288,6 +288,16 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
288 private String workshopId; 288 private String workshopId;
289 289
290 /** 290 /**
  291 + * 附件文件ID集合
  292 + */
  293 + private String attachmentFileIds;
  294 +
  295 + /**
  296 + * 附件文件名称集合
  297 + */
  298 + private String attachmentFileNames;
  299 +
  300 + /**
291 * 创建人ID 301 * 创建人ID
292 */ 302 */
293 @TableField(fill = FieldFill.INSERT) 303 @TableField(fill = FieldFill.INSERT)
@@ -329,6 +329,18 @@ public class UpdateProcurementPlanVo implements BaseVo, Serializable { @@ -329,6 +329,18 @@ public class UpdateProcurementPlanVo implements BaseVo, Serializable {
329 private String workshopId; 329 private String workshopId;
330 330
331 /** 331 /**
  332 + * 附件文件ID集合
  333 + */
  334 + @ApiModelProperty("附件文件ID集合")
  335 + private String attachmentFileIds;
  336 +
  337 + /**
  338 + * 附件文件名称集合
  339 + */
  340 + @ApiModelProperty("附件文件名称集合")
  341 + private String attachmentFileNames;
  342 +
  343 + /**
332 * 明细信息 344 * 明细信息
333 */ 345 */
334 @ApiModelProperty(value = "明细信息", required = true) 346 @ApiModelProperty(value = "明细信息", required = true)
@@ -56,6 +56,8 @@ @@ -56,6 +56,8 @@
56 <result column="frozen" property="frozen"/> 56 <result column="frozen" property="frozen"/>
57 <result column="plan_type" property="planType"/> 57 <result column="plan_type" property="planType"/>
58 <result column="workshop_id" property="workshopId"/> 58 <result column="workshop_id" property="workshopId"/>
  59 + <result column="attachment_file_ids" property="attachmentFileIds"/>
  60 + <result column="attachment_file_names" property="attachmentFileNames"/>
59 <result column="create_by_id" property="createById"/> 61 <result column="create_by_id" property="createById"/>
60 <result column="create_by" property="createBy"/> 62 <result column="create_by" property="createBy"/>
61 <result column="update_by_id" property="updateById"/> 63 <result column="update_by_id" property="updateById"/>
@@ -119,6 +121,8 @@ @@ -119,6 +121,8 @@
119 pp.frozen, 121 pp.frozen,
120 pp.plan_type, 122 pp.plan_type,
121 pp.workshop_id, 123 pp.workshop_id,
  124 + pp.attachment_file_ids,
  125 + pp.attachment_file_names,
122 pp.create_by_id, 126 pp.create_by_id,
123 pp.create_by, 127 pp.create_by,
124 pp.update_by_id, 128 pp.update_by_id,