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

zhangchao

2024-07-20 48db618606f0f0cafd1ce795f8bf26a0bcec2581

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -1,8 +1,10 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
@@ -56,9 +58,10 @@


    @Override
    public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
    public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
        System.out.println(JSONObject.toJSON(page));
        page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
        page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
        return page;
    }