|
|
|
@ -16,6 +16,14 @@
|
|
|
|
|
*/ |
|
|
|
|
package com.logpm.distribution.controller; |
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.OrderItem; |
|
|
|
|
import com.logpm.distribution.dto.DistributionSigndetailDTO; |
|
|
|
|
import com.logpm.distribution.entity.DistributionPackagereceiptEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionSignforEntity; |
|
|
|
|
import com.logpm.distribution.feign.IDistributionSignforClient; |
|
|
|
|
import com.logpm.distribution.service.IDistributionPackagereceiptService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionSignforService; |
|
|
|
|
import com.logpm.distribution.vo.DistributionPackagereceiptVO; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import io.swagger.annotations.ApiParam; |
|
|
|
@ -23,10 +31,13 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import javax.validation.Valid; |
|
|
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.core.secure.BladeUser; |
|
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
|
import org.springblade.core.mp.support.Query; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.BeanUtil; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
@ -39,6 +50,7 @@ import org.springblade.core.boot.ctrl.BladeController;
|
|
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
|
import org.springblade.core.excel.util.ExcelUtil; |
|
|
|
|
import org.springblade.core.tool.constant.BladeConstant; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import springfox.documentation.annotations.ApiIgnore; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.List; |
|
|
|
@ -54,19 +66,32 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
@AllArgsConstructor |
|
|
|
|
@RequestMapping("/signdetail") |
|
|
|
|
@Api(value = "签收明细", tags = "签收明细接口") |
|
|
|
|
@Slf4j |
|
|
|
|
public class DistributionSigndetailController extends BladeController { |
|
|
|
|
|
|
|
|
|
private final IDistributionSigndetailService distributionSigndetailService; |
|
|
|
|
|
|
|
|
|
private final IDistributionSignforService distributionSignforService; |
|
|
|
|
|
|
|
|
|
private final IDistributionPackagereceiptService distributionPackagereceiptService; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 签收明细 详情 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/detail") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "详情", notes = "传入distributionSigndetail") |
|
|
|
|
public R<DistributionSigndetailEntity> detail(DistributionSigndetailEntity distributionSigndetail) { |
|
|
|
|
public R<DistributionSigndetailVO> detail(DistributionSigndetailDTO distributionSigndetail) { |
|
|
|
|
DistributionSigndetailEntity detail = distributionSigndetailService.getOne(Condition.getQueryWrapper(distributionSigndetail)); |
|
|
|
|
return R.data(detail); |
|
|
|
|
DistributionSigndetailVO distributionSigndetailVO = new DistributionSigndetailVO(); |
|
|
|
|
//查询主表数据
|
|
|
|
|
DistributionSignforEntity distributionSignfor = distributionSignforService.getById(detail.getMasterId()); |
|
|
|
|
BeanUtil.copyProperties(detail,distributionSigndetailVO); |
|
|
|
|
BeanUtil.copyProperties(distributionSignfor,distributionSigndetailVO); |
|
|
|
|
//查询包条信息
|
|
|
|
|
List<DistributionPackagereceiptVO> distributionPackagereceiptVOList =distributionPackagereceiptService.getListByMasterId(detail.getId()); |
|
|
|
|
distributionSigndetailVO.setDistributionPackagereceiptVOList(distributionPackagereceiptVOList); |
|
|
|
|
return R.data(distributionSigndetailVO); |
|
|
|
|
} |
|
|
|
|
/** |
|
|
|
|
* 签收明细 分页 |
|
|
|
@ -85,7 +110,9 @@ public class DistributionSigndetailController extends BladeController {
|
|
|
|
|
@GetMapping("/page") |
|
|
|
|
@ApiOperationSupport(order = 3) |
|
|
|
|
@ApiOperation(value = "分页", notes = "传入distributionSigndetail") |
|
|
|
|
public R<IPage<DistributionSigndetailVO>> page(DistributionSigndetailVO distributionSigndetail, Query query) { |
|
|
|
|
public R<IPage<DistributionSigndetailVO>> page(DistributionSigndetailDTO distributionSigndetail, Query query) { |
|
|
|
|
//获取当前登录用户
|
|
|
|
|
BladeUser user = AuthUtil.getUser(); |
|
|
|
|
IPage<DistributionSigndetailVO> pages = distributionSigndetailService.selectDistributionSigndetailPage(Condition.getPage(query), distributionSigndetail); |
|
|
|
|
return R.data(pages); |
|
|
|
|
} |
|
|
|
|