自提增加扫描操作人字段

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

@@ -69,4 +69,7 @@ public class DistributionBillLadingScanEntity extends BaseEntity {
 	@ApiModelProperty(value = "库存品id")
 	private Long stockListId;
 
+	@ApiModelProperty(value = "扫描操作人")
+	private String  scanUser;
+
 }

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

@@ -1185,6 +1185,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						DistributionBillLadingScanEntity distributionBillLadingScanEntity = new DistributionBillLadingScanEntity();
 						distributionBillLadingScanEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
 						distributionBillLadingScanEntity.setScanType(3);
+						distributionBillLadingScanEntity.setScanUser(AuthUtil.getUser().getNickName());
 						distributionBillLadingScanEntity.setParcelListId(parcelListEntity.getId());
 						distributionBillLadingScanEntity.setOrderSelfNumbering(parcelListEntity.getOrderCode());
 						distributionBillLadingScanEntity.setStockArticleId(parcelListEntity.getStockArticleId());
@@ -2742,6 +2743,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionBillLadingScan.setMaterialType((String) type);
 			distributionBillLadingScan.setBillLadingId(Long.parseLong(billLadingId.toString()));
 			distributionBillLadingScan.setScanType(1);
+			distributionBillLadingScan.setScanUser(AuthUtil.getUser().getNickName());
 			//扫描
 			if ("1".equals(type)) {
 				//查询该自提单存在几种品类的库存品
@@ -3465,6 +3467,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distributionParcelListService.updateById(parcelListEntity);
 					DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
 					billLadingScan.setScanType(2);
+					billLadingScan.setScanUser(AuthUtil.getUser().getNickName());
 					billLadingScan.setParcelListId(i.getId());
 					billLadingScan.setOrderSelfNumbering(i.getOrderCode());
 					billLadingScan.setStockArticleId(i.getStockArticleId());
@@ -3613,6 +3616,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
 		billLadingScan.setScanType(2);
 		billLadingScan.setParcelListId(i.getId());
+		billLadingScan.setScanUser(AuthUtil.getUser().getNickName());
 		billLadingScan.setOrderSelfNumbering(i.getOrderCode());
 		billLadingScan.setStockArticleId(i.getStockArticleId());
 		billLadingScan.setBillLadingId(billLadingAppDTO.getBillLadingId());