From 941d76f35a30b50001738381e2ead9eb2222542e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 4 Aug 2023 15:20:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E8=B5=84=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionBillLadingScanEntity.java     |  5 ++++-
 .../DistrilbutionBillLadingServiceImpl.java   | 22 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

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 8314255a9..464782281 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
@@ -45,9 +45,12 @@ public class DistributionBillLadingScanEntity extends BaseEntity {
 	@ApiModelProperty(value = "节点")
 	private Integer nodeType;
 
-	@ApiModelProperty(value = "扫码类型 1 pda扫码 2 手填 3库存品 4 订单")
+	@ApiModelProperty(value = "扫码类型 1 pda扫码 2 手填")
 	private Integer scanType;
 
+	@ApiModelProperty(value = "物资类型 1库存品 2 订单")
+	private String materialType;
+
 	@ApiModelProperty(value = "包件id")
 	private Long parcelListId;
 
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 eee6feb02..078eb4be1 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
@@ -681,7 +681,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				//已备货
 				List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 					.eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
-					.eq(DistributionBillLadingScanEntity::getScanType, '3')
+					.eq(DistributionBillLadingScanEntity::getMaterialType, '1')
 				);
 				i.setEsauInventoryNum(list.size());
 			}else{
@@ -706,18 +706,28 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		if(Func.isNull(billLadingId) || Func.isNull(coding ) || Func.isNull(type) ){
 			return R.fail(3000,"参数不完整,你干啥呢！！");
 		}else{
+			//查询是否签收
+			List<DistributionBillLadingScanEntity> list3 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+				.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
+				.eq(DistributionBillLadingScanEntity::getMaterialType, type)
+				.eq(DistributionBillLadingScanEntity::getPacketBarCode, coding)
+			);
+			if(list3.size() > 0){
+				return R.fail(3001,"已签收！");
+			}
+
 			//添加扫描记录
 			DistributionBillLadingScanEntity distributionBillLadingScan = new DistributionBillLadingScanEntity();
-			distributionBillLadingScan.setScanType((Integer) type);
+			distributionBillLadingScan.setMaterialType((String) type);
 			distributionBillLadingScan.setBillLadingId((Long) billLadingId);
-			if(type.equals("3")){
+			if(type.equals("1")){
 				//库存品
 				DistrilbutionBillLadingInventoryAppVO inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
 				if(ObjectUtils.isNotNull(inventoryAppVO)){
 					//查询签收数量
 					List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 						.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
-						.eq(DistributionBillLadingScanEntity::getScanType, "3")
+						.eq(DistributionBillLadingScanEntity::getMaterialType, "1")
 						.eq(DistributionBillLadingScanEntity::getStockListId, inventoryAppVO.getStockListId())
 					);
 					if(list.size() == inventoryAppVO.getQuantity()+1){
@@ -755,7 +765,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							);
 							List<DistributionBillLadingScanEntity> list2 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 								.eq(DistributionBillLadingScanEntity::getStockArticleId, so.getStockArticleId())
-								.eq(DistributionBillLadingScanEntity::getScanType, "4")
+								.eq(DistributionBillLadingScanEntity::getMaterialType, "2")
 								.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
 							);
 							//判断当前签收数
@@ -823,7 +833,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				//已备货
 				List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 					.eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
-					.eq(DistributionBillLadingScanEntity::getScanType, '3')
+					.eq(DistributionBillLadingScanEntity::getMaterialType, '1')
 				);
 				i.setEsauInventoryNum(list.size());
 				List<DistrilbutionAppBillLadingDetailVO> ladingDetailVOS = new ArrayList<>();