文员复核图片修改

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -309,7 +309,7 @@ public class DistributionSignforController extends BladeController {
 	@ApiOperation(value = "修改", notes = "传入distributionSignfor")
 	public R update(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
 
-		R r= distributionSignforService.recheck(distributionSignfor.getId());
+		R r= distributionSignforService.recheck(distributionSignfor);
 		if (r.isSuccess()){
 			//维护配送状态
 			distributionDeliveryListService.maintenanceDeliveryInfo(distributionSignfor.getDeliveryId());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@@ -244,7 +244,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * 推送签收信息到工厂
 	 * @param id
 	 */
-	R recheck(Long id);
+	R recheck(DistributionSignforDTO distributionSignforDTO);
 
 	/**
 	 * 查询是否可以进行复核签收

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -474,26 +474,27 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	@Transactional
-	public R recheck(Long id) {
+	public R recheck(DistributionSignforDTO distributionSignforDTO) {
 
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)) {
 			return R.fail(403, "未授权!!!");
 		}
-		if (Func.isEmpty(id)){
-			log.error("参数缺失,signforId:{}",id);
+		if (Func.isEmpty(distributionSignforDTO.getId())){
+			log.error("参数缺失,signforId:{}",distributionSignforDTO.getId());
 			return null;
 		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-dd-mm HH:mm:ss.SSS");
-		DistributionSignforEntity distributionSignfor = this.getById(id);
+		DistributionSignforEntity distributionSignfor = this.getById(distributionSignforDTO.getId());
 		BladeUser user = AuthUtil.getUser();
 		distributionSignfor.setExamineUserId(user.getUserId());
 		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());
 		//复核时间为签收时间
 		distributionSignfor.setSigningTime(sdf.format(new Date()));
 		distributionSignfor.setExamineUserName(user.getNickName());
-		this.updateById(distributionSignfor);
-		distributionAsyncService.sendReviewFactory(id,myCurrentWarehouse.getName(), myCurrentWarehouse.getId());
+		this.updatePicture(distributionSignforDTO);
+
+		distributionAsyncService.sendReviewFactory(distributionSignforDTO.getId(),myCurrentWarehouse.getName(), myCurrentWarehouse.getId());
 		//还需要对未装车未签收的包件进行状态的回退
 		boolean flag = this.judgmentSignIsHavePackage(distributionSignfor.getReservationId());
 		if (!flag){