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

feat(oms,wms): 入库/出库业务单执行单与WMS出入库各页面列表返回计划数量与实际数量总和(全量不分页合计)

Browse Source 
- OMS入库业务单/执行单: list/list1返回totalPlanQuantity/totalInQuantity(与行quantity/in_quantity列同源)
- WMS入库/收货/上架: 返回totalPlanQuantity/totalInQuantity(上架计划数量=明细应上架量; 入库数量=收货/上架数量, 与行列同口径)
- WMS出库/拣货/复核/交接: 返回totalPlanQuantity/totalOutboundQuantity(各页实际量列同口径; 复核明细聚合不滤del_flag兼容已反审tab)
- 合计SQL与queryList同条件片段/同JOIN结构, 分页查询后同一DO查询, 响应与total同层级追加字段, 前端纯增量兼容
This commit is contained in:
rcx
2026-09-14 18:02:57 +08:00
parent e59173b3f9
commit 50423b4e4b
69 changed files with 1033 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/facade/IExecutionStockInOrderService.java
+6
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailPO;
import com.mhd.oms.domain.executionStockInOrder.entity.ExecutionStockInOrder;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderTotalPO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO;
import com.mhd.oms.domain.executionStockInOrder.repository.vo.DeliveryDataDTO;
import com.mhd.oms.domain.executionStockInOrder.repository.vo.StockInDataDTO;
@@ -25,6 +26,11 @@ public interface IExecutionStockInOrderService extends IService<ExecutionStockIn
*/
public List<ExecutionStockInOrderPO> queryList(ExecutionStockInOrderDO stockInOrderDO);
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
public ExecutionStockInOrderTotalPO queryListTotal(ExecutionStockInOrderDO stockInOrderDO);
/**
* 新增入库单
*/
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/mapper/ExecutionStockInOrderMapper.java
+6
View File
@@ -7,6 +7,7 @@ import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialBaseInfoPO
import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialGoodsRulePO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialWarehouseControlPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderTotalPO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO;
//import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ExecutionInMaterialDetailPO;
import org.apache.ibatis.annotations.Param;
@@ -27,6 +28,11 @@ public interface ExecutionStockInOrderMapper extends BaseMapper<ExecutionStockIn
*/
public List<ExecutionStockInOrderPO> queryList(ExecutionStockInOrderDO stockInOrderDO);
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
public ExecutionStockInOrderTotalPO queryListTotal(ExecutionStockInOrderDO stockInOrderDO);
public MaterialBaseInfoPO getinfo(@Param("id") Long id);
public MaterialBaseInfoPO getByName(@Param("name") String name);
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/persistence/ExecutionStockInOrderImpl.java
+10
View File
@@ -26,6 +26,7 @@ import com.mhd.oms.domain.executionStockInOrder.repository.listener.StockInExcel
import com.mhd.oms.domain.executionStockInOrder.repository.mapper.ExecutionStockInOrderMapper;
import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialBaseInfoPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderTotalPO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO;
import com.mhd.oms.domain.executionStockInOrder.repository.vo.*;
import com.mhd.oms.domain.executionStockOutOrder.entity.ExecutionStockOutOrder;
@@ -93,6 +94,15 @@ public class ExecutionStockInOrderImpl extends ServiceImpl<ExecutionStockInOrder
return stockInOrderMapper.queryList(stockInOrderDO);
}
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
@Override
public ExecutionStockInOrderTotalPO queryListTotal(ExecutionStockInOrderDO stockInOrderDO)
{
return stockInOrderMapper.queryListTotal(stockInOrderDO);
}
/**
* 新增入库单
*/
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/po/ExecutionStockInOrderTotalPO.java
+30
View File
@@ -0,0 +1,30 @@
package com.mhd.oms.domain.executionStockInOrder.repository.po;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 入库执行单列表合计PO
*
* <p>当前筛选条件下不分页的全量合计，随分页列表一起返回
* （totalPlanQuantity/totalInQuantity），计划数量与入库数量分开计算</p>
*
* @author rcx
* @date 2026-09-14
*/
@Data
@ApiModel(value = "入库执行单列表合计对象", description = "入库执行单列表合计响应对象")
public class ExecutionStockInOrderTotalPO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("计划数量总数")
private BigDecimal totalPlanQuantity;
@ApiModelProperty("入库数量总数")
private BigDecimal totalInQuantity;
}
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderApplicationService.java
+10
View File
@@ -18,6 +18,7 @@ import com.mhd.oms.domain.executionStockInOrder.entity.ExecutionStockInOrder;
import com.mhd.oms.domain.executionStockInOrder.repository.mapper.ExecutionStockInOrderMapper;
import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialBaseInfoPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderTotalPO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDTO;
import com.mhd.oms.domain.executionStockInOrder.repository.vo.GwInDetail;
@@ -172,6 +173,15 @@ public class ExecutionStockInOrderApplicationService {
return stockInOrderDomainService.queryList(stockInOrderDO);
}
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量。
* 须在 queryList/queryList1 之后用同一个DO调用：数据权限条件由列表查询原地写入DO，
* 合计查询才能继承生效后的筛选；且 PageHelper startPage 只拦截下一条SQL，本查询不会被分页。
*/
public ExecutionStockInOrderTotalPO queryListTotal(ExecutionStockInOrderDO stockInOrderDO) {
return stockInOrderDomainService.queryListTotal(stockInOrderDO);
}
/**
* 新增入库单
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java
+8
View File
@@ -30,6 +30,7 @@ import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialBaseInfoPO
import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialGoodsRulePO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialWarehouseControlPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderTotalPO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO;
import com.mhd.oms.domain.executionStockOutOrder.entity.ExecutionStockOutOrder;
import com.mhd.oms.domain.executionStockOutOrder.repository.facade.IExecutionStockOutOrderService;
@@ -113,6 +114,13 @@ public class ExecutionStockInOrderDomainService {
return stockInOrderService.queryList(stockInOrderDO);
}
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
public ExecutionStockInOrderTotalPO queryListTotal(ExecutionStockInOrderDO stockInOrderDO) {
return stockInOrderService.queryListTotal(stockInOrderDO);
}
/**
* 从单号列表中提取最大序号
* 单号格式: prefix + 数字序号（如 RK260807001 中 prefix=RK260807, 序号=001）
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/facade/IReservationStockInOrderService.java
+6
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderTotalPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
import com.mhd.oms.domain.reservationStockInOrder.repository.vo.DeliveryDataDTO;
import com.mhd.oms.domain.reservationStockInOrder.repository.vo.SheetImportResultDTO;
@@ -26,6 +27,11 @@ public interface IReservationStockInOrderService extends IService<ReservationSto
*/
public List<ReservationStockInOrderPO> queryList(ReservationStockInOrderDO stockInOrderDO);
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
public ReservationStockInOrderTotalPO queryListTotal(ReservationStockInOrderDO stockInOrderDO);
/**
* 新增入库单
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
+6
View File
@@ -8,6 +8,7 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfo
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialGoodsRulePO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialWarehouseControlPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderTotalPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
import org.apache.ibatis.annotations.Param;
@@ -27,6 +28,11 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
*/
public List<ReservationStockInOrderPO> queryList(ReservationStockInOrderDO stockInOrderDO);
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
public ReservationStockInOrderTotalPO queryListTotal(ReservationStockInOrderDO stockInOrderDO);
public MaterialBaseInfoPO getinfo(@Param("id") Long id);
public MaterialBaseInfoPO getByName(@Param("name") String name);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+10
View File
@@ -34,6 +34,7 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.listener.StockInExc
import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderTotalPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
import com.mhd.oms.domain.reservationStockInOrder.repository.vo.*;
import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrderDomainService;
@@ -106,6 +107,15 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
return stockInOrderMapper.queryList(stockInOrderDO);
}
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
@Override
public ReservationStockInOrderTotalPO queryListTotal(ReservationStockInOrderDO stockInOrderDO)
{
return stockInOrderMapper.queryListTotal(stockInOrderDO);
}
/**
* 新增入库单
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderTotalPO.java
+30
View File
@@ -0,0 +1,30 @@
package com.mhd.oms.domain.reservationStockInOrder.repository.po;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 入库业务单列表合计PO
*
* <p>当前筛选条件下不分页的全量合计，随分页列表一起返回
* （totalPlanQuantity/totalInQuantity），计划数量与入库数量分开计算</p>
*
* @author rcx
* @date 2026-09-14
*/
@Data
@ApiModel(value = "入库业务单列表合计对象", description = "入库业务单列表合计响应对象")
public class ReservationStockInOrderTotalPO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("计划数量总数")
private BigDecimal totalPlanQuantity;
@ApiModelProperty("入库数量总数")
private BigDecimal totalInQuantity;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+10
View File
@@ -26,6 +26,7 @@ import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder
import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderTotalPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDTO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderImportRowDTO;
@@ -184,6 +185,15 @@ public class ReservationStockInOrderApplicationService {
return stockInOrderDomainService.queryList(stockInOrderDO);
}
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量。
* 须在 queryList/queryList1 之后用同一个DO调用：数据权限条件由列表查询原地写入DO，
* 合计查询才能继承生效后的筛选；且 PageHelper startPage 只拦截下一条SQL，本查询不会被分页。
*/
public ReservationStockInOrderTotalPO queryListTotal(ReservationStockInOrderDO stockInOrderDO) {
return stockInOrderDomainService.queryListTotal(stockInOrderDO);
}
/**
* 新增入库单
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+8
View File
@@ -36,6 +36,7 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfo
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialGoodsRulePO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialWarehouseControlPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderTotalPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService;
@@ -106,6 +107,13 @@ public class ReservationStockInOrderDomainService {
return stockInOrderService.queryList(stockInOrderDO);
}
/**
* 列表合计：按查询条件全量(不分页)汇总计划数量与入库数量
*/
public ReservationStockInOrderTotalPO queryListTotal(ReservationStockInOrderDO stockInOrderDO) {
return stockInOrderService.queryListTotal(stockInOrderDO);
}
/**
* 生成入库预约单号
*/
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockInOrder/ExecutionStockInOrderApi.java
+28 -6
View File
@@ -2,10 +2,11 @@ package com.mhd.oms.interfaces.facade.executionStockInOrder;
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.github.pagehelper.PageInfo;
import com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailPO;
import com.mhd.oms.domain.executionStockInOrder.repository.facade.IExecutionStockInOrderService;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderPO;
import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderTotalPO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO;
import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDTO;
import com.mhd.oms.domain.executionStockInOrder.repository.vo.DeliveryDataDTO;
@@ -44,17 +45,19 @@ public class ExecutionStockInOrderApi extends BaseController {
private IExecutionStockInOrderService reservationStockInOrderService;
/**
* 分页查询入库单列表
* 分页查询入库单列表（附：当前查询条件下全量不分页的计划数量总数/入库数量总数）
*/
@ApiOperation("查询入库单列表")
@GetMapping("/list")
public TableDataInfo list(ExecutionStockInOrderDTO stockInOrderDTO)
public HashMap<String, Object> list(ExecutionStockInOrderDTO stockInOrderDTO)
{
//转换实体
ExecutionStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
startPage();
List<ExecutionStockInOrderPO> list = stockInOrderApplicationService.queryList(stockInOrderDO);
return getDataTable(list);
// 合计须在列表查询后用同一个DO查询：数据权限条件由列表查询原地写入DO，且不再被分页拦截
ExecutionStockInOrderTotalPO total = stockInOrderApplicationService.queryListTotal(stockInOrderDO);
return getDataTableWithTotal(list, total);
}
/**
@@ -271,13 +274,32 @@ public class ExecutionStockInOrderApi extends BaseController {
@ApiOperation("查询入库单列表")
@GetMapping("/list1")
public TableDataInfo list1(ExecutionStockInOrderDTO stockInOrderDTO)
public HashMap<String, Object> list1(ExecutionStockInOrderDTO stockInOrderDTO)
{
//转换实体
ExecutionStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
startPage();
List<ExecutionStockInOrderPO> list = stockInOrderApplicationService.queryList1(stockInOrderDO);
return getDataTable(list);
// 合计须在列表查询后用同一个DO查询：数据权限条件由列表查询原地写入DO，且不再被分页拦截
ExecutionStockInOrderTotalPO total = stockInOrderApplicationService.queryListTotal(stockInOrderDO);
return getDataTableWithTotal(list, total);
}
/**
* 分页结果 + 合计：data/total/code/msg 之外追加计划数量总数/入库数量总数（key与TableDataInfo序列化结果一致，仅多两个字段）
* 注：本类已导入spring的HttpStatus，common的HttpStatus用全限定名避免冲突
*/
private HashMap<String, Object> getDataTableWithTotal(List<?> list, ExecutionStockInOrderTotalPO total) {
HashMap<String, Object> result = new HashMap<>();
result.put("data", list);
result.put("total", new PageInfo<>(list).getTotal());
result.put("code", com.mhd.common.core.constant.HttpStatus.SUCCESS);
result.put("msg", "查询成功");
if (total != null) {
result.put("totalPlanQuantity", total.getTotalPlanQuantity());
result.put("totalInQuantity", total.getTotalInQuantity());
}
return result;
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java
+28 -6
View File
@@ -2,10 +2,11 @@ package com.mhd.oms.interfaces.facade.reservationStockInOrder;
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.github.pagehelper.PageInfo;
import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.facade.IReservationStockInOrderService;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderTotalPO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDTO;
import com.mhd.oms.domain.reservationStockInOrder.repository.vo.DeliveryDataDTO;
@@ -49,17 +50,19 @@ public class ReservationStockInOrderApi extends BaseController {
private IReservationStockInOrderService reservationStockInOrderService;
/**
* 分页查询入库单列表
* 分页查询入库单列表（附：当前查询条件下全量不分页的计划数量总数/入库数量总数）
*/
@ApiOperation("查询入库单列表")
@GetMapping("/list")
public TableDataInfo list(ReservationStockInOrderDTO stockInOrderDTO)
public HashMap<String, Object> list(ReservationStockInOrderDTO stockInOrderDTO)
{
//转换实体
ReservationStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
startPage();
List<ReservationStockInOrderPO> list = stockInOrderApplicationService.queryList(stockInOrderDO);
return getDataTable(list);
// 合计须在列表查询后用同一个DO查询：数据权限条件由列表查询原地写入DO，且不再被分页拦截
ReservationStockInOrderTotalPO total = stockInOrderApplicationService.queryListTotal(stockInOrderDO);
return getDataTableWithTotal(list, total);
}
/**
@@ -317,13 +320,32 @@ public class ReservationStockInOrderApi extends BaseController {
@ApiOperation("查询入库单列表")
@GetMapping("/list1")
public TableDataInfo list1(ReservationStockInOrderDTO stockInOrderDTO)
public HashMap<String, Object> list1(ReservationStockInOrderDTO stockInOrderDTO)
{
//转换实体
ReservationStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
startPage();
List<ReservationStockInOrderPO> list = stockInOrderApplicationService.queryList1(stockInOrderDO);
return getDataTable(list);
// 合计须在列表查询后用同一个DO查询：数据权限条件由列表查询原地写入DO，且不再被分页拦截
ReservationStockInOrderTotalPO total = stockInOrderApplicationService.queryListTotal(stockInOrderDO);
return getDataTableWithTotal(list, total);
}
/**
* 分页结果 + 合计：data/total/code/msg 之外追加计划数量总数/入库数量总数（key与TableDataInfo序列化结果一致，仅多两个字段）
* 注：本类已导入spring的HttpStatus，common的HttpStatus用全限定名避免冲突
*/
private HashMap<String, Object> getDataTableWithTotal(List<?> list, ReservationStockInOrderTotalPO total) {
HashMap<String, Object> result = new HashMap<>();
result.put("data", list);
result.put("total", new PageInfo<>(list).getTotal());
result.put("code", com.mhd.common.core.constant.HttpStatus.SUCCESS);
result.put("msg", "查询成功");
if (total != null) {
result.put("totalPlanQuantity", total.getTotalPlanQuantity());
result.put("totalInQuantity", total.getTotalInQuantity());
}
return result;
}
@ApiOperation("生成入库预约单号")
mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml
+11
View File
@@ -532,6 +532,17 @@
ORDER BY a.create_time IS NULL, a.create_time DESC
</select>
<!-- 列表合计：按查询条件(与queryList同条件片段)全量不分页汇总计划数量与入库数量，两口径分开计算；与列表行的quantity/in_quantity列同源，底部总和与列值之和一致 -->
<select id="queryListTotal" parameterType="com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO" resultType="com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOrderTotalPO">
select
coalesce(sum(a.quantity), 0) as totalPlanQuantity,
coalesce(sum(a.in_quantity), 0) as totalInQuantity
from execution_stock_in_order a
<where>
<include refid="selectStockInOrderPo1"/>
</where>
</select>
<select id="getinfo" parameterType="java.lang.Long" resultType="com.mhd.oms.domain.executionStockInOrder.repository.po.MaterialBaseInfoPO">
select * from "NGWL_TEST_WMS".MATERIAL_BASE_INFO where 1 = 1 and DEL_FLAG = 1 and MATERIAL_BASE_INFO_ID = #{id}
</select>
mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+11
View File
@@ -539,6 +539,17 @@
ORDER BY a.create_time IS NULL, a.create_time DESC
</select>
<!-- 列表合计：按查询条件(与queryList同条件片段)全量不分页汇总计划数量与入库数量，两口径分开计算；与列表行的quantity/in_quantity列同源，底部总和与列值之和一致 -->
<select id="queryListTotal" parameterType="com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderTotalPO">
select
coalesce(sum(a.quantity), 0) as totalPlanQuantity,
coalesce(sum(a.in_quantity), 0) as totalInQuantity
from reservation_stock_in_order a
<where>
<include refid="selectStockInOrderPo1"/>
</where>
</select>
<select id="getinfo" parameterType="java.lang.Long" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">
select * from "NGWL_TEST_WMS".MATERIAL_BASE_INFO where 1 = 1 and DEL_FLAG = 1 and MATERIAL_BASE_INFO_ID = #{id}
</select>