小功能调整

value

2024-06-12 3a68e3ba8e4838b2ca9750399225105b4d028591

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java

@@ -2,6 +2,7 @@

import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -26,6 +27,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

/**
@@ -62,6 +65,8 @@

    private InsFiberMapper insFiberMapper;

    CustomMapper customMapper;


    //获取检验下单数据
    @Override
@@ -78,7 +83,11 @@
                sampleOrderDto.setCreateUser(map1.get("userId"));
            }else {
                //组织
                sampleOrderDto.setCompany(user.getCompany());
                try {
                    sampleOrderDto.setCompany(customMapper.selectById(user.getCompany()).getCompany());
                }catch (NullPointerException e){
                    throw new ErrorException("找不到所属单位");
                }
            }
        }
        Map<String, Object> map = new HashMap<>();
@@ -97,7 +106,7 @@
        insOrderMapper.updateById(insOrder);
        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
        List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getState, 1).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getState, 1).isNull(InsProduct::getInsFibersId).isNull(InsProduct::getInsFiberId).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
        for (InsProduct insProduct : insProducts) {
            InsOrderState insOrderState = new InsOrderState();
            insOrderState.setInsOrderId(orderId);
@@ -121,24 +130,42 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
    public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing) {
        insOrder.setState(0);
        String code = insOrderMapper.getLaboratoryCode(insOrder.getLaboratory());
        insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
        String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
        insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyMMdd"));
        insOrderMapper.insert(insOrder);
        AtomicInteger count = new AtomicInteger();
        list.forEach(a -> {
            count.getAndIncrement();
            a.setId(null);
            a.setInsOrderId(insOrder.getId());
            if (StrUtil.isEmpty(a.getSampleCode())) {
                a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
                a.setSampleCode(insOrder.getEntrustCode().split("-")[2]+insOrder.getEntrustCode().split("-")[3]+"-"+count.get());
            }
            insSampleMapper.insert(a);
            if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
                addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
            }
            if(ObjectUtil.isNotEmpty(a.getChildSampleList())){
                for (SampleProductDto b : a.getChildSampleList()) {
                    for (int i = 0; i < b.getNum(); i++) {
                        b.setId(null);
                        b.setInsOrderId(insOrder.getId());
                        b.setParentId(a.getId());
                        if (StrUtil.isEmpty(b.getSampleCode())) {
                            b.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
                        }
                        insSampleMapper.insert(b);
                        if (ObjectUtil.isNotEmpty(b.getInsProduct())) {
                            addInsProductMethod(b.getId(), b.getInsProduct(), null, 0);
                        }
                    }
                }
            }
            if (ObjectUtil.isNotEmpty(a.getBushing())) {
                for (BushingDto bushingDto : a.getBushing()) {
                    bushingDto.setInsSampleId(a.getInsOrderId());
                    bushingDto.setInsSampleId(a.getId());
                    insBushingMapper.insert(bushingDto);
                    if(bushingDto.getFiber().size()!=0){
                        for (FiberDto fiberDto : bushingDto.getFiber()) {
@@ -149,6 +176,7 @@
                    }else{
                        for (FibersDto fibersDto : bushingDto.getFibers()) {
                            fibersDto.setInsBushingId(bushingDto.getId());
                            fibersDto.setCode(giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
                            insFibersMapper.insert(fibersDto);
                            for (FiberDto fiberDto : fibersDto.getFiber()) {
                                fiberDto.setInsFibersId(fibersDto.getId());
@@ -161,12 +189,22 @@
                }
            }
        });
        for (List<Integer> i : pairing) {
            SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class);
            sample.setSampleCode(list.get(i.get(0)-1).getSampleCode() + "/" +list.get(i.get(1)-1).getSampleCode());
            sample.setId(null);
            insSampleMapper.insert(sample);
            InsProduct insProduct = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "熔接损耗")).findFirst().get();
            insProduct.setId(null);
            insProduct.setInsSampleId(sample.getId());
            insProductMapper.insert(insProduct);
        }
        return insOrder.getId();
    }

    private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
        for (InsProduct product : productList) {
            if(product.getState()==1){
            if(product.getState()==1 && !product.getInspectionItem().equals("熔接损耗")){
                switch (type){
                    case 1:
                        product.setInsFibersId(id);
@@ -193,7 +231,7 @@
    public Map<String, Object> getInsOrder(Integer id) {
        Map<String, Object> map = new HashMap<>();
        InsOrder insOrder = insOrderMapper.selectById(id);
        List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId(id);
        List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId2(id);
        map.put("insOrder", insOrder);
        map.put("sampleProduct", list);
        return map;