1.干线bug修复

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java

@@ -13,6 +13,8 @@ public class CarsLoadAllOrderVO implements Serializable {
 	private String orderCode;//订单号
 	private Long waybillId;//运单id
 	private String waybillNo;//运单号
+	private Long nodeId;//计划仓库id
+	private String nodeName;//计划仓库
 	private Date createTime;//创建时间
 	private String destination;//到站
 	private String departureWarehouseName;//目的仓

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -40,9 +41,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 配送在库订单 Feign实现类
@@ -338,11 +337,17 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 
 	@Override
 	public List<DistributionStockArticleEntity> findListByOrderCodesAndWarehouseId(FindParamterDTO findParamterDTO) {
-		QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.in("order_code",findParamterDTO.getOrderCodeSet())
-			.eq("warehouse_id",findParamterDTO.getWarehouseId());
+		Set<String> orderCodeSet = findParamterDTO.getOrderCodeSet();
+		log.info("###################findListByOrderCodesAndWarehouseId: 当前处理的数据为 {}",orderCodeSet);
+		if(CollUtil.isEmpty(orderCodeSet)){
+			return Collections.emptyList();
+		}else{
+			QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.in("order_code",orderCodeSet)
+				.eq("warehouse_id",findParamterDTO.getWarehouseId());
 
-		return distributionStockArticleService.list(queryWrapper);
+			return distributionStockArticleService.list(queryWrapper);
+		}
 	}
 
 	@Override

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml

@@ -41,7 +41,7 @@
                lww.consignee_address consigneeAddress,
                lww.remark remark,
                lww.total_count-lww.billlading_num totalPlanNum,
-               ltbw.plan_num planNum,
+               lww.total_count-lww.billlading_num planNum,
                ltbw.real_num realNum,
                ltbw.billlading_fee billladingFee,
                lww.collect_pay collectPay,

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -313,6 +313,8 @@
         ltco.order_code orderCode,
         ltco.waybill_id waybillId,
         ltco.waybill_no waybillNo,
+        ltco.node_id nodeId,
+        ltco.node_name nodeName,
         lww.create_time createTime,
         lww.destination destination,
         lww.destination_warehouse_name destinationWarehouseName,
@@ -334,13 +336,12 @@
         where ltco.load_id = #{param.loadId}
         and ltco.final_node_id = #{param.finalNodeId}
         and ldpl.is_deleted = 0
-        <if test="param.warehouseId != null">
-            and ldpl.warehouse_id = #{param.warehouseId}
-        </if>
         group by ltco.id,
         ltco.order_code,
         ltco.waybill_id,
         ltco.waybill_no,
+        ltco.node_id,
+        ltco.node_name,
         lww.create_time,
         lww.destination,
         lww.destination_warehouse_name,

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

@@ -228,7 +228,7 @@ public class InComingServiceImpl implements IInComingService {
 				return Resp.scanFail(405, "包件无数据", "包件无数据");
 			}
 
-			if(incomingType == 1 && incomingType == 2){
+			if(incomingType == 1 || incomingType == 2){
 				for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : advanceDetailEntityList) {
 					Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId();
 					if(!warehouseId1.equals(warehouseId)){

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

@@ -6694,6 +6694,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String trayName = null;
 		String trayCode = null;
 		String orderCode = null;
+		Integer isTransfer = 0;
 
 		//判断包件是否已入库
 		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
@@ -6872,10 +6873,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							BeanUtil.copy(nowParcelListEntity, distributionParcelListEntity);
 							distributionParcelListEntity.setId(null);
 							distributionParcelListEntity.setIsTransfer(1);
+							isTransfer = 1;
 							if (!Objects.isNull(warehouseWaybillEntity)) {
 								Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 								if (destinationWarehouseId.equals(warehouseId)) {
 									distributionParcelListEntity.setIsTransfer(0);
+									isTransfer = 0;
 								}
 							}
 							distributionParcelListEntity.setAdvanceId(nowParcelListEntity.getAdvanceId());
@@ -6900,8 +6903,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 								Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 								if (destinationWarehouseId.equals(warehouseId)) {
 									distributionParcelListEntity.setIsTransfer(0);
+									isTransfer = 0;
 								} else {
 									distributionParcelListEntity.setIsTransfer(1);
+									isTransfer = 1;
 								}
 							}
 							distributionParcelListClient.update(distributionParcelListEntity);
@@ -7040,10 +7045,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					BeanUtil.copy(parcelListEntity, distributionParcelListEntity);
 					distributionParcelListEntity.setId(null);
 					distributionParcelListEntity.setIsTransfer(1);
+					isTransfer = 1;
 					if (!Objects.isNull(warehouseWaybillEntity)) {
 						Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 						if (destinationWarehouseId.equals(warehouseId)) {
 							distributionParcelListEntity.setIsTransfer(0);
+							isTransfer = 0;
 						}
 					}
 					distributionParcelListEntity.setAdvanceId(parcelListEntity.getAdvanceId());
@@ -7068,8 +7075,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 						if (destinationWarehouseId.equals(warehouseId)) {
 							distributionParcelListEntity.setIsTransfer(0);
+							isTransfer = 0;
 						} else {
 							distributionParcelListEntity.setIsTransfer(1);
+							isTransfer = 1;
 						}
 					}
 					distributionParcelListClient.update(distributionParcelListEntity);
@@ -7187,8 +7196,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 							if (destinationWarehouseId.equals(warehouseId)) {
 								distributionParcelListEntity.setIsTransfer(0);
+								isTransfer = 0;
 							} else {
 								distributionParcelListEntity.setIsTransfer(1);
+								isTransfer = 1;
 							}
 						}
 						distributionParcelListEntity.setWarehouseId(warehouseId);
@@ -7210,8 +7221,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
 							if (destinationWarehouseId.equals(warehouseId)) {
 								distributionParcelListEntity.setIsTransfer(0);
+								isTransfer = 0;
 							} else {
 								distributionParcelListEntity.setIsTransfer(1);
+								isTransfer = 1;
 							}
 						}
 						distributionParcelListClient.update(distributionParcelListEntity);
@@ -7373,6 +7386,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String trayName = null;
 		String trayCode = null;
 		String orderCode = null;
+		Integer isTransfer = 0;
 
 		//判断包件是否已入库
 		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/ExecutorConfig.java

@@ -21,7 +21,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @Configuration
 @Slf4j
 @EnableAsync
-public class ExecutorConfig {
+public class  ExecutorConfig {
 
 	@Bean
 	public Executor asyncExecutor() {