weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

Browse Source
This commit is contained in:
王奎兴
2026-04-18 16:51:35 +08:00
parent 70d86d490b c8fa72878b
commit 6f4d2ca742
7 changed files with 156 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/facade/IReservationStockOutOrderService.java
+12
View File
@@ -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);
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java
+10
View File
@@ -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);
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/persistence/ReservationStockOutOrderImpl.java
+20
View File
@@ -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);
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+18
View File
@@ -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);
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+14
View File
@@ -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);
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java
+19
View File
@@ -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);
}
}
mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+63
View File
@@ -334,4 +334,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by a.create_time desc nulls last
</select>
<!-- 出库单提货单打印-表头查询 -->
<select id="queryOutStockNoticePrint" resultMap="StockOutOrderResult">
SELECT
a.notice_number,
a.out_order_number,
a.supply_chain_number,
a.shipper_name,
a.expect_time,
a.document_creator_name,
a.document_creator,
a.document_date,
a.warehouse_name,
a.remark
FROM reservation_stock_out_order a
WHERE a.del_flag = 1
AND a.out_order_id = #{outOrderId}
</select>
<!-- 出库单提货单打印-明细查询 -->
<select id="queryOutStockNoticePrintDetail" resultMap="OutMaterialDetailResult">
SELECT
b.batch_number,
b.material_code,
b.material_name,
b.specification_model,
b.quantity,
b.unit_name,
b.pack_name,
b.warehouse_code,
b.warehouse_id,
b.storage_location_name,
b.lot_no,
b.piece_count,
b.material_base_info_id,
b.outbound_quantity,
b.box_pallet_no
FROM reservation_out_material_detail b
WHERE b.del_flag = 1
AND b.out_order_number = (SELECT out_order_number FROM reservation_stock_out_order WHERE out_order_id = #{outOrderId} AND del_flag = 1)
ORDER BY b.material_detail_id
</select>
<!-- 明细结果映射 -->
<resultMap type="com.mhd.oms.domain.reservationOutMaterialDetail.repository.po.ReservationOutMaterialDetailPO" id="OutMaterialDetailResult">
<result property="batchNumber" column="batch_number"/>
<result property="materialCode" column="material_code"/>
<result property="materialName" column="material_name"/>
<result property="specificationModel" column="specification_model"/>
<result property="quantity" column="quantity"/>
<result property="unitName" column="unit_name"/>
<result property="packName" column="pack_name"/>
<result property="warehouseCode" column="warehouse_code"/>
<result property="warehouseId" column="warehouse_id"/>
<result property="storageLocationName" column="storage_location_name"/>
<result property="lotNo" column="lot_no"/>
<result property="pieceCount" column="piece_count"/>
<result property="materialBaseInfoId" column="material_base_info_id"/>
<result property="outboundQuantity" column="outbound_quantity"/>
<result property="boxPalletNo" column="box_pallet_no"/>
</resultMap>
</mapper>