Merge branch 'master' of http://111.30.93.211:10101/r/supipe

张晓波

2023-12-11 0d0968ec2d1a39c21e15e447c4f2227f70d6a11b

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

@@ -1,5 +1,6 @@
package com.thhy.materials.modules.biz.concret.service.impl;

import com.alibaba.nacos.api.utils.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
@@ -213,7 +214,7 @@
        PageHelper.startPage(pageNum,pageSize);
        List<PieceDto> pieceDtos =  materialReleaseMappper.pieceList(values);
        for (PieceDto pieceDto : pieceDtos){
            List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById());
            List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById(),pieceDto.getTypes());
            pieceDto.setRawMaterials(rawMaterials);
        }
        PageInfo<PieceDto> pieceDtoPageInfo = new PageInfo<>(pieceDtos);
@@ -222,8 +223,14 @@

    @Override
    public BasicResult mixingInsert(HashMap<String, Object> values) {
        values.put("mixingId","");
        materialReleaseMappper.mixingInsert(values);
        List<Map<String,Object>> mixingList = (List<Map<String,Object>>) values.get("mixingList");
        for (Map<String,Object> mixing : mixingList){
            materialReleaseMappper.mixingUpdateType(mixing.get("siloId").toString());
            mixing.put("types",1);
            mixing.put("mixingId","");
            mixing.put("stata",2);
            materialReleaseMappper.mixingInsert(mixing);
        }
        return BasicResult.success();
    }

@@ -246,4 +253,102 @@
        }
        return BasicResult.success(tSilos);
    }

    @Override
    @Transactional
    public BasicResult mixingConsumeIn(Map<String, Object> values) {
//        values.put("mixingSignboardId","");
//        materialReleaseMappper.mixingConsumeIn(values);
        String mixingSignboardId = values.get("mixingSignboardId").toString();
        Integer star = materialReleaseMappper.starInt();
        List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume");
        for (Map<String,Object> mixingConsume :mixingConsumes){
            mixingConsume.put("mixingSignboardId",mixingSignboardId);
            if(star!=null){
                mixingConsume.put("star",star+1);
            }else {
                mixingConsume.put("star",1);
            }
            //mixingConsume.put("mixingConsumeId","");
            materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
        }
        return BasicResult.success();
    }

    @Override
    public BasicResult mixingConsumeList(Map<String, Object> values) {
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
        List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingSignboardList(values);
        for (TMixingSignboard mixingSignboard : mixingSignboards){
            Integer star = materialReleaseMappper.starIntSig(mixingSignboard.getMixingSignboardId());
            //values.put("")
            List<TMixingConsume> mixingConsumes = materialReleaseMappper.mixingConsumes(mixingSignboard.getMixingSignboardId(),star);
            mixingSignboard.setTMixingConsumes(mixingConsumes);
        }
        PageInfo<TMixingSignboard> tMixingSignboardPageInfo = new PageInfo<>(mixingSignboards);
        return BasicResult.success(tMixingSignboardPageInfo);
    }

    @Override
    public BasicResult mixingConsumePull() {
        List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingConsumePull();
        return BasicResult.success(mixingSignboards);
    }

    @Override
    public BasicResult siloPull() {
        List<TSilo> silos = materialReleaseMappper.siloPull();
        return BasicResult.success(silos);
    }

    @Override
    public BasicResult siloMixingList(Map<String, Object> values) {
        List<TMixing> tMixings =  materialReleaseMappper.siloMixingList(values);
        return BasicResult.success(tMixings);
    }

    @Override
    public BasicResult mixingUpdate(HashMap<String, Object> values) {
        List<Map<String,Object>> mixingList = (List<Map<String,Object>>) values.get("mixingList");
        for (Map<String,Object> mixing : mixingList){
            materialReleaseMappper.mixingUpdate(mixing);
        }
        return BasicResult.success();
    }

    @Override
    public BasicResult mixingDel(HashMap<String, Object> values) {
        List<String> mixingList = (List<String>) values.get("mixingIds");
        for (String mixingId : mixingList){
            materialReleaseMappper.mixingDel(mixingId);
        }
        return BasicResult.success();
    }

    @Override
    public BasicResult mixingConsumeUp(Map<String, Object> values) {
        String mixingSignboardId = values.get("mixingSignboardId").toString();
        Integer star = materialReleaseMappper.starInt();
        materialReleaseMappper.mixingConsumeDelSign(mixingSignboardId,star);
        List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume");
        for (Map<String,Object> mixingConsume :mixingConsumes){
            mixingConsume.put("mixingSignboardId",mixingSignboardId);
            mixingConsume.put("star",star);
            //mixingConsume.put("mixingConsumeId","");
            materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
        }
        return BasicResult.success();
    }

    @Override
    public BasicResult mixingConsumeDel(HashMap<String, Object> values) {
        Integer star = Integer.valueOf(values.get("star").toString());
        List<String> mixingConsumeIds = (List<String>) values.get("mixingConsumeIds");
        for (String mixingConsumeId : mixingConsumeIds){
            materialReleaseMappper.mixingConsumeDel(mixingConsumeId,star);
        }
        return BasicResult.success();
    }
}