朱园亮 / xingyun-erp · Commits

Commit 4c41c34004abd54d7c7ca5047878f5dd420e8959

Authored by 房远帅
1 parent 14fccbb6

采购计划：建立计划和报价的关联

Inline Side-by-side
Showing 9 changed files with 47 additions and 1 deletions
@@ -1928,6 +1928,7 @@ CREATE TABLE `procurement_plan` @@ -1928,6 +1928,7 @@ 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 + `salesman_quotation_id` varchar(32) DEFAULT NULL COMMENT '关联业务员报价单ID',
1931 `attachment_file_ids` text DEFAULT NULL COMMENT '附件文件ID集合', 1932 `attachment_file_ids` text DEFAULT NULL COMMENT '附件文件ID集合',
1932 `attachment_file_names` text DEFAULT NULL COMMENT '附件文件名称集合', 1933 `attachment_file_names` text DEFAULT NULL COMMENT '附件文件名称集合',
1933 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID', 1934 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID',
@@ -1945,7 +1946,8 @@ CREATE TABLE `procurement_plan` @@ -1945,7 +1946,8 @@ CREATE TABLE `procurement_plan`
1945 KEY `idx_pp_create_time` (`create_time`), 1946 KEY `idx_pp_create_time` (`create_time`),
1946 KEY `idx_pp_process_status` (`process_status`), 1947 KEY `idx_pp_process_status` (`process_status`),
1947 KEY `idx_pp_process_node` (`process_node`), 1948 KEY `idx_pp_process_node` (`process_node`),
1948 - KEY `idx_pp_workshop_id` (`workshop_id`) 1949 + KEY `idx_pp_workshop_id` (`workshop_id`),
  1950 + KEY `idx_pp_salesman_quotation_id` (`salesman_quotation_id`)
1949 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='采购计划主表'; 1951 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='采购计划主表';
1950 1952
1951 CREATE TABLE `procurement_plan_line` 1953 CREATE TABLE `procurement_plan_line`
@@ -1961,6 +1963,7 @@ CREATE TABLE `procurement_plan_line` @@ -1961,6 +1963,7 @@ CREATE TABLE `procurement_plan_line`
1961 `coordination_range` decimal(18, 10) DEFAULT NULL COMMENT '协调幅度', 1963 `coordination_range` decimal(18, 10) DEFAULT NULL COMMENT '协调幅度',
1962 `estimated_loss` decimal(18, 10) DEFAULT NULL COMMENT '买断料预计损耗', 1964 `estimated_loss` decimal(18, 10) DEFAULT NULL COMMENT '买断料预计损耗',
1963 `application_attrition` decimal(18, 10) DEFAULT NULL COMMENT '申请损耗(%)', 1965 `application_attrition` decimal(18, 10) DEFAULT NULL COMMENT '申请损耗(%)',
  1966 + `paint_damage_ratio` decimal(18, 10) DEFAULT NULL COMMENT '漆损率(%)',
1964 `workshop_id` varchar(50) DEFAULT NULL COMMENT '分厂', 1967 `workshop_id` varchar(50) DEFAULT NULL COMMENT '分厂',
1965 `item_id` varchar(32) NOT NULL COMMENT '前端行标识', 1968 `item_id` varchar(32) NOT NULL COMMENT '前端行标识',
1966 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID', 1969 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID',
@@ -345,6 +345,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> { @@ -345,6 +345,12 @@ 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 salesmanQuotationId;
  352 +
  353 + /**
348 * 附件文件ID集合 354 * 附件文件ID集合
349 */ 355 */
350 @ApiModelProperty("附件文件ID集合") 356 @ApiModelProperty("附件文件ID集合")
@@ -495,6 +501,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> { @@ -495,6 +501,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
495 private BigDecimal applicationAttrition; 501 private BigDecimal applicationAttrition;
496 502
497 /** 503 /**
  504 + * 漆损率(%)
  505 + */
  506 + @ApiModelProperty("漆损率(%)")
  507 + private BigDecimal paintDamageRatio;
  508 +
  509 + /**
498 * 分厂 510 * 分厂
499 */ 511 */
500 @ApiModelProperty("分厂") 512 @ApiModelProperty("分厂")
@@ -288,6 +288,11 @@ public class ProcurementPlan extends BaseEntity implements BaseDto { @@ -288,6 +288,11 @@ 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 salesmanQuotationId;
  294 +
  295 + /**
291 * 附件文件ID集合 296 * 附件文件ID集合
292 */ 297 */
293 private String attachmentFileIds; 298 private String attachmentFileIds;
@@ -72,6 +72,11 @@ public class ProcurementPlanLine extends BaseEntity implements BaseDto { @@ -72,6 +72,11 @@ public class ProcurementPlanLine extends BaseEntity implements BaseDto {
72 private BigDecimal applicationAttrition; 72 private BigDecimal applicationAttrition;
73 73
74 /** 74 /**
  75 + * 漆损率(%)
  76 + */
  77 + private BigDecimal paintDamageRatio;
  78 +
  79 + /**
75 * 分厂 80 * 分厂
76 */ 81 */
77 private String workshopId; 82 private String workshopId;
@@ -771,6 +771,8 @@ public class SalesmanQuotationServiceImpl @@ -771,6 +771,8 @@ public class SalesmanQuotationServiceImpl
771 vo.setMaterialConditionPhosphorCopper(normalizeMaterialText(enabled, salesmanQuotation.getMaterialConditionPhosphorCopper())); 771 vo.setMaterialConditionPhosphorCopper(normalizeMaterialText(enabled, salesmanQuotation.getMaterialConditionPhosphorCopper()));
772 vo.setProcessStatus("TO_SUPPLEMENT"); 772 vo.setProcessStatus("TO_SUPPLEMENT");
773 vo.setProcessNode("GYGLKJHGLY"); 773 vo.setProcessNode("GYGLKJHGLY");
  774 + // 关联业务员报价单ID（生成计划时关联回写，可反向溯源）
  775 + vo.setSalesmanQuotationId(id);
774 776
775 // 明细行：按报价明细逐行带入 777 // 明细行：按报价明细逐行带入
776 List<ProcurementPlanLineVo> lineVoList = new ArrayList<>(); 778 List<ProcurementPlanLineVo> lineVoList = new ArrayList<>();
@@ -808,6 +810,8 @@ public class SalesmanQuotationServiceImpl @@ -808,6 +810,8 @@ public class SalesmanQuotationServiceImpl
808 } 810 }
809 lineVo.setCoordinationRange(coordinationRange); 811 lineVo.setCoordinationRange(coordinationRange);
810 lineVo.setApplicationAttrition(line.getApplicationAttrition()); 812 lineVo.setApplicationAttrition(line.getApplicationAttrition());
  813 + // 漆损率：从报价明细带过来
  814 + lineVo.setPaintDamageRatio(line.getPaintDamageRatio());
811 lineVo.setItemId(line.getItemId()); 815 lineVo.setItemId(line.getItemId());
812 lineVoList.add(lineVo); 816 lineVoList.add(lineVo);
813 } 817 }
@@ -328,6 +328,12 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable { @@ -328,6 +328,12 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable {
328 private String workshopId; 328 private String workshopId;
329 329
330 /** 330 /**
  331 + * 关联业务员报价单ID
  332 + */
  333 + @ApiModelProperty("关联业务员报价单ID")
  334 + private String salesmanQuotationId;
  335 +
  336 + /**
331 * 明细信息 337 * 明细信息
332 */ 338 */
333 @ApiModelProperty(value = "明细信息", required = true) 339 @ApiModelProperty(value = "明细信息", required = true)
@@ -90,6 +90,13 @@ public class ProcurementPlanLineVo implements BaseVo, Serializable { @@ -90,6 +90,13 @@ public class ProcurementPlanLineVo implements BaseVo, Serializable {
90 private BigDecimal applicationAttrition; 90 private BigDecimal applicationAttrition;
91 91
92 /** 92 /**
  93 + * 漆损率(%)
  94 + */
  95 + @ApiModelProperty("漆损率(%)")
  96 + @Digits(integer = 8, fraction = 10, message = "漆损率最多支持8位整数和10位小数！")
  97 + private BigDecimal paintDamageRatio;
  98 +
  99 + /**
93 * 分厂 100 * 分厂
94 */ 101 */
95 @ApiModelProperty("分厂") 102 @ApiModelProperty("分厂")
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 <result column="coordination_range" property="coordinationRange"/> 14 <result column="coordination_range" property="coordinationRange"/>
15 <result column="estimated_loss" property="estimatedLoss"/> 15 <result column="estimated_loss" property="estimatedLoss"/>
16 <result column="application_attrition" property="applicationAttrition"/> 16 <result column="application_attrition" property="applicationAttrition"/>
  17 + <result column="paint_damage_ratio" property="paintDamageRatio"/>
17 <result column="workshop_id" property="workshopId"/> 18 <result column="workshop_id" property="workshopId"/>
18 <result column="item_id" property="itemId"/> 19 <result column="item_id" property="itemId"/>
19 <result column="create_by_id" property="createById"/> 20 <result column="create_by_id" property="createById"/>
@@ -37,6 +38,7 @@ @@ -37,6 +38,7 @@
37 ppl.coordination_range, 38 ppl.coordination_range,
38 ppl.estimated_loss, 39 ppl.estimated_loss,
39 ppl.application_attrition, 40 ppl.application_attrition,
  41 + ppl.paint_damage_ratio,
40 ppl.workshop_id, 42 ppl.workshop_id,
41 ppl.item_id, 43 ppl.item_id,
42 ppl.create_by_id, 44 ppl.create_by_id,
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
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="salesman_quotation_id" property="salesmanQuotationId"/>
59 <result column="attachment_file_ids" property="attachmentFileIds"/> 60 <result column="attachment_file_ids" property="attachmentFileIds"/>
60 <result column="attachment_file_names" property="attachmentFileNames"/> 61 <result column="attachment_file_names" property="attachmentFileNames"/>
61 <result column="create_by_id" property="createById"/> 62 <result column="create_by_id" property="createById"/>
@@ -121,6 +122,7 @@ @@ -121,6 +122,7 @@
121 pp.frozen, 122 pp.frozen,
122 pp.plan_type, 123 pp.plan_type,
123 pp.workshop_id, 124 pp.workshop_id,
  125 + pp.salesman_quotation_id,
124 pp.attachment_file_ids, 126 pp.attachment_file_ids,
125 pp.attachment_file_names, 127 pp.attachment_file_names,
126 pp.create_by_id, 128 pp.create_by_id,