Showing
1 changed file
with
24 additions
and
21 deletions
| @@ -531,10 +531,10 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | @@ -531,10 +531,10 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | ||
| 531 | } | 531 | } |
| 532 | 532 | ||
| 533 | // 各审核环节匹配(nodeCode 尾部名称缩写,兼容分厂前缀 yfc/efc/sfc/ztfc) | 533 | // 各审核环节匹配(nodeCode 尾部名称缩写,兼容分厂前缀 yfc/efc/sfc/ztfc) |
| 534 | - boolean fzcktjyNode = nodeCode != null && nodeCode.endsWith("fzcktjy"); | ||
| 535 | - boolean fzckzjyNode = nodeCode != null && nodeCode.endsWith("fzckzjy"); | 534 | + boolean fccktjyNode = nodeCode != null && nodeCode.endsWith("fccktjy"); |
| 535 | + boolean fcckzjyNode = nodeCode != null && nodeCode.endsWith("fcckzjy"); | ||
| 536 | boolean gyglkzjyNode = nodeCode != null && nodeCode.endsWith("gyglkzjy"); | 536 | boolean gyglkzjyNode = nodeCode != null && nodeCode.endsWith("gyglkzjy"); |
| 537 | - boolean fzckzgNode = nodeCode != null && nodeCode.endsWith("fzckzg"); | 537 | + boolean fcckzgNode = nodeCode != null && nodeCode.endsWith("fcckzg"); |
| 538 | boolean gyglkzgNode = nodeCode != null && nodeCode.endsWith("gyglkzg"); | 538 | boolean gyglkzgNode = nodeCode != null && nodeCode.endsWith("gyglkzg"); |
| 539 | boolean gybzgNode = nodeCode != null && nodeCode.endsWith("gybzg"); | 539 | boolean gybzgNode = nodeCode != null && nodeCode.endsWith("gybzg"); |
| 540 | 540 | ||
| @@ -553,7 +553,8 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | @@ -553,7 +553,8 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | ||
| 553 | .set(ProcurementWarehouseReceiveOrder::getFlowNode, NODE_YLHSG) | 553 | .set(ProcurementWarehouseReceiveOrder::getFlowNode, NODE_YLHSG) |
| 554 | .eq(ProcurementWarehouseReceiveOrder::getId, bizId)); | 554 | .eq(ProcurementWarehouseReceiveOrder::getId, bizId)); |
| 555 | // 分厂仓库统计员环节拒绝时同样保存审核页调整的实收数 | 555 | // 分厂仓库统计员环节拒绝时同样保存审核页调整的实收数 |
| 556 | - if (fzcktjyNode) { | 556 | + log.info("fccktjyNode=====" + fccktjyNode); |
| 557 | + if (fccktjyNode) { | ||
| 557 | saveActualQuantityFromFlow(bizId, map); | 558 | saveActualQuantityFromFlow(bizId, map); |
| 558 | } | 559 | } |
| 559 | return; | 560 | return; |
| @@ -564,20 +565,20 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | @@ -564,20 +565,20 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | ||
| 564 | String nextNode = nextFlowNode(nodeCode); | 565 | String nextNode = nextFlowNode(nodeCode); |
| 565 | 566 | ||
| 566 | // 未匹配到审核环节且无节点推进,忽略 | 567 | // 未匹配到审核环节且无节点推进,忽略 |
| 567 | - if (nextNode == null && !fzcktjyNode && !fzckzjyNode && !gyglkzjyNode | ||
| 568 | - && !fzckzgNode && !gyglkzgNode && !gybzgNode) { | 568 | + if (nextNode == null && !fccktjyNode && !fcckzjyNode && !gyglkzjyNode |
| 569 | + && !fcckzgNode && !gyglkzgNode && !gybzgNode) { | ||
| 569 | return; | 570 | return; |
| 570 | } | 571 | } |
| 571 | 572 | ||
| 572 | this.update(Wrappers.lambdaUpdate(ProcurementWarehouseReceiveOrder.class) | 573 | this.update(Wrappers.lambdaUpdate(ProcurementWarehouseReceiveOrder.class) |
| 573 | - .set(fzcktjyNode, ProcurementWarehouseReceiveOrder::getFzcktjyId, userId) | ||
| 574 | - .set(fzcktjyNode, ProcurementWarehouseReceiveOrder::getFzcktjyName, userName) | ||
| 575 | - .set(fzckzjyNode, ProcurementWarehouseReceiveOrder::getFzckzjyId, userId) | ||
| 576 | - .set(fzckzjyNode, ProcurementWarehouseReceiveOrder::getFzckzjyName, userName) | 574 | + .set(fccktjyNode, ProcurementWarehouseReceiveOrder::getFzcktjyId, userId) |
| 575 | + .set(fccktjyNode, ProcurementWarehouseReceiveOrder::getFzcktjyName, userName) | ||
| 576 | + .set(fcckzjyNode, ProcurementWarehouseReceiveOrder::getFzckzjyId, userId) | ||
| 577 | + .set(fcckzjyNode, ProcurementWarehouseReceiveOrder::getFzckzjyName, userName) | ||
| 577 | .set(gyglkzjyNode, ProcurementWarehouseReceiveOrder::getGyglkzjyId, userId) | 578 | .set(gyglkzjyNode, ProcurementWarehouseReceiveOrder::getGyglkzjyId, userId) |
| 578 | .set(gyglkzjyNode, ProcurementWarehouseReceiveOrder::getGyglkzjyName, userName) | 579 | .set(gyglkzjyNode, ProcurementWarehouseReceiveOrder::getGyglkzjyName, userName) |
| 579 | - .set(fzckzgNode, ProcurementWarehouseReceiveOrder::getFzckzgId, userId) | ||
| 580 | - .set(fzckzgNode, ProcurementWarehouseReceiveOrder::getFzckzgName, userName) | 580 | + .set(fcckzgNode, ProcurementWarehouseReceiveOrder::getFzckzgId, userId) |
| 581 | + .set(fcckzgNode, ProcurementWarehouseReceiveOrder::getFzckzgName, userName) | ||
| 581 | .set(gyglkzgNode, ProcurementWarehouseReceiveOrder::getGyglkzgId, userId) | 582 | .set(gyglkzgNode, ProcurementWarehouseReceiveOrder::getGyglkzgId, userId) |
| 582 | .set(gyglkzgNode, ProcurementWarehouseReceiveOrder::getGyglkzgName, userName) | 583 | .set(gyglkzgNode, ProcurementWarehouseReceiveOrder::getGyglkzgName, userName) |
| 583 | .set(gybzgNode, ProcurementWarehouseReceiveOrder::getGybzgId, userId) | 584 | .set(gybzgNode, ProcurementWarehouseReceiveOrder::getGybzgId, userId) |
| @@ -586,7 +587,7 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | @@ -586,7 +587,7 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | ||
| 586 | .eq(ProcurementWarehouseReceiveOrder::getId, bizId)); | 587 | .eq(ProcurementWarehouseReceiveOrder::getId, bizId)); |
| 587 | 588 | ||
| 588 | // 分厂仓库统计员环节通过时保存审核页调整的实收数 | 589 | // 分厂仓库统计员环节通过时保存审核页调整的实收数 |
| 589 | - if (fzcktjyNode) { | 590 | + if (fccktjyNode) { |
| 590 | saveActualQuantityFromFlow(bizId, map); | 591 | saveActualQuantityFromFlow(bizId, map); |
| 591 | } | 592 | } |
| 592 | } catch (Exception ex) { | 593 | } catch (Exception ex) { |
| @@ -601,15 +602,17 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | @@ -601,15 +602,17 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | ||
| 601 | private void saveActualQuantityFromFlow(String bizId, Map<String, Object> map) { | 602 | private void saveActualQuantityFromFlow(String bizId, Map<String, Object> map) { |
| 602 | try { | 603 | try { |
| 603 | UpdateWarehouseReceiveActualQuantityVo vo = null; | 604 | UpdateWarehouseReceiveActualQuantityVo vo = null; |
| 604 | - // 优先从 variables 子 map 解析(前端审核时业务数据经流程变量回传) | ||
| 605 | - Object varsObj = map.get("variables"); | ||
| 606 | - if (varsObj instanceof Map) { | ||
| 607 | - vo = JsonUtil.parseObject(JsonUtil.toJsonString(varsObj), | ||
| 608 | - UpdateWarehouseReceiveActualQuantityVo.class); | ||
| 609 | - } | 605 | + // 回调 map 即前端 variables 内容,业务数据(含 lines)在 map 顶层,直接解析 |
| 606 | + vo = JsonUtil.parseObject(JsonUtil.toJsonString(map), | ||
| 607 | + UpdateWarehouseReceiveActualQuantityVo.class); | ||
| 608 | + log.info("vo=====" + vo); | ||
| 610 | if (vo == null || CollectionUtil.isEmpty(vo.getLines())) { | 609 | if (vo == null || CollectionUtil.isEmpty(vo.getLines())) { |
| 611 | - vo = JsonUtil.parseObject(JsonUtil.toJsonString(map), | ||
| 612 | - UpdateWarehouseReceiveActualQuantityVo.class); | 610 | + // 兼容业务数据包裹在 variables 子 map 中的情况 |
| 611 | + Object varsObj = map.get("variables"); | ||
| 612 | + if (varsObj instanceof Map) { | ||
| 613 | + vo = JsonUtil.parseObject(JsonUtil.toJsonString(varsObj), | ||
| 614 | + UpdateWarehouseReceiveActualQuantityVo.class); | ||
| 615 | + } | ||
| 613 | } | 616 | } |
| 614 | if (vo == null || CollectionUtil.isEmpty(vo.getLines())) { | 617 | if (vo == null || CollectionUtil.isEmpty(vo.getLines())) { |
| 615 | return; | 618 | return; |