1.卸车传出订单号

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

@@ -18,7 +18,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.IncomingTypeEnum;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.WorkNodeEnums;
-import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;

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

@@ -5446,6 +5446,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long trayId = null;
 		String trayName = null;
 		String trayCode = null;
+		String orderCode = null;
 
 		//判断包件是否已入库
 		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
@@ -5512,7 +5513,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			} else {
 				String waybillNumber = parcelListEntity.getWaybillNumber();
-				String orderCode = parcelListEntity.getOrderCode();
+				orderCode = parcelListEntity.getOrderCode();
 				Long wid = parcelListEntity.getWarehouseId();
 				String wName = parcelListEntity.getWarehouse();
 				Long pacakageId = parcelListEntity.getId();
@@ -5656,7 +5657,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			Long finalNodeId = carsLoadScanEntity.getFinalNodeId();
 			Long waybillId = carsLoadScanEntity.getWaybillId();
 			String waybillNo = carsLoadScanEntity.getWaybillNo();
-			String orderCode = carsLoadScanEntity.getOrderCode();
+			orderCode = carsLoadScanEntity.getOrderCode();
 			Long loadScanId = carsLoadScanEntity.getId();
 			Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
 			Integer isData = carsLoadScanEntity.getIsData();
@@ -5771,7 +5772,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				TrunklineAdvanceDetailEntity advanceDetailEntity = trunklineAdvanceDetailService.findEntityByOrderPackageCode(orderPackageCode);
 				if (!Objects.isNull(advanceDetailEntity)) {
 					String packageStatus = advanceDetailEntity.getPackageStatus();
-					String orderCode1 = advanceDetailEntity.getOrderCode();
+					orderCode = advanceDetailEntity.getOrderCode();
 					String waybillNo1 = advanceDetailEntity.getWaybillNo();
 					if ("0".equals(packageStatus)) {
 						//未入库
@@ -5780,7 +5781,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						inComingDTO.setWarehouseId(warehouseId);
 						inComingService.incomingPackage(inComingDTO);
 
-						carsLoadScanEntity.setOrderCode(orderCode1);
+						carsLoadScanEntity.setOrderCode(orderCode);
 						carsLoadScanEntity.setWaybillNo(waybillNo1);
 						carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 						carsLoadScanEntity.setUnloadTime(new Date());