|
|
@ -1529,6 +1529,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R signforack(DistributionSignforDTO distributionSignfor) { |
|
|
|
public R signforack(DistributionSignforDTO distributionSignfor) { |
|
|
|
|
|
|
|
DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(distributionSignfor.getReservationId()); |
|
|
|
|
|
|
|
if (Func.isEmpty(signforEntity)){ |
|
|
|
|
|
|
|
log.error("预约查询签收信息错误"); |
|
|
|
|
|
|
|
return R.fail("请联系管理员!!!"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (signforEntity.getReceivedQuantity() <= 0){ |
|
|
|
|
|
|
|
log.error("signforack############未进行签收上传图片"); |
|
|
|
|
|
|
|
return Resp.scanFail("请先进行签收扫描后上传图片","请先进行签收扫描后上传图片"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); |
|
|
|
log.info("=============签收图片数据为:{}", distributionSignfor.getMap()); |
|
|
|
log.info("=============签收图片数据为:{}", distributionSignfor.getMap()); |
|
|
|
if (ObjectUtils.isNotNull(distributionSignfor.getMap())) { |
|
|
|
if (ObjectUtils.isNotNull(distributionSignfor.getMap())) { |
|
|
@ -3481,6 +3491,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Boolean updatePicture(DistributionSignforDTO distributionSignfor) { |
|
|
|
public Boolean updatePicture(DistributionSignforDTO distributionSignfor) { |
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtils.isNotNull(distributionSignfor.getMap())) { |
|
|
|
if (ObjectUtils.isNotNull(distributionSignfor.getMap())) { |
|
|
|
List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>(); |
|
|
|
List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>(); |
|
|
|
distributionSignfor.getMap().forEach((k, v) -> { |
|
|
|
distributionSignfor.getMap().forEach((k, v) -> { |
|
|
|