文员复核签收推送签收信息至工厂

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;
 	}

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);
 }

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)){