1.优化代码1.2

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java

@@ -18,14 +18,14 @@ package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
-import java.math.BigDecimal;
-
 /**
  * 提货费用记录 实体类
  *

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java

@@ -17,9 +17,10 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java

@@ -17,14 +17,14 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
-import java.math.BigDecimal;
-
 /**
  * 外协配送信息列表 实体类
  *

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java

@@ -17,9 +17,10 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java

@@ -17,9 +17,10 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java

@@ -17,9 +17,10 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java

@@ -17,9 +17,10 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java

@@ -17,10 +17,12 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.License;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springblade.core.tenant.mp.TenantEntity;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java

@@ -17,9 +17,10 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java

@@ -10,8 +10,8 @@ import lombok.Data;
  **/
 @Data
 public class DistributionParcelTrayVO {
-	private String trayId; //托盘id
+	private Long trayId; //托盘id
 	private String trayCode; //托盘名称
-	private String trayPackNum; //托盘名称
+	private Integer trayPackNum; //托盘名称
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java

@@ -16,11 +16,10 @@
  */
 package com.logpm.distribution.wrapper;
 
-import com.logpm.distribution.entity.DistributionPrintEntity;
-import com.logpm.distribution.vo.DistributionPrintVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-
+import com.logpm.distribution.entity.DistributionPrintEntity;
+import com.logpm.distribution.vo.DistributionPrintVO;
 import java.util.Objects;
 
 /**

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java

@@ -16,11 +16,10 @@
  */
 package com.logpm.distribution.wrapper;
 
-import com.logpm.distribution.entity.DistributionStockListInfoEntity;
-import com.logpm.distribution.vo.DistributionStockListInfoVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-
+import com.logpm.distribution.entity.DistributionStockListInfoEntity;
+import com.logpm.distribution.vo.DistributionStockListInfoVO;
 import java.util.Objects;
 
 /**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java

@@ -121,17 +121,6 @@ public interface IDistributionAsyncService {
 	 */
 	void stockupSelfUpdateState(StockupDTO stockupDTO);
 
-	/**
-	 * 库存品 商 市 查询备货状态修改
-	 * @param stockupDTO
-	 */
-	void stockupStockUpdateState(StockupDTO stockupDTO);
-
-	/**
-	 * 库存品 自 查询备货状态修改
-	 * @param stockupDTO
-	 */
-	void stockupStockSelfUpdateState(StockupDTO stockupDTO);
 
 	/**
 	 * 市配装车扫描接口状态变更

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -480,12 +480,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, id));
 		boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.yiyueyue.getValue()));
 		if (flag){
+            assert stockArticleEntity != null;
             stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 		}else {
 			 flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.daiyuyue.getValue()));
 			if (flag){
+                assert stockArticleEntity != null;
                 stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
 			}else {
+                assert stockArticleEntity != null;
                 stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
 			}
 		}
@@ -571,7 +574,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				.eq(DistributionReservationStockarticleEntity::getReservationId, i.getReservationId())
 				.apply("stock_article_status in (1,3)")
 			);
-			if(distributionReservationStockarticleEntities.size() > 0 ){
+			if(!distributionReservationStockarticleEntities.isEmpty()){
 				int sum = distributionReservationStockarticleEntities.stream().mapToInt(DistributionReservationStockarticleEntity::getReservationNum).sum();
 				nu.set(nu.get() + sum);
 			}
@@ -581,7 +584,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				.eq(DistributionReservationStocklistEntity::getReservationId, i.getReservationId())
 				.apply("stock_list_status in (1,3)")
 			);
-			if(distributionReservationStocklistEntities.size() > 0){
+			if(!distributionReservationStocklistEntities.isEmpty()){
 				int sum = distributionReservationStocklistEntities.stream().mapToInt(DistributionReservationStocklistEntity::getReservationNum).sum();
 				ku.set(ku.get()+ sum);
 			}
@@ -698,29 +701,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	}
 
-	/**
-	 * 库存品 商 市 查询备货状态修改
-	 * @param stockupDTO
-	 */
-	@Override
-	public void stockupStockUpdateState(StockupDTO stockupDTO) {
-		DistributionStockupEntity distributionStockupEntity = distributionStockupService.selectById(stockupDTO.getStockupId());
-
-
-
-	}
 
-	/**
-	 * 库存品 自 查询备货状态修改
-	 * @param stockupDTO
-	 */
-	@Override
-	public void stockupStockSelfUpdateState(StockupDTO stockupDTO) {
-		DistributionStockupEntity distributionStockupEntity = distributionStockupService.selectById(stockupDTO.getStockupId());
-
-
-
-	}
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java

@@ -162,7 +162,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 					.eq(DistributionLoadscanEntity::getReservationId, k.getReservationId())
 					.apply("scan_status != 1")
 				);
-				if (list.size() > 0) {
+				if (!list.isEmpty()) {
 					k.setScanStatus(2);
 					k.setIsScan("已扫");
 				} else {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -44,6 +44,7 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
 import org.springblade.common.constant.Inventory.InventoryPackageStatusConstant;
@@ -171,7 +172,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//	if (detail.getSource() == 1) {
 		//查询客户信息
 		List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
-		if (Func.isNotEmpty(customList) || customList.size() >= 1) {
+		if (!customList.isEmpty()) {
 			customList.forEach(c -> {
 				if (Func.isNotEmpty(c.getLoadingStatus())) {
 					switch (c.getLoadingStatus()) {
@@ -303,7 +304,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//获取关联的客户信息
 		if (distributionDeliveryList.getSource() == 1) {
 			String reservationId = distributionDeliveryList.getReservationId();
-			List<Long> reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(","))));
+			List<Long> reservationIds = Collections.singletonList(Long.valueOf(Arrays.toString(reservationId.split(","))));
 			//查询客户信息,装车情况
 //		List<DistributionDeliveryInfoEntity> distributionDeliveryInfoEntities = distributionDeliveryInfoMapper.selectList(new QueryWrapper<DistributionDeliveryInfoEntity>().lambda()
 //			.eq(DistributionDeliveryInfoEntity::getLoadedState, "2")
@@ -350,7 +351,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		//获取关联订单
 		String orderId = distributionDeliveryList.getOrderId();
-		List<Long> orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(","))));
+		List<Long> orderIds = Collections.singletonList(Long.valueOf(Arrays.toString(orderId.split(","))));
 		//查询在库订单
 		List<DistributionStockArticleEntity> distributionStockArticleEntities = distributionStockArticleMapper.selectBatchIds(orderIds);
 		//插入配送详情表
@@ -415,7 +416,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
 					.ne(DistributionLoadscanEntity::getScanStatus, 1)
 				);
-				if (distributionLoadscanEntitiesflag.size() > 0) {
+				if (!distributionLoadscanEntitiesflag.isEmpty()) {
 					return Resp.scanSuccess("重复扫码", "重复扫码");
 				}
 				//依次插入该装车记录,设置车辆
@@ -563,7 +564,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				Long key = entry.getKey();
 				List<DistributionLoadscanEntity> loadscanEntities = deliveryPackage.get(key);
 				if (Func.isEmpty(deliveryPackage.get(entry.getKey()))) {
-
+						//todo 未完成代码
 				}
 
 			}
@@ -592,10 +593,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
 					.ne(DistributionLoadscanEntity::getScanStatus, 1)
 				);
-				if (distributionLoadscanEntitiesflag.size() > 0) {
+				if (!distributionLoadscanEntitiesflag.isEmpty()) {
 					return Resp.scanSuccess("有扫描过的货物", "有扫描过的货物");
 				}
-				if (distributionLoadscanEntity.getDeliveryId() != distrilbutionloadingscanDTO.getDeliveryId()) {
+				if (!Objects.equals(distributionLoadscanEntity.getDeliveryId(), distrilbutionloadingscanDTO.getDeliveryId())) {
 					return Resp.scanSuccess("有其他车次货物", "有其他车次货物");
 				}
 				//依次插入该装车记录,设置车辆
@@ -629,7 +630,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
 					.ne(DistributionLoadscanEntity::getScanStatus, 1)
 				);
-				if (distributionLoadscanEntitiesflag.size() > 0) {
+				if (!distributionLoadscanEntitiesflag.isEmpty()) {
 					return Resp.scanSuccess("重复扫描", "重复扫描");
 				}
 				//依次插入该装车记录,设置车辆
@@ -669,7 +670,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
 						.ne(DistributionLoadscanEntity::getScanStatus, 1)
 					);
-					if (distributionLoadscanEntitiesflag.size() > 0) {
+					if (!distributionLoadscanEntitiesflag.isEmpty()) {
 						return Resp.scanSuccess("重复扫描", "重复扫描");
 					}
 					//依次插入该装车记录,设置车辆
@@ -705,7 +706,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode())
 						.ne(DistributionLoadscanEntity::getScanStatus, 1)
 					);
-					if (distributionLoadscanEntitiesflag.size() > 0) {
+					if (!distributionLoadscanEntitiesflag.isEmpty()) {
 						return Resp.scanSuccess("重复扫描", "重复扫描");
 					}
 					//依次插入该装车记录,设置车辆
@@ -865,7 +866,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		//查询配送任务配车司机信息
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
-		DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
+		DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfDTO();
 		if (StringUtils.isBlank(distrilbutionloadingscanDTO.getLoadingId())) {
 			if (distributionDeliveryListEntity.getKind().equals("1")) {
 				distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
@@ -1226,7 +1227,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 			.eq(DistributionLoadscanEntity::getScanStatus, 1)
 		);
-		if (distributionLoadscanEntitiesflag.size() > 0) {
+		if (!distributionLoadscanEntitiesflag.isEmpty()) {
 			return R.fail(3002, "重复取消");
 		}
 		List<DistributionLoadscaninvnEntity> distributionLoadscanEntitiesflag2 = distributionLoadscaninvnMapper.selectList(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
@@ -1234,28 +1235,28 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 			.eq(DistributionLoadscaninvnEntity::getScanStatus, 1)
 		);
-		if (distributionLoadscanEntitiesflag2.size() > 0) {
+		if (!distributionLoadscanEntitiesflag2.isEmpty()) {
 			return R.fail(3002, "重复取消");
 		}
 		if (distrilbutionloadingscanDTO.getType() == 1) {
 			//	if (distrilbutionloadingscanDTO.getStockType() == 1) {
 			//查询该包条是否属于该配送任务
 			List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-			if (distributionLoadscanEntities.size() > 0) {
+			if (distributionLoadscanEntities.isEmpty()) {
 				return R.fail(3001, "窜货");
 			}
+// 串货后 下面的代码执行的意义不存在
 			for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
 				//取消装车，更新该装车记录
 				distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO);
 				//更新签收表的装车数量
 				Integer j = distributionSignforMapper.updateloadreduceByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 			}
-			//	}
 		} else if (distrilbutionloadingscanDTO.getType() == 2) {
 			//TODO 托盘扫描
 			//查询该包条是否属于该配送任务
 			List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverypallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-			if (distributionLoadscanEntities.size() <= 0) {
+			if (distributionLoadscanEntities.isEmpty()) {
 				return R.fail(3001, "窜货");
 			}
 			for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@@ -1272,7 +1273,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if (distributionReservationStockarticleEntity.getIsHaveData() == 1) {
 				//查询订单是否属于该配送任务
 				List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectOrderpallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-				if (distributionLoadscanEntities.size() < 0) {
+				if (distributionLoadscanEntities.isEmpty()) {
 					return R.fail(3001, "窜货");
 				}
 				for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@@ -1321,14 +1322,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//库存品
 		//获取当前用户司机
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
-		DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
+		DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfEntity();
 		if (distributionDeliveryListEntity.getKind().equals("1")) {
 			distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
 		} else {
 			DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
 			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 		}
-		boolean b = false;
 
 		//根据传递进来的库存品条码进行库存品的校验
 		//获取之前的
@@ -1354,6 +1354,37 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			} else {
 				List<DisStockListDetailEntity> disStockListDetailEntities = detailEntities.stream().filter(d -> d.getStockPackageCode().equals(barcode)).collect(Collectors.toList());
 				if (disStockListDetailEntities.size() == 1) {
+					DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities);
+					distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
+					//查询本车次是否第一次扫码,没有则更新上车时间
+					Integer a = distributionDeliveryListMapper.updateloadingTimeById(distributionLoadscaninvnEntity.getDeliveryId());
+					//更新签收表的装车数量
+					Integer j = distributionSignforMapper.updateloadByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getLoadedNub());
+					//异步处理状态信息
+					distributionAsyncService.changeMarketDeliveryListStatus(distributionLoadscaninvnEntity.getOrderPackageCode(), distributionLoadscaninvnEntity.getDeliveryId());
+					//处理出库问题
+					DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId()));
+					distributionStockListEntity.setQuantityStock(distributionStockListEntity.getQuantityStock() - distributionLoadscaninvnEntity.getLoadedNub());
+					distributionStockListEntity.setQuantityOccupied(distributionStockListEntity.getQuantityStock() - distributionLoadscaninvnEntity.getLoadedNub());
+					distributionStockListEntity.setOutboundQuantity(distributionStockListEntity.getQuantityStock() + distributionLoadscaninvnEntity.getLoadedNub());
+					distributionStockListMapper.updateById(distributionStockListEntity);
+				} else {
+					return Resp.scanFail("窜货", "窜货");
+				}
+			}
+		}
+		return Resp.scanSuccess("扫描成功", "扫描成功");
+	}
+
+	/**
+	 * 构建对象
+	 * @param distrilbutionloadingscanDTO
+	 * @param distributionDeliverySelfEntity
+	 * @param disStockListDetailEntities
+	 * @return
+	 */
+	@NotNull
+	private static DistributionLoadscaninvnEntity getDistributionLoadscaninvnEntity(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionDeliverySelfEntity distributionDeliverySelfEntity, List<DisStockListDetailEntity> disStockListDetailEntities) {
 		DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity();
 		BladeUser user = AuthUtil.getUser();
 		if (null != distributionDeliverySelfEntity.getDriverId()) {
@@ -1383,25 +1414,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 		distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.zhengchang.getValue());
 		distributionLoadscaninvnEntity.setScanSynchronous(1);
-					distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
-					//查询本车次是否第一次扫码,没有则更新上车时间
-					Integer a = distributionDeliveryListMapper.updateloadingTimeById(distributionLoadscaninvnEntity.getDeliveryId());
-					//更新签收表的装车数量
-					Integer j = distributionSignforMapper.updateloadByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getLoadedNub());
-					//异步处理状态信息
-					distributionAsyncService.changeMarketDeliveryListStatus(distributionLoadscaninvnEntity.getOrderPackageCode(), distributionLoadscaninvnEntity.getDeliveryId());
-					//处理出库问题
-					DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId()));
-					distributionStockListEntity.setQuantityStock(distributionStockListEntity.getQuantityStock() - distributionLoadscaninvnEntity.getLoadedNub());
-					distributionStockListEntity.setQuantityOccupied(distributionStockListEntity.getQuantityStock() - distributionLoadscaninvnEntity.getLoadedNub());
-					distributionStockListEntity.setOutboundQuantity(distributionStockListEntity.getQuantityStock() + distributionLoadscaninvnEntity.getLoadedNub());
-					distributionStockListMapper.updateById(distributionStockListEntity);
-				} else {
-					return Resp.scanFail("窜货", "窜货");
-				}
-			}
-		}
-		return Resp.scanSuccess("扫描成功", "扫描成功");
+		return distributionLoadscaninvnEntity;
 	}
 
 //			if (distributionLoadscaninvnEntities.size() == 1) {
@@ -1531,7 +1544,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
 			.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 		);
-		if (distributionLoadscanEntities.size() < 0) {
+		if (distributionLoadscanEntities.isEmpty()) {
 			return R.fail(3005, "该货物未装车");
 		}
 		boolean b = false;
@@ -1569,7 +1582,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			//查询司机的任务
 			List<Long> deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId());
-			if (deliveryIds.size() > 0) {
+			if (!deliveryIds.isEmpty()) {
 				distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO, deliveryIds);
 			} else {
 				return page.setRecords(distributionAppDeliveryListVOS);
@@ -1590,7 +1603,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					queryWrapper.eq("reservation_id", distributionAppDeliveryListVO.getReservationId());
 				}
 				List<DistributionStockupInfoEntity> list1 = distributionStockupInfoService.list(queryWrapper);
-				if (list1.size() > 0) {
+				if (!list1.isEmpty()) {
 					DistributionStockupInfoEntity distributionStockupInfoEntity = list1.get(0);
 					DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectById(distributionStockupInfoEntity.getStockupId());
 					if (ObjectUtils.isNotNull(distributionStockupEntity)) {
@@ -1656,7 +1669,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//查询是否备货
 			distributionAppDeliveryListVO.setIsstock("备货完成");
 			Integer reNub = distributionStockMapper.selectCount(new QueryWrapper<DistributionStockEntity>().lambda()
-				.in(reList.size() > 0, DistributionStockEntity::getReservationId, reList)
+				.in(!reList.isEmpty(), DistributionStockEntity::getReservationId, reList)
 			).intValue(); //扫描件数
 			Integer deliveryNumber = distributionAppDeliveryListVO.getDeliveryNumber(); //配送件数
 			if (reNub < deliveryNumber) {
@@ -1664,7 +1677,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			//查询司机
 			List<DistributionAppDeliverySelfVO> distributionAppDeliverySelfVOS = distributionDeliverySelfMapper.selectListcustom(distributionAppDeliveryListVO.getId());
-			if (distributionAppDeliverySelfVOS.size() > 0) {
+			if (!distributionAppDeliverySelfVOS.isEmpty()) {
 				StringBuilder stringBuilder = new StringBuilder();
 				distributionAppDeliverySelfVOS.forEach(e -> {
 					if (e.getIsMaster() == 2) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java

@@ -100,8 +100,6 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 				b= true;
 			}
 		}
-
-
 		return b;
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -130,8 +130,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	private IDistributionAsyncService distributionAsyncService;
 
 
-
-
 	@Override
 	public IPage<DistributionStockupVO> selectDistributionStockupPage(IPage<DistributionStockupVO> page, DistributionStockupVO distributionStockup) {
 		return page.setRecords(baseMapper.selectDistributionStockupPage(page, distributionStockup));
@@ -228,7 +226,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}
 
 
-
 	}
 
 	@Override
@@ -548,6 +545,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	/**
 	 * 自提备货客户包件数据查询
+	 *
 	 * @param reservationId  自提id
 	 * @param stockArticleId 订单id
 	 * @param stockupId      备货id
@@ -836,7 +834,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				Iterator<DistributionParcelTrayVO> iterator = list.iterator();
 				while (iterator.hasNext()) {
 					if (i.getTrayId().equals(iterator.next().getTrayId())) {
-						String trayPackNum = iterator.next().getTrayPackNum(); //在这个托盘的数量
+						Integer trayPackNum = iterator.next().getTrayPackNum(); //在这个托盘的数量
 						List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId());
 						if (trayPackNum.equals(trayIdList.size())) {
 							trays.set(true);
@@ -869,7 +867,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 							.eq(DistributionParcelListEntity::getOrderPackageCode, stockupDTO.getPacketBarCode())
 						);
-						if(list.size() > 0){
+						if (!list.isEmpty()) {
 							Integer integer = baseMapper.selectPackageExistSelf(stockupDTO);
 							if (ObjectUtils.isNotNull(integer) && integer > 0) {
 								//在 判断有没有扫过码
@@ -883,11 +881,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 									return 2;
 								} else {
 									//扫描操作
-
 									distributionAsyncService.stockupSelfUpdateState(stockupDTO);
 									return 1;
-
-
 								}
 							} else {
 								//窜货
@@ -960,7 +955,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 								.eq(DistributionStockEntity::getStockupId, stockupId)
 								.eq(DistributionStockEntity::getReservationId, reservationId)
 							);
-							if (list.size() > 0) {
+							if (!list.isEmpty()) {
 								//重复扫码
 								return 2;
 							} else {
@@ -976,7 +971,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 							}
 						} else {
 							List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getOrderPackageCode, packetBarCode));
-							if (list.size()>0){
+							if (!list.isEmpty()) {
 								return 5;
 							}
 							//不存在
@@ -1060,7 +1055,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	/**
-	 *
 	 * @param reservationId
 	 */
 	@Override
@@ -1070,6 +1064,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	/**
 	 * 备货打印包件码绑定
+	 *
 	 * @param stockupDTO
 	 * @return
 	 */
@@ -1089,7 +1084,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DisStockListDetailEntity::getWarehouseId, byId.getWarehouseId())
 			.isNull(DisStockListDetailEntity::getStockPackageCode)
 		);
-		if (list1.size() > 0) {
+		if (!list1.isEmpty()) {
 			switch (stockupDTO.getStockPrint()) {
 				case 1:
 					//绑定码