From 0c186a43af49e561532abd251afa09d562be13d9 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Wed, 10 Apr 2024 10:01:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(all):=20=E8=A1=A5=E6=8F=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FactoryNodeOrderServiceImpl.java | 30 +++++++------------ .../service/impl/OrderPackageServiceImpl.java | 6 ++-- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/FactoryNodeOrderServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/FactoryNodeOrderServiceImpl.java index 5b6105422..57bb9cd2e 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/FactoryNodeOrderServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/FactoryNodeOrderServiceImpl.java @@ -16,19 +16,17 @@ */ package com.logpm.factorydata.zbom.service.impl; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.logpm.factorydata.enums.NodeEnums; import com.logpm.factorydata.zbom.entity.ZbFactoryNodeOrderEntity; import com.logpm.factorydata.zbom.mapper.FactoryNodeOrderMapper; import com.logpm.factorydata.zbom.service.IFactoryNodeOrderService; -import com.logpm.factorydata.zbom.vo.OrderPackageSignDTO; +import com.logpm.factorydata.zbom.vo.NodeDataDTO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** * 发货单号的节点操作数据 服务实现类 * @@ -41,21 +39,13 @@ import org.springframework.stereotype.Service; public class FactoryNodeOrderServiceImpl extends BaseServiceImpl implements IFactoryNodeOrderService { @Override - public void updateNodeOrder(OrderPackageSignDTO nodeConfirmParam) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(ZbFactoryNodeOrderEntity::getPlatformOrderCode, nodeConfirmParam.getPlatformOrderCode()) - .eq(ZbFactoryNodeOrderEntity::getDepartCode, nodeConfirmParam.getDepartCode()); - ZbFactoryNodeOrderEntity zbFactoryNodeOrderEntity = this.baseMapper.selectOne(wrapper); - if (ObjectUtil.isEmpty(zbFactoryNodeOrderEntity)) { - zbFactoryNodeOrderEntity = new ZbFactoryNodeOrderEntity(); - zbFactoryNodeOrderEntity.setPlatformOrderCode(nodeConfirmParam.getPlatformOrderCode()); - zbFactoryNodeOrderEntity.setDepartCode(nodeConfirmParam.getDepartCode()); - } - zbFactoryNodeOrderEntity.setPushNode(NodeEnums.CLERK_REVIEW.getCode().toString()); -// String pushNode = zbFactoryNodeOrderEntity.getPushNode(); -// String join = StrUtil.join(",", pushNode, NodeEnums.CLERK_REVIEW.getCode()); -// zbFactoryNodeOrderEntity.setPushNode(join); - this.saveOrUpdate(zbFactoryNodeOrderEntity); + public void updateNodeOrder(ZbFactoryNodeOrderEntity nodeConfirmParam) { + this.saveOrUpdate(nodeConfirmParam); + } + + @Override + public List findHistoryNodeOrder(List orders) { + return baseMapper.findHistoryNodeOrder(orders); } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/OrderPackageServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/OrderPackageServiceImpl.java index d20fa6d5e..71b8b1657 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/OrderPackageServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/OrderPackageServiceImpl.java @@ -21,7 +21,7 @@ import com.logpm.factorydata.zbom.mapper.OrderPackageMapper; import com.logpm.factorydata.zbom.service.IOrderPackageService; import com.logpm.factorydata.zbom.vo.NoSignNumberDTO; import com.logpm.factorydata.zbom.vo.OrderPackageDTO; -import com.logpm.factorydata.zbom.vo.OrderPackageSignDTO; +import com.logpm.factorydata.zbom.vo.NodeDataDTO; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; @@ -37,8 +37,8 @@ import java.util.List; public class OrderPackageServiceImpl extends BaseServiceImpl implements IOrderPackageService { @Override - public List findOrderCodebypackageCodes(List packageCodeList) { - List orders = this.baseMapper.findOrderCodebypackageCodes(packageCodeList); + public List findOrderCodebypackageCodes(List packageCodeList) { + List orders = this.baseMapper.findOrderCodebypackageCodes(packageCodeList); return orders; }