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

shishuaikang

2023-12-05 689a2a39f649ea277bbd9399031df96bc865526a

 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;
@@ -256,15 +257,19 @@
    @Override
    @Transactional
    public BasicResult mixingConsumeIn(Map<String, Object> values) {
        values.put("mixingSignboardId","");
        materialReleaseMappper.mixingConsumeIn(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);
            mixingConsume.put("star",star+1);
            mixingConsume.put("mixingConsumeId","");
            if(star!=null){
                mixingConsume.put("star",star+1);
            }else {
                mixingConsume.put("star",1);
            }
            //mixingConsume.put("mixingConsumeId","");
            materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
        }
        return BasicResult.success();
@@ -278,6 +283,7 @@
        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);
        }
@@ -320,4 +326,29 @@
        }
        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();
    }
}