oms-出库单提货单打印
This commit is contained in:
+12
@@ -1,6 +1,7 @@
|
||||
package com.mhd.oms.domain.reservationStockOutOrder.repository.facade;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.mhd.oms.domain.reservationOutMaterialDetail.repository.po.ReservationOutMaterialDetailPO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO;
|
||||
@@ -41,4 +42,15 @@ public interface IReservationStockOutOrderService extends IService<ReservationSt
|
||||
* 查询出库单
|
||||
*/
|
||||
public ReservationStockOutOrderPO getInfo(Long outOrderId);
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-表头
|
||||
*/
|
||||
List<ReservationStockOutOrderPO> queryOutStockNoticePrint(ReservationStockOutOrderDO stockOutOrderDO);
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-明细
|
||||
*/
|
||||
List<ReservationOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO);
|
||||
|
||||
}
|
||||
+10
@@ -2,6 +2,7 @@ package com.mhd.oms.domain.reservationStockOutOrder.repository.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
//import com.mhd.oms.domain.reservationReservationStockOutOrder.entity.ReservationReservationStockOutOrder;
|
||||
import com.mhd.oms.domain.reservationOutMaterialDetail.repository.po.ReservationOutMaterialDetailPO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO;
|
||||
@@ -24,4 +25,13 @@ public interface ReservationStockOutOrderMapper extends BaseMapper<ReservationSt
|
||||
*/
|
||||
public List<ReservationStockOutOrderPO> queryList(ReservationStockOutOrderDO stockOutOrderDO);
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-表头
|
||||
*/
|
||||
List<ReservationStockOutOrderPO> queryOutStockNoticePrint(ReservationStockOutOrderDO stockOutOrderDO);
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-明细
|
||||
*/
|
||||
List<ReservationOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO);
|
||||
}
|
||||
+20
@@ -6,6 +6,7 @@ import com.mhd.common.security.utils.SecurityUtils;
|
||||
//import com.mhd.oms.domain.reservationReservationStockOutOrder.entity.ReservationReservationStockOutOrder;
|
||||
//import com.mhd.oms.domain.reservationReservationStockOutOrder.repository.facade.IReservationReservationStockOutOrderService;
|
||||
//import com.mhd.oms.domain.reservationReservationStockOutOrder.repository.mapper.ReservationReservationStockOutOrderMapper;
|
||||
import com.mhd.oms.domain.reservationOutMaterialDetail.repository.po.ReservationOutMaterialDetailPO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper;
|
||||
@@ -112,4 +113,23 @@ public class ReservationStockOutOrderImpl extends ServiceImpl<ReservationStockOu
|
||||
// .set(ReservationStockOutOrder::getUpdateTime, new Date())
|
||||
// .eq(ReservationStockOutOrder::getOutOrderNumber, deliveTaskDO.getTrackingNumber()));
|
||||
// }
|
||||
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-表头
|
||||
*/
|
||||
@Override
|
||||
public List<ReservationStockOutOrderPO> queryOutStockNoticePrint(ReservationStockOutOrderDO stockOutOrderDO) {
|
||||
return reservationStockOutOrderMapper.queryOutStockNoticePrint(stockOutOrderDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-明细
|
||||
*/
|
||||
@Override
|
||||
public List<ReservationOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO) {
|
||||
return reservationStockOutOrderMapper.queryOutStockNoticePrintDetail(stockOutOrderDO);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+18
@@ -30,6 +30,7 @@ import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrd
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDTO;
|
||||
import com.mhd.system.api.SystemServiceFeign;
|
||||
import com.mhd.system.api.UserServiceFeign;
|
||||
import com.mhd.system.api.domain.*;
|
||||
@@ -1014,4 +1015,21 @@ public class ReservationStockOutOrderApplicationService {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-表头
|
||||
*/
|
||||
public List<ReservationStockOutOrderPO> queryOutStockNoticePrint(ReservationStockOutOrderDTO stockOutOrderDTO) {
|
||||
ReservationStockOutOrderDO stockOutOrderDO = new ReservationStockOutOrderDO();
|
||||
BeanUtils.copyProperties(stockOutOrderDTO, stockOutOrderDO);
|
||||
return stockOutOrderDomainService.queryOutStockNoticePrint(stockOutOrderDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-明细
|
||||
*/
|
||||
public List<ReservationOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReservationStockOutOrderDTO stockOutOrderDTO) {
|
||||
ReservationStockOutOrderDO stockOutOrderDO = new ReservationStockOutOrderDO();
|
||||
BeanUtils.copyProperties(stockOutOrderDTO, stockOutOrderDO);
|
||||
return stockOutOrderDomainService.queryOutStockNoticePrintDetail(stockOutOrderDO);
|
||||
}
|
||||
}
|
||||
+14
@@ -693,4 +693,18 @@ public class ReservationStockOutOrderDomainService {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-表头
|
||||
*/
|
||||
public List<ReservationStockOutOrderPO> queryOutStockNoticePrint(ReservationStockOutOrderDO stockOutOrderDO) {
|
||||
return stockOutOrderService.queryOutStockNoticePrint(stockOutOrderDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 出库单提货单打印-明细
|
||||
*/
|
||||
public List<ReservationOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO) {
|
||||
return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDO);
|
||||
}
|
||||
|
||||
}
|
||||
+19
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.mhd.common.core.web.controller.BaseController;
|
||||
import com.mhd.common.core.web.domain.AjaxResult;
|
||||
import com.mhd.common.core.web.page.TableDataInfo;
|
||||
import com.mhd.oms.domain.reservationOutMaterialDetail.repository.po.ReservationOutMaterialDetailPO;
|
||||
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
|
||||
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDTO;
|
||||
import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
|
||||
@@ -23,7 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 出库单Api
|
||||
@@ -193,4 +196,20 @@ public class ReservationStockOutOrderApi extends BaseController {
|
||||
return AjaxResult.success(stockOutOrderApplicationService.pushOutOrderDetail(outMaterialDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 出库单提货单打印
|
||||
*/
|
||||
@ApiOperation("出库单提货单打印")
|
||||
@PostMapping("/queryOutStockNoticePrint")
|
||||
public AjaxResult queryOutStockNoticePrint(@RequestBody ReservationStockOutOrderDTO stockOutOrderDTO) {
|
||||
List<ReservationStockOutOrderPO> headerList = stockOutOrderApplicationService.queryOutStockNoticePrint(stockOutOrderDTO);
|
||||
List<ReservationOutMaterialDetailPO> detailList = stockOutOrderApplicationService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
if (!headerList.isEmpty()) {
|
||||
result.put("header", headerList.get(0));
|
||||
}
|
||||
result.put("detailList", detailList);
|
||||
return AjaxResult.success(result);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user