Commit 2037a6e4cdf231ffb94cc5d79a9db66519b087b5

Authored by 房远帅
1 parent c203cc23

销售-入库:仓库收料单审核数据

@@ -456,7 +456,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl @@ -456,7 +456,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl
456 456
457 @Override 457 @Override
458 @Transactional(rollbackFor = Exception.class) 458 @Transactional(rollbackFor = Exception.class)
459 - @OpLog(type = OtherOpLogType.class, name = "调整仓库收料单实收数,ID:{}", params = {"#vo.id"})  
460 public void updateActualQuantity(UpdateWarehouseReceiveActualQuantityVo vo) { 459 public void updateActualQuantity(UpdateWarehouseReceiveActualQuantityVo vo) {
461 Assert.notBlank(vo.getId(), "ID不能为空!"); 460 Assert.notBlank(vo.getId(), "ID不能为空!");
462 461
@@ -489,9 +488,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl @@ -489,9 +488,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl
489 .set(vo.getTotalTaxAmount() != null, 488 .set(vo.getTotalTaxAmount() != null,
490 ProcurementWarehouseReceiveOrder::getTotalTaxAmount, vo.getTotalTaxAmount()) 489 ProcurementWarehouseReceiveOrder::getTotalTaxAmount, vo.getTotalTaxAmount())
491 .eq(ProcurementWarehouseReceiveOrder::getId, vo.getId())); 490 .eq(ProcurementWarehouseReceiveOrder::getId, vo.getId()));
492 -  
493 - OpLogUtil.setVariable("id", vo.getId());  
494 - OpLogUtil.setExtra(entity);  
495 } 491 }
496 492
497 @Override 493 @Override
@@ -553,7 +549,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl @@ -553,7 +549,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl
553 .set(ProcurementWarehouseReceiveOrder::getFlowNode, NODE_YLHSG) 549 .set(ProcurementWarehouseReceiveOrder::getFlowNode, NODE_YLHSG)
554 .eq(ProcurementWarehouseReceiveOrder::getId, bizId)); 550 .eq(ProcurementWarehouseReceiveOrder::getId, bizId));
555 // 分厂仓库统计员环节拒绝时同样保存审核页调整的实收数 551 // 分厂仓库统计员环节拒绝时同样保存审核页调整的实收数
556 - log.info("fccktjyNode=====" + fccktjyNode);  
557 if (fccktjyNode) { 552 if (fccktjyNode) {
558 saveActualQuantityFromFlow(bizId, map); 553 saveActualQuantityFromFlow(bizId, map);
559 } 554 }
@@ -605,7 +600,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl @@ -605,7 +600,6 @@ public class ProcurementWarehouseReceiveOrderServiceImpl
605 // 回调 map 即前端 variables 内容,业务数据(含 lines)在 map 顶层,直接解析 600 // 回调 map 即前端 variables 内容,业务数据(含 lines)在 map 顶层,直接解析
606 vo = JsonUtil.parseObject(JsonUtil.toJsonString(map), 601 vo = JsonUtil.parseObject(JsonUtil.toJsonString(map),
607 UpdateWarehouseReceiveActualQuantityVo.class); 602 UpdateWarehouseReceiveActualQuantityVo.class);
608 - log.info("vo=====" + vo);  
609 if (vo == null || CollectionUtil.isEmpty(vo.getLines())) { 603 if (vo == null || CollectionUtil.isEmpty(vo.getLines())) {
610 // 兼容业务数据包裹在 variables 子 map 中的情况 604 // 兼容业务数据包裹在 variables 子 map 中的情况
611 Object varsObj = map.get("variables"); 605 Object varsObj = map.get("variables");
@@ -864,16 +858,16 @@ public class ProcurementWarehouseReceiveOrderServiceImpl @@ -864,16 +858,16 @@ public class ProcurementWarehouseReceiveOrderServiceImpl
864 if (StringUtil.isBlank(nodeCode)) { 858 if (StringUtil.isBlank(nodeCode)) {
865 return null; 859 return null;
866 } 860 }
867 - if (nodeCode.endsWith("fzcktjy")) { 861 + if (nodeCode.endsWith("fccktjy")) {
868 return NODE_FZCKZJY; 862 return NODE_FZCKZJY;
869 } 863 }
870 - if (nodeCode.endsWith("fzckzjy")) { 864 + if (nodeCode.endsWith("fcckzjy")) {
871 return NODE_GYGLKZJY; 865 return NODE_GYGLKZJY;
872 } 866 }
873 if (nodeCode.endsWith("gyglkzjy")) { 867 if (nodeCode.endsWith("gyglkzjy")) {
874 return NODE_FZCKZG; 868 return NODE_FZCKZG;
875 } 869 }
876 - if (nodeCode.endsWith("fzckzg")) { 870 + if (nodeCode.endsWith("fcckzg")) {
877 return NODE_GYGLKZG; 871 return NODE_GYGLKZG;
878 } 872 }
879 if (nodeCode.endsWith("gyglkzg")) { 873 if (nodeCode.endsWith("gyglkzg")) {