朱园亮 / xingyun-erp · Commits

Commit 04ee3cdef696c004c0ef79cf2c28f61ef7a2d905

Authored by 房远帅
1 parent 875480d2

采购计划：采购主计划分配分厂

Inline Side-by-side
Showing 8 changed files with 55 additions and 4 deletions
@@ -1927,6 +1927,7 @@ CREATE TABLE `procurement_plan` @@ -1927,6 +1927,7 @@ CREATE TABLE `procurement_plan`
1927 `process_node` varchar(50) DEFAULT NULL COMMENT '流程节点', 1927 `process_node` varchar(50) DEFAULT NULL COMMENT '流程节点',
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 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID', 1931 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID',
1931 `create_by` varchar(64) DEFAULT NULL COMMENT '创建人', 1932 `create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
1932 `update_by_id` varchar(32) DEFAULT NULL COMMENT '更新人ID', 1933 `update_by_id` varchar(32) DEFAULT NULL COMMENT '更新人ID',
@@ -1941,7 +1942,8 @@ CREATE TABLE `procurement_plan` @@ -1941,7 +1942,8 @@ CREATE TABLE `procurement_plan`
1941 KEY `idx_pp_quoter_id` (`quoter_id`), 1942 KEY `idx_pp_quoter_id` (`quoter_id`),
1942 KEY `idx_pp_create_time` (`create_time`), 1943 KEY `idx_pp_create_time` (`create_time`),
1943 KEY `idx_pp_process_status` (`process_status`), 1944 KEY `idx_pp_process_status` (`process_status`),
1944 - KEY `idx_pp_process_node` (`process_node`) 1945 + KEY `idx_pp_process_node` (`process_node`),
  1946 + KEY `idx_pp_workshop_id` (`workshop_id`)
1945 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='采购计划主表'; 1947 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='采购计划主表';
1946 1948
1947 CREATE TABLE `procurement_plan_line` 1949 CREATE TABLE `procurement_plan_line`
@@ -327,6 +327,24 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> { @@ -327,6 +327,24 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
327 private String processNode; 327 private String processNode;
328 328
329 /** 329 /**
  330 + * 是否冻结 0否 1是
  331 + */
  332 + @ApiModelProperty("是否冻结 0否 1是")
  333 + private Boolean frozen;
  334 +
  335 + /**
  336 + * 计划类型 正常 补单 变更 补单+变更
  337 + */
  338 + @ApiModelProperty("计划类型 正常 补单 变更 补单+变更")
  339 + private String planType;
  340 +
  341 + /**
  342 + * 分厂ID
  343 + */
  344 + @ApiModelProperty("分厂ID")
  345 + private String workshopId;
  346 +
  347 + /**
330 * 创建人ID 348 * 创建人ID
331 */ 349 */
332 @ApiModelProperty("创建人ID") 350 @ApiModelProperty("创建人ID")
@@ -278,11 +278,16 @@ public class ProcurementPlan extends BaseEntity implements BaseDto { @@ -278,11 +278,16 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
278 private Boolean frozen; 278 private Boolean frozen;
279 279
280 /** 280 /**
281 - * 计划类型 补单 变更 补单+变更 281 + * 计划类型 正常 补单 变更 补单+变更
282 */ 282 */
283 private String planType; 283 private String planType;
284 284
285 /** 285 /**
  286 + * 分厂ID
  287 + */
  288 + private String workshopId;
  289 +
  290 + /**
286 * 创建人ID 291 * 创建人ID
287 */ 292 */
288 @TableField(fill = FieldFill.INSERT) 293 @TableField(fill = FieldFill.INSERT)
@@ -299,6 +299,7 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla @@ -299,6 +299,7 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
299 LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class) 299 LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
300 .set(ProcurementPlan::getProcessNode, "GYGLKZG") 300 .set(ProcurementPlan::getProcessNode, "GYGLKZG")
301 .set(ProcurementPlan::getProcessStatus, "TO_SUBMIT_REVIEW") 301 .set(ProcurementPlan::getProcessStatus, "TO_SUBMIT_REVIEW")
  302 + .set(ProcurementPlan::getWorkshopId, allLines.get(0).getWorkshopId())
302 .eq(ProcurementPlan::getId, id); 303 .eq(ProcurementPlan::getId, id);
303 getBaseMapper().update(updateWrapper); 304 getBaseMapper().update(updateWrapper);
304 //todo 生成买断操作申请单 305 //todo 生成买断操作申请单
@@ -326,6 +327,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla @@ -326,6 +327,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
326 subVo.setParentId(mainPlan.getId()); 327 subVo.setParentId(mainPlan.getId());
327 subVo.setProcessStatus("TO_SUBMIT_REVIEW"); 328 subVo.setProcessStatus("TO_SUBMIT_REVIEW");
328 subVo.setProcessNode("GYGLKZG"); 329 subVo.setProcessNode("GYGLKZG");
  330 + // 子计划的分厂就是当前组的明细分厂（同组内 workshopId 一样），直接赋值
  331 + subVo.setWorkshopId(CollectionUtil.isNotEmpty(factoryLines) ? factoryLines.get(0).getWorkshopId() : null);
329 332
330 // 子明细：只保留当前分厂，workshopId 保持原明细的，其它字段按原明细 copy 333 // 子明细：只保留当前分厂，workshopId 保持原明细的，其它字段按原明细 copy
331 List<ProcurementPlanLineVo> subLineVoList = new ArrayList<>(); 334 List<ProcurementPlanLineVo> subLineVoList = new ArrayList<>();
@@ -318,8 +318,14 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable { @@ -318,8 +318,14 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable {
318 /** 318 /**
319 * 计划类型 正常 补单 变更 补单+变更 319 * 计划类型 正常 补单 变更 补单+变更
320 */ 320 */
321 - @ApiModelProperty("计划类型 补单 变更 补单+变更")  
322 - private String planType; 321 + @ApiModelProperty("计划类型 正常 补单 变更 补单+变更")
  322 + private String planType = "正常";
  323 +
  324 + /**
  325 + * 分厂ID
  326 + */
  327 + @ApiModelProperty("分厂ID")
  328 + private String workshopId;
323 329
324 /** 330 /**
325 * 明细信息 331 * 明细信息
@@ -81,4 +81,10 @@ public class QueryProcurementPlanVo extends SortPageVo { @@ -81,4 +81,10 @@ public class QueryProcurementPlanVo extends SortPageVo {
81 */ 81 */
82 @ApiModelProperty("计划类型：补、变、补 变") 82 @ApiModelProperty("计划类型：补、变、补 变")
83 private String planType; 83 private String planType;
  84 +
  85 + /**
  86 + * 分厂ID
  87 + */
  88 + @ApiModelProperty("分厂ID")
  89 + private String workshopId;
84 } 90 }
@@ -323,6 +323,12 @@ public class UpdateProcurementPlanVo implements BaseVo, Serializable { @@ -323,6 +323,12 @@ public class UpdateProcurementPlanVo implements BaseVo, Serializable {
323 private String planType; 323 private String planType;
324 324
325 /** 325 /**
  326 + * 分厂ID
  327 + */
  328 + @ApiModelProperty("分厂ID")
  329 + private String workshopId;
  330 +
  331 + /**
326 * 明细信息 332 * 明细信息
327 */ 333 */
328 @ApiModelProperty(value = "明细信息", required = true) 334 @ApiModelProperty(value = "明细信息", required = true)
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
55 <result column="process_node" property="processNode"/> 55 <result column="process_node" property="processNode"/>
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="create_by_id" property="createById"/> 59 <result column="create_by_id" property="createById"/>
59 <result column="create_by" property="createBy"/> 60 <result column="create_by" property="createBy"/>
60 <result column="update_by_id" property="updateById"/> 61 <result column="update_by_id" property="updateById"/>
@@ -117,6 +118,7 @@ @@ -117,6 +118,7 @@
117 pp.process_node, 118 pp.process_node,
118 pp.frozen, 119 pp.frozen,
119 pp.plan_type, 120 pp.plan_type,
  121 + pp.workshop_id,
120 pp.create_by_id, 122 pp.create_by_id,
121 pp.create_by, 123 pp.create_by,
122 pp.update_by_id, 124 pp.update_by_id,
@@ -175,6 +177,9 @@ @@ -175,6 +177,9 @@
175 <if test="vo.planType != null and vo.planType != ''"> 177 <if test="vo.planType != null and vo.planType != ''">
176 AND pp.plan_type LIKE CONCAT('%', #{vo.planType}, '%') 178 AND pp.plan_type LIKE CONCAT('%', #{vo.planType}, '%')
177 </if> 179 </if>
  180 + <if test="vo.workshopId != null and vo.workshopId != ''">
  181 + AND pp.workshop_id = #{vo.workshopId}
  182 + </if>
178 </if> 183 </if>
179 </where> 184 </where>
180 ORDER BY pp.create_time DESC 185 ORDER BY pp.create_time DESC