oms小程序出入库明细查询;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java

@@ -278,6 +278,10 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "升")
     private BigDecimal liter;
 
+    @ApiModelProperty("单价")
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
+
     @ApiModelProperty("尺寸")
     @Excel(name = "尺寸")
     private String dimensions;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java

@@ -288,6 +288,10 @@ public class ReservationOutMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "升")
     private String liter;
 
+    @ApiModelProperty("单价")
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
+
     /**
      * 尺寸
      */

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/facade/IReserveStockInOrderService.java

@@ -23,6 +23,8 @@ public interface IReserveStockInOrderService extends IService<ReserveStockInOrde
      */
     public List<ReserveStockInOrderPO> queryList(ReserveStockInOrderDO stockInOrderDO);
 
+    public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO);
+
     public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO);
 
     /**

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/mapper/ReserveStockInOrderMapper.java

@@ -27,6 +27,8 @@ public interface ReserveStockInOrderMapper extends BaseMapper<ReserveStockInOrde
      */
     public List<ReserveStockInOrderPO> queryList(ReserveStockInOrderDO stockInOrderDO);
 
+    public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO);
+
     public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO);
 
     public MaterialBaseInfoPO getinfo(@Param("id") Long id);

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/persistence/ReserveStockInOrderImpl.java

@@ -37,6 +37,12 @@ public class ReserveStockInOrderImpl extends ServiceImpl<ReserveStockInOrderMapp
         return stockInOrderMapper.queryList(stockInOrderDO);
     }
 
+    @Override
+    public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO)
+    {
+        return stockInOrderMapper.detailsList(stockInOrderDO);
+    }
+
     @Override
     public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO)
     {

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java

@@ -169,6 +169,43 @@ public class ReserveStockInOrderApplicationService {
     }
 
 
+    public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null && loginUser.getUserPo() != null){
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            Long frontendOrganizationId = stockInOrderDO.getOrganizationId();
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                if (frontendOrganizationId != null) {
+                    stockInOrderDO.setOrganizationId(frontendOrganizationId);
+                    stockInOrderDO.setTopOrganizationId(null);
+                } else {
+                    stockInOrderDO.setOrganizationId(null);
+                    stockInOrderDO.setTopOrganizationId(null);
+                }
+            } else {
+                if (frontendOrganizationId != null && userOrganizationId != null) {
+                    if (!frontendOrganizationId.equals(userOrganizationId)) {
+                        stockInOrderDO.setOrganizationId(userOrganizationId);
+                    }
+                } else {
+                    if (userOrganizationId != null) {
+                        stockInOrderDO.setOrganizationId(userOrganizationId);
+                    }
+                }
+                if (stockInOrderDO.getOrganizationId() == null) {
+                    Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+                    if (topOrganizationId != null && topOrganizationId != 1) {
+                        stockInOrderDO.setTopOrganizationId(topOrganizationId);
+                    }
+                } else {
+                    stockInOrderDO.setTopOrganizationId(2827L);
+                }
+            }
+        }
+        return stockInOrderDomainService.detailsList(stockInOrderDO);
+    }
+
+
     /**
      * 分页查询入库单列表
      */

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java

@@ -86,6 +86,10 @@ public class ReserveStockInOrderDomainService {
         return stockInOrderService.queryList(stockInOrderDO);
     }
 
+    public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO) {
+        return stockInOrderService.detailsList(stockInOrderDO);
+    }
+
     public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO) {
         return stockInOrderService.inAndOutList(stockInOrderDO);
     }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/facade/IReserveStockOutOrderService.java

@@ -22,6 +22,8 @@ public interface IReserveStockOutOrderService extends IService<ReserveStockOutOr
      */
     public List<ReserveStockOutOrderPO> queryList(ReserveStockOutOrderDO stockOutOrderDO);
 
+    public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO);
+
     /**
      * 新增出库单
      */

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java

@@ -22,6 +22,8 @@ public interface ReserveStockOutOrderMapper extends BaseMapper<ReserveStockOutOr
      */
     public List<ReserveStockOutOrderPO> queryList(ReserveStockOutOrderDO stockOutOrderDO);
 
+    public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO);
+
     /**
      * 出库单提货单打印-表头
      */

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/persistence/ReserveStockOutOrderImpl.java

@@ -35,6 +35,12 @@ public class ReserveStockOutOrderImpl extends ServiceImpl<ReserveStockOutOrderMa
         return reservationStockOutOrderMapper.queryList(stockOutOrderDO);
     }
 
+    @Override
+    public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO)
+    {
+        return reservationStockOutOrderMapper.detailsList(stockOutOrderDO);
+    }
+
     /**
      * 新增出库单
      */

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java

@@ -205,6 +205,46 @@ public class ReserveStockOutOrderApplicationService {
         return stockOutOrderPOS;
     }
 
+    public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            Long frontendOrganizationId = stockOutOrderDO.getOrganizationId();
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                if (frontendOrganizationId != null) {
+                    stockOutOrderDO.setOrganizationId(frontendOrganizationId);
+                    stockOutOrderDO.setTopOrganizationId(null);
+                } else {
+                    stockOutOrderDO.setOrganizationId(null);
+                    stockOutOrderDO.setTopOrganizationId(null);
+                }
+            } else {
+                if (frontendOrganizationId != null && userOrganizationId != null) {
+                    if (!frontendOrganizationId.equals(userOrganizationId)) {
+                        stockOutOrderDO.setOrganizationId(userOrganizationId);
+                    }
+                } else {
+                    if (userOrganizationId != null) {
+                        stockOutOrderDO.setOrganizationId(userOrganizationId);
+                    }
+                }
+                if (stockOutOrderDO.getOrganizationId() == null) {
+                    Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+                    if (topOrganizationId != null && topOrganizationId != 1) {
+                        stockOutOrderDO.setTopOrganizationId(topOrganizationId);
+                    }
+                } else {
+                    stockOutOrderDO.setTopOrganizationId(2827L);
+                }
+            }
+        }
+
+        List<ReserveOutMaterialDetailPO> stockOutOrderPOS = stockOutOrderDomainService.detailsList(stockOutOrderDO);
+
+        return stockOutOrderPOS;
+    }
+
 
     /**
      * 新增出库单

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java

@@ -78,6 +78,10 @@ public class ReserveStockOutOrderDomainService {
         return stockOutOrderService.queryList(stockOutOrderDO);
     }
 
+    public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO) {
+        return stockOutOrderService.detailsList(stockOutOrderDO);
+    }
+
 
     /**
      * 新增出库单

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReserveStockOutOrder/ReserveStockOutOrderApi.java

@@ -67,6 +67,17 @@ public class ReserveStockOutOrderApi extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("查询出库单列表")
+    @GetMapping("/detailsList")
+    public TableDataInfo detailsList(ReserveStockOutOrderDTO stockOutOrderDTO)
+    {
+        //转换实体
+        ReserveStockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO);
+        startPage();
+        List<ReserveOutMaterialDetailPO> list = stockOutOrderApplicationService.detailsList(stockOutOrderDO);
+        return getDataTable(list);
+    }
+
 
     /**
      * 审核入库单

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reserveStockInOrder/ReserveStockInOrderApi.java

@@ -57,6 +57,20 @@ public class ReserveStockInOrderApi extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 分页查询入库单列表
+     */
+    @ApiOperation("查询入库单列表")
+    @GetMapping("/detailsList")
+    public TableDataInfo detailsList(ReserveStockInOrderDTO stockInOrderDTO)
+    {
+        //转换实体
+        ReserveStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
+        startPage();
+        List<ReserveInMaterialDetailPO> list = stockInOrderApplicationService.detailsList(stockInOrderDO);
+        return getDataTable(list);
+    }
+
     @ApiOperation("查询入库单列表")
     @GetMapping("/inAndOutList")
     public TableDataInfo inAndOutList(ReserveStockInOrderDTO stockInOrderDTO)