拌合站接口H5页面接口

张磊磊

2023-11-15 75f957d38bd6b151ef3dcaeba85b6a5720d28833

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java

@@ -5,10 +5,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
import com.thhy.materials.modules.biz.concret.entity.TMixing;
import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
import com.thhy.materials.modules.biz.concret.entity.*;
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
import com.thhy.materials.modules.biz.concret.mapper.TMaterialReleaseMappper;
@@ -232,11 +229,21 @@

    @Override
    public BasicResult mixingList(HashMap<String, Object> values) {
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
//        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
//        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
//        PageHelper.startPage(pageNum,pageSize);
        List<TMixing> mixings = materialReleaseMappper.mixingList(values);
        PageInfo<TMixing> tMixingPageInfo = new PageInfo<>(mixings);
        return BasicResult.success(tMixingPageInfo);
        //PageInfo<TMixing> tMixingPageInfo = new PageInfo<>(mixings);
        return BasicResult.success(mixings);
    }

    @Override
    public BasicResult siloList(Integer types) {
        List<TSilo> tSilos = materialReleaseMappper.siloList(types);
        for (TSilo silo :tSilos){
            TMixing mixings = materialReleaseMappper.mixingLists(silo.getSiloId());
            silo.setMixing(mixings);
        }
        return BasicResult.success(tSilos);
    }
}