From ba9f80ed7c65714aeb6994d71e30c54b63831f43 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Fri, 12 Jan 2024 15:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AftersalesProcessingMoneyEntity.java    |  5 +++++
 .../impl/DistrilbutionBillLadingServiceImpl.java   | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java
index 93b2b42a1..5d00dfc93 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java
@@ -98,6 +98,11 @@ public class AftersalesProcessingMoneyEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "处理结果名称")
 	private String resultName;
+	/**
+	 * 支付单位
+	 */
+	@ApiModelProperty(value = "支付单位")
+	private String paymentUnit;
 	/**
 	 * 类型
 	 */
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 7d711eeda..c4a0e639d 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
@@ -157,7 +157,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			this.updateById(distrilbutionBillLading);
 			if(!distrilbutionBillLading.getBillPackageEntityList().isEmpty() || !distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
 				//修改新增包件
-				//todo 还没有改
+				//todo
 				updateBillPackeg(distrilbutionBillLading);
 			}
 			//修改零担数据
@@ -1444,7 +1444,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			return Resp.scanFail("3000", "参数不完整！！");
 		} else {
 			DistrilbutionBillLadingEntity billLadingEntity1 = baseMapper.selectById((Serializable) billLadingId);
-			if(ObjectUtils.isNotNull(billLadingEntity1) && billLadingEntity1.getConditions().equals("20")){
+			if(ObjectUtils.isNotNull(billLadingEntity1) && "20".equals(billLadingEntity1.getConditions())){
 				return  Resp.scanFail("提货任务已完成！", "提货任务已完成！");
 			}
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
@@ -1553,6 +1553,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								//修改备货订单状态
 								distributionAsyncService.getBillStock(one1.getId());
 							}
+							//修改在库数量
+							if(ObjectUtils.isNotNull( one.getHandQuantity()) && one.getHandQuantity() > 0){
+								int i = one.getHandQuantity() - 1;
+								int i2 = ObjectUtils.isNull(one.getSigninQuantity()) ? 1 : one.getSigninQuantity() + 1;
+								distributionStockArticleService.update(Wrappers.<DistributionStockArticleEntity>update()
+									.eq("id",one.getId())
+									.set("hand_quantity",i)
+									.set("signin_quantity", i2)
+								);
+							}
 							//修改包件状态
 							distributionAsyncService.getSelfPickup(list1.get(0).getId());
 							distributionBillLadingScan.setParcelListId(list1.get(0).getId());