From 0c41b47ef07a65bf3184e3694249cc81ceb7cb40 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 21 Dec 2023 20:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=91=98=E5=A4=8D=E6=A0=B8=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E6=8E=A8=E9=80=81=E7=AD=BE=E6=94=B6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=87=B3=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DistributionSignforController.java |  7 +++----
 .../service/IDistributionSignforService.java      |  6 ++++++
 .../impl/DistributionSignforServiceImpl.java      | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
index 92e29971d..11e6cb7c3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
@@ -276,10 +276,9 @@ public class DistributionSignforController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入distributionSignfor")
 	public R update(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
-		BladeUser user = AuthUtil.getUser();
-		distributionSignfor.setExamineUserId(user.getUserId());
-		distributionSignfor.setExamineUserName(user.getNickName());
-		R r = distributionSignforService.updateSign(distributionSignfor);
+
+		R r= distributionSignforService.recheck(distributionSignfor.getId());
+
 //		return R.status(distributionSignforService.updateById(distributionSignfor));
 		return r;
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
index eac49ceb8..95331e0b4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
@@ -229,4 +229,10 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @return
 	 */
 	R getNumberDetail(Long signingId, Integer type);
+
+	/**
+	 * 推送签收信息到工厂
+	 * @param id
+	 */
+	R recheck(Long id);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 21d9804ab..ffb1d54aa 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -300,6 +300,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return R.data(detailDTOS);
 	}
 
+	@Override
+	public R recheck(Long id) {
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			return R.fail(403,"未授权!!!");
+		}
+		DistributionSignforEntity distributionSignfor = this.getById(id);
+		BladeUser user = AuthUtil.getUser();
+		distributionSignfor.setExamineUserId(user.getUserId());
+		distributionSignfor.setExamineUserName(user.getNickName());
+		this.updateById(distributionSignfor);
+		distributionAsyncService.sendReviewFactory(id,myCurrentWarehouse.getId());
+		return R.success("操作成功");
+	}
+
 	private List<DistributionNumberDetailDTO> deliveryUnsigningInventoryNumberDetail(List<DisStockListDetailEntity> disStockListDetailEntities) {
 		List<DisStockListDetailEntity> unsignInventoryList = disStockListDetailEntities.stream().filter(p -> p.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue())).collect(Collectors.toList());
 		if (Func.isEmpty(unsignInventoryList)){