From 1bc73d39d19b6a3b994fa0038e89908fbc5517c1 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 24 Apr 2024 16:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A2=9E=E5=8A=A0=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/entity/DistributionBillLadingScanEntity.java | 3 +++
 .../service/impl/DistrilbutionBillLadingServiceImpl.java      | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionBillLadingScanEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionBillLadingScanEntity.java
index c6e819ac8..244a74dd4 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionBillLadingScanEntity.java
+++ b/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;
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 9775d9c1e..6ae5e7be8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/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());