Merge pull request 'fix(all): 补提代码' (#20) from dev into pre-production

Reviewed-on: #20

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<FactoryNodeOrderMapper, ZbFactoryNodeOrderEntity> implements IFactoryNodeOrderService {
 
 	@Override
-	public void updateNodeOrder(OrderPackageSignDTO nodeConfirmParam) {
-		LambdaQueryWrapper<ZbFactoryNodeOrderEntity> wrapper = Wrappers.<ZbFactoryNodeOrderEntity>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());
+	public void updateNodeOrder(ZbFactoryNodeOrderEntity nodeConfirmParam) {
+		this.saveOrUpdate(nodeConfirmParam);
 	}
-		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);
+
+	@Override
+	public List<ZbFactoryNodeOrderEntity> findHistoryNodeOrder(List<NodeDataDTO> orders) {
+		return baseMapper.findHistoryNodeOrder(orders);
 	}
 
 }

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<OrderPackageMapper, ZbOrderPackageEntity> implements IOrderPackageService {
 
 	@Override
-	public List<OrderPackageSignDTO> findOrderCodebypackageCodes(List<String> packageCodeList) {
-		List<OrderPackageSignDTO> orders = this.baseMapper.findOrderCodebypackageCodes(packageCodeList);
+	public List<NodeDataDTO> findOrderCodebypackageCodes(List<String> packageCodeList) {
+		List<NodeDataDTO> orders = this.baseMapper.findOrderCodebypackageCodes(packageCodeList);
 		return orders;
 	}