Commit a79a53086e31979290ef81426ed6c23906125898

Authored by 房远帅
1 parent 10082e55

采购-入库:原料结算详情单-审核流程

... ... @@ -118,6 +118,12 @@ public GetXxxBo(Xxx dto) {
118 118 **后果**:SQL 运行时才报错(Java 诊断查不出);别名不一致的 SQL 拷贝拼接时极易引入此类错误。
119 119 **正确做法**:任何 XML 的主表(业务单据自身表)统一写 `FROM 表名 AS tb`,SELECT/WHERE/JOIN ON/ORDER BY 全部用 `tb.` 前缀;只有 JOIN 进来的关联表才用有区分度的别名(如 `ws`、`bdcs`、子表 `pwtp`、明细 `pwtl`)。新写 SQL 前先看同目录既有 XML 的别名写法,保持一致。
120 120
  121 +## 20. MP getById 查不出 exist=false 字段;分厂审核单据传实体给流程引擎前必须联表带出 workshopCode
  122 +
  123 +**坑**:分厂相关单据的审核节点编码 = 流程前缀 + 分厂前缀(`base_data_workshop.code`,如 yfc/efc/sfc/ztfc)+ 环节缩写(如 `material_settle_yfcckzg`)。单据实体只有 workshop_id/workshop_name(冗余列),workshopCode 是 `@TableField(exist = false)` 联表字段;`this.getById(id)` 是 MP 单表查询,查出的实体 workshopCode 永远为 null,`startInstance(BPM_FLAG, id, BPM_FLAG, entity)` 传给流程引擎的实体就缺分厂前缀。
  124 +**后果**:流程引擎按分厂前缀路由审核节点/角色(material_settle_yfcckzg 等)时匹配不上,审核流向错误或全部落到无分厂节点。
  125 +**正确做法**:涉及分厂审核的单据(原料结算详情单等)Mapper XML 提供 `findById`(公共片段 `LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id` 带出 `ws.code AS workshop_code`);**提交审核、传实体给流程引擎、以及后续涉及分厂审核路由的取数统一用 `mapper.findById(id)`,不用 `getById`**(参考 `ProcurementMaterialSettleDetailServiceImpl.submit`)。列表查询若要展示编号,同理在列表公共片段里 JOIN 带出。
  126 +
121 127 ---
122 128
123 129 ## 回写模板(新增踩坑时复制)
... ...
... ... @@ -2767,6 +2767,14 @@ CREATE TABLE IF NOT EXISTS `procurement_material_settle_detail`
2767 2767 KEY `idx_pmsd_create_time` (`create_time`)
2768 2768 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='原料结算详情单';
2769 2769
  2770 +-- 原料结算详情单:各审核环节审核人(审核通过时记录)
  2771 +ALTER TABLE procurement_material_settle_detail ADD COLUMN ckzjy_id VARCHAR(32) DEFAULT NULL COMMENT '仓库质检审核人ID(分厂仓库质检员,审核通过时记录)';
  2772 +ALTER TABLE procurement_material_settle_detail ADD COLUMN ckzjy_name VARCHAR(64) DEFAULT NULL COMMENT '仓库质检审核人(分厂仓库质检员,审核通过时记录)';
  2773 +ALTER TABLE procurement_material_settle_detail ADD COLUMN gyglkzjy_id VARCHAR(32) DEFAULT NULL COMMENT '供应管理科质检员审核人ID(审核通过时记录)';
  2774 +ALTER TABLE procurement_material_settle_detail ADD COLUMN gyglkzjy_name VARCHAR(64) DEFAULT NULL COMMENT '供应管理科质检员审核人(审核通过时记录)';
  2775 +ALTER TABLE procurement_material_settle_detail ADD COLUMN ckzg_id VARCHAR(32) DEFAULT NULL COMMENT '仓库主管审核人ID(审核通过时记录)';
  2776 +ALTER TABLE procurement_material_settle_detail ADD COLUMN ckzg_name VARCHAR(64) DEFAULT NULL COMMENT '仓库主管审核人(审核通过时记录)';
  2777 +
2770 2778
2771 2779 CREATE TABLE IF NOT EXISTS `procurement_material_settle_apply_line`
2772 2780 (
... ...
... ... @@ -62,6 +62,24 @@ public class GetProcurementMaterialSettleDetailBo extends BaseBo<ProcurementMate
62 62 @ApiModelProperty("备注")
63 63 private String remark;
64 64
  65 + @ApiModelProperty("仓库质检审核人ID(分厂仓库质检员,审核通过时记录)")
  66 + private String ckzjyId;
  67 +
  68 + @ApiModelProperty("仓库质检审核人(分厂仓库质检员)")
  69 + private String ckzjyName;
  70 +
  71 + @ApiModelProperty("供应管理科质检员审核人ID(审核通过时记录)")
  72 + private String gyglkzjyId;
  73 +
  74 + @ApiModelProperty("供应管理科质检员审核人")
  75 + private String gyglkzjyName;
  76 +
  77 + @ApiModelProperty("仓库主管审核人ID(审核通过时记录)")
  78 + private String ckzgId;
  79 +
  80 + @ApiModelProperty("仓库主管审核人")
  81 + private String ckzgName;
  82 +
65 83 @ApiModelProperty("流程节点 CKTJY/CKZJY/GYGLKZJY/CKZG")
66 84 private String flowNode;
67 85
... ...
... ... @@ -499,11 +499,11 @@ public class FlowTaskServiceImpl implements FlowTaskService {
499 499 procurementAssayReportService.updateNoFlowInstance(map);
500 500 }
501 501
502   -// @Transactional(rollbackFor = Exception.class)
503   -// @Override
504   -// public void updateMaterialSettleDetailApprovalMap(Map<String, Object> map) {
505   -// procurementMaterialSettleDetailService.updateNoFlowInstance(map);
506   -// }
  502 + @Transactional(rollbackFor = Exception.class)
  503 + @Override
  504 + public void updateMaterialSettleDetailApprovalMap(Map<String, Object> map) {
  505 + procurementMaterialSettleDetailService.updateNoFlowInstance(map);
  506 + }
507 507
508 508 @Override
509 509 public Map<String, Object> findById(String s) {
... ...
... ... @@ -63,6 +63,12 @@ public class ProcurementMaterialSettleDetail extends BaseEntity implements BaseD
63 63 private String workshopName;
64 64
65 65 /**
  66 + * 分厂编号(联表 base_data_workshop 带出,非数据库字段;分厂审核节点编码 = material_settle_ + 分厂前缀 + 环节缩写)
  67 + */
  68 + @TableField(exist = false)
  69 + private String workshopCode;
  70 +
  71 + /**
66 72 * 合计过磅数(前端计算,后端存储与展示)
67 73 */
68 74 private BigDecimal totalWeighQuantity;
... ... @@ -93,6 +99,36 @@ public class ProcurementMaterialSettleDetail extends BaseEntity implements BaseD
93 99 private String remark;
94 100
95 101 /**
  102 + * 仓库质检审核人ID(分厂仓库质检员,审核通过时记录)
  103 + */
  104 + private String ckzjyId;
  105 +
  106 + /**
  107 + * 仓库质检审核人(分厂仓库质检员,审核通过时记录)
  108 + */
  109 + private String ckzjyName;
  110 +
  111 + /**
  112 + * 供应管理科质检员审核人ID(审核通过时记录)
  113 + */
  114 + private String gyglkzjyId;
  115 +
  116 + /**
  117 + * 供应管理科质检员审核人(审核通过时记录)
  118 + */
  119 + private String gyglkzjyName;
  120 +
  121 + /**
  122 + * 仓库主管审核人ID(审核通过时记录)
  123 + */
  124 + private String ckzgId;
  125 +
  126 + /**
  127 + * 仓库主管审核人(审核通过时记录)
  128 + */
  129 + private String ckzgName;
  130 +
  131 + /**
96 132 * 流程节点 CKTJY-仓库统计员 CKZJY-仓库质检 GYGLKZJY-供应管理科质检员 CKZG-仓库主管
97 133 */
98 134 private String flowNode;
... ...
... ... @@ -103,7 +103,7 @@ public class ProcurementMaterialSettleDetailServiceImpl
103 103 /**
104 104 * 流程编号(需与流程设计器中的流程编号一致,流程创建后调整)
105 105 */
106   - private static final String BPM_FLAG = "MATERIAL_SETTLE_DETAIL";
  106 + private static final String BPM_FLAG = "SETTLE_DETAIL";
107 107 /**
108 108 * 流程节点编码(大写英文,存 flow_node):
109 109 * 仓库统计员(制单) -> 仓库质检(复核) -> 供应管理科质检员(复核) -> 仓库主管
... ... @@ -349,7 +349,8 @@ public class ProcurementMaterialSettleDetailServiceImpl
349 349 public void submit(String id) {
350 350 Assert.notBlank(id);
351 351
352   - ProcurementMaterialSettleDetail entity = this.getById(id);
  352 + // 联表带出分厂编号(分厂审核节点编码 = material_settle_ + 分厂前缀 + 环节缩写,startInstance 传实体时必须带出)
  353 + ProcurementMaterialSettleDetail entity = settleDetailMapper.findById(id);
353 354 if (entity == null) {
354 355 throw new DefaultClientException("原料结算详情单不存在!");
355 356 }
... ... @@ -454,7 +455,7 @@ public class ProcurementMaterialSettleDetailServiceImpl
454 455 Object examStatusObj = map.get("examStatus");
455 456 String examStatus = examStatusObj == null ? null : String.valueOf(examStatusObj);
456 457
457   - // 刚审核完成的环节编码(material_settle_ + 分厂前缀 + 名称缩写)
  458 + // 刚审核完成的环节编码(material_settle_detail_ + 分厂前缀 + 名称缩写)
458 459 Object nodeObj = map.get("nodeCode");
459 460 String nodeCode = nodeObj == null ? null : String.valueOf(nodeObj);
460 461
... ... @@ -464,23 +465,37 @@ public class ProcurementMaterialSettleDetailServiceImpl
464 465 throw new DefaultClientException("原料结算详情单审核回调缺少业务ID!");
465 466 }
466 467
467   - // 拒绝/撤销/终止:统一回到仓库质检节点
468   - if (StringUtil.isNotBlank(examStatus) && !"PASS".equals(examStatus)) {
469   - this.update(Wrappers.lambdaUpdate(ProcurementMaterialSettleDetail.class)
470   - .set(ProcurementMaterialSettleDetail::getFlowNode, NODE_CKZJY)
471   - .eq(ProcurementMaterialSettleDetail::getId, bizId));
472   - return;
  468 + // 各审核环节匹配(nodeCode 尾部名称缩写,兼容分厂前缀 yfc/efc/sfc/ztfc)
  469 + boolean ckzjyNode = nodeCode != null && nodeCode.endsWith("ckzjy");
  470 + boolean gyglkzjyNode = nodeCode != null && nodeCode.endsWith("gyglkzjy");
  471 + boolean ckzgNode = nodeCode != null && nodeCode.endsWith("ckzg");
  472 +
  473 + // 审核通过时记录当前环节审核人(人员ID和名称)
  474 + boolean pass = "PASS".equals(examStatus);
  475 + String userId = null;
  476 + String userName = null;
  477 + if (pass) {
  478 + userId = SecurityUtil.getCurrentUser().getId();
  479 + userName = SecurityUtil.getCurrentUser().getName();
473 480 }
474 481
475   - // 审核通过:按刚审核完成的环节编码推进到下一节点
476   - String nextNode = nextFlowNode(nodeCode);
477   - if (nextNode == null) {
478   - // 仓库主管环节通过即流程结束,flow_node 由终态回调一并清空
  482 + // 通过则推进到下一节点;拒绝/撤销/终止统一回到仓库统计员
  483 + // (仓库主管环节通过即流程结束,flow_node 由终态回调一并清空)
  484 + String targetNode = pass ? nextFlowNode(nodeCode) : NODE_CKTJY;
  485 +
  486 + if (!ckzjyNode && !gyglkzjyNode && !ckzgNode && targetNode == null) {
  487 + // 未匹配到审核环节且无节点推进,忽略
479 488 return;
480 489 }
481 490
482 491 this.update(Wrappers.lambdaUpdate(ProcurementMaterialSettleDetail.class)
483   - .set(ProcurementMaterialSettleDetail::getFlowNode, nextNode)
  492 + .set(pass && ckzjyNode, ProcurementMaterialSettleDetail::getCkzjyId, userId)
  493 + .set(pass && ckzjyNode, ProcurementMaterialSettleDetail::getCkzjyName, userName)
  494 + .set(pass && gyglkzjyNode, ProcurementMaterialSettleDetail::getGyglkzjyId, userId)
  495 + .set(pass && gyglkzjyNode, ProcurementMaterialSettleDetail::getGyglkzjyName, userName)
  496 + .set(pass && ckzgNode, ProcurementMaterialSettleDetail::getCkzgId, userId)
  497 + .set(pass && ckzgNode, ProcurementMaterialSettleDetail::getCkzgName, userName)
  498 + .set(targetNode != null, ProcurementMaterialSettleDetail::getFlowNode, targetNode)
484 499 .eq(ProcurementMaterialSettleDetail::getId, bizId));
485 500 } catch (Exception ex) {
486 501 ex.printStackTrace();
... ... @@ -501,7 +516,7 @@ public class ProcurementMaterialSettleDetailServiceImpl
501 516
502 517 this.update(Wrappers.lambdaUpdate(ProcurementMaterialSettleDetail.class)
503 518 .set(ProcurementMaterialSettleDetail::getApprovalStatus, approvalStatus)
504   - .set(ProcurementMaterialSettleDetail::getFlowNode, null)
  519 + .set(ProcurementMaterialSettleDetail::getFlowNode, approvalStatus.equals("PASS") ? null : NODE_CKTJY)
505 520 .eq(ProcurementMaterialSettleDetail::getId, id));
506 521 }
507 522
... ...
... ... @@ -42,4 +42,9 @@ public interface ProcurementMaterialSettleDetailMapper
42 42 * 所选计划下的计划明细行(品种ID、品种名称、类别=品种关系表代号、名称=开票品名)
43 43 */
44 44 List<GetMaterialSettlePlanLineOptionBo> queryPlanLineOptions(@Param("planId") String planId);
  45 +
  46 + /**
  47 + * 单条查询(联表带出分厂编号 workshopCode;实体传给流程引擎/分厂审核节点路由前必须用此方法)
  48 + */
  49 + ProcurementMaterialSettleDetail findById(@Param("id") String id);
45 50 }
... ...
... ... @@ -14,12 +14,19 @@
14 14 <result column="supplier_name" property="supplierName"/>
15 15 <result column="workshop_id" property="workshopId"/>
16 16 <result column="workshop_name" property="workshopName"/>
  17 + <result column="workshop_code" property="workshopCode"/>
17 18 <result column="total_weigh_quantity" property="totalWeighQuantity"/>
18 19 <result column="total_fold_weight" property="totalFoldWeight"/>
19 20 <result column="total_return_weight" property="totalReturnWeight"/>
20 21 <result column="total_net_weight" property="totalNetWeight"/>
21 22 <result column="settle_type" property="settleType"/>
22 23 <result column="remark" property="remark"/>
  24 + <result column="ckzjy_id" property="ckzjyId"/>
  25 + <result column="ckzjy_name" property="ckzjyName"/>
  26 + <result column="gyglkzjy_id" property="gyglkzjyId"/>
  27 + <result column="gyglkzjy_name" property="gyglkzjyName"/>
  28 + <result column="ckzg_id" property="ckzgId"/>
  29 + <result column="ckzg_name" property="ckzgName"/>
23 30 <result column="flow_node" property="flowNode"/>
24 31 <result column="approval_status" property="approvalStatus"/>
25 32 <result column="plan_codes" property="planCodes"/>
... ... @@ -42,12 +49,19 @@
42 49 tb.supplier_name,
43 50 tb.workshop_id,
44 51 tb.workshop_name,
  52 + ws.code AS workshop_code,
45 53 tb.total_weigh_quantity,
46 54 tb.total_fold_weight,
47 55 tb.total_return_weight,
48 56 tb.total_net_weight,
49 57 tb.settle_type,
50 58 tb.remark,
  59 + tb.ckzjy_id,
  60 + tb.ckzjy_name,
  61 + tb.gyglkzjy_id,
  62 + tb.gyglkzjy_name,
  63 + tb.ckzg_id,
  64 + tb.ckzg_name,
51 65 tb.flow_node,
52 66 tb.approval_status,
53 67 <!-- 计划编号/ID集合取自过磅码单关联的计划(不可改,列表/详情展示用) -->
... ... @@ -68,6 +82,7 @@
68 82 tb.create_time,
69 83 tb.update_time
70 84 FROM procurement_material_settle_detail AS tb
  85 + LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id
71 86 </sql>
72 87
73 88 <select id="query" resultMap="ProcurementMaterialSettleDetailResult">
... ... @@ -109,6 +124,12 @@
109 124 ORDER BY tb.create_time DESC
110 125 </select>
111 126
  127 + <!-- 单条查询(联表带出分厂编号;分厂审核节点编码 = material_settle_ + 分厂前缀 + 环节缩写,实体传给流程引擎前必须带出) -->
  128 + <select id="findById" resultMap="ProcurementMaterialSettleDetailResult">
  129 + <include refid="PMSD_sql"/>
  130 + WHERE tb.id = #{id}
  131 + </select>
  132 +
112 133 <resultMap id="MaterialSettleSelectableTicketResult"
113 134 type="com.lframework.xingyun.sc.bo.procurement.GetMaterialSettleSelectableTicketBo">
114 135 <id column="id" property="id"/>
... ...