Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java

@@ -51,4 +51,13 @@ public enum WorkNodeEnums implements Serializable {
 		this.value = value;
 	}
 
+	public static String getValue(Integer code) {
+		for (WorkNodeEnums value : WorkNodeEnums.values()) {
+			if (value.getCode().equals(code)) {
+				return value.getValue();
+			}
+		}
+		return null;
+	}
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehousePackageTrackLogVO.java

@@ -0,0 +1,11 @@
+package com.logpm.warehouse.vo;
+
+import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
+import lombok.Data;
+
+@Data
+public class WarehousePackageTrackLogVO extends WarehousePackageTrackLogEntity {
+
+	private String workNodeName;
+
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java

@@ -18,7 +18,7 @@ public interface IOpenOrderAsyncService {
 
 	void saveUnloadStartCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId);
 
-	void incomingPackageBatch(List<Long> advanceIds, Long userId, Long deptId, String tenantId, String nickName,Integer incomingType,Long warehouseId);
+	void incomingPackageBatch(List<Long> advanceIds, Long userId, Long deptId, String tenantId, String nickName,Integer incomingType,Long warehouseId,String warehouseName);
 
 	void saveUpdateLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java

@@ -259,10 +259,11 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 
 	@Async("asyncExecutor")
 	@Override
-	public void incomingPackageBatch(List<Long> advanceIds, Long userId, Long deptId, String tenantId, String nickName,Integer incomingType,Long warehouseId) {
+	public void incomingPackageBatch(List<Long> advanceIds, Long userId, Long deptId, String tenantId, String nickName,Integer incomingType,Long warehouseId,String warehouseName) {
 		InComingDTO inComingDTO = new InComingDTO();
 		inComingDTO.setAdvanceIds(advanceIds);
 		inComingDTO.setWarehouseId(warehouseId);
+		inComingDTO.setWarehouseName(warehouseName);
 		inComingDTO.setUserId(userId);
 		inComingDTO.setDeptId(deptId);
 		inComingDTO.setTenantId(tenantId);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -566,7 +566,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//判断是否是开单及入库的配置
 		Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId);
 		if (Boolean.TRUE.equals(aBoolean)) {
-			openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode(),warehouseId);
+			openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode(),warehouseId,warehouseName);
 		}
 
 		//异步存入日志

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java

@@ -70,7 +70,7 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl<Trunkli
 
 	@Override
 	public List<CarsLoadOrderInfoVO> findCarsLoadOrderInfoListPlan(Long loadId, String waybillNo) {
-		return baseMapper.findCarsLoadOrderInfoList(loadId,waybillNo);
+		return baseMapper.findCarsLoadOrderInfoListPlan(loadId,waybillNo);
 	}
 
 	@Override

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehousePackageTrackLogMapper.java

@@ -2,11 +2,14 @@ package com.logpm.warehouse.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
+import com.logpm.warehouse.vo.WarehousePackageTrackLogVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface WarehousePackageTrackLogMapper extends BaseMapper<WarehousePackageTrackLogEntity> {
 
-
+    List<WarehousePackageTrackLogVO> finaPackageTrackLogList(@Param("orderPackageCode") String orderPackageCode);
-
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehousePackageTrackLogMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.warehouse.mapper.WarehousePackageTrackLogMapper">
+
+    <select id="finaPackageTrackLogList" resultType="com.logpm.warehouse.vo.WarehousePackageTrackLogVO">
+        select *
+        from warehouse_package_track_log
+        where order_package_code = #{orderPackageCode}
+        order by create_time asc
+    </select>
+
+</mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehousePackageTrackLogServiceImpl.java

@@ -1,15 +1,18 @@
 package com.logpm.warehouse.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
 import com.logpm.warehouse.mapper.WarehousePackageTrackLogMapper;
 import com.logpm.warehouse.service.IWarehousePackageTrackLogService;
+import com.logpm.warehouse.vo.WarehousePackageTrackLogVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 @Slf4j
@@ -17,10 +20,12 @@ public class WarehousePackageTrackLogServiceImpl extends BaseServiceImpl<Warehou
 
 	@Override
 	public R finaPackageTrackLogList(String orderPackageCode) {
-		QueryWrapper<WarehousePackageTrackLogEntity> queryWrapper = new QueryWrapper<>();
+		List<WarehousePackageTrackLogVO> list = baseMapper.finaPackageTrackLogList(orderPackageCode);
-		queryWrapper.eq("order_package_code",orderPackageCode)
+
-			.orderByAsc("create_time");
+		list.forEach(item->{
+			item.setWorkNodeName(WorkNodeEnums.getValue(item.getWorkNode()));
+		});
 
-		return R.data(baseMapper.selectList(queryWrapper));
+		return R.data(list);
 	}
 }