修改 9.21

zss

2023-09-21 2dbc49184bd74845c8da694c20d6fd03d7ac87e0

 inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java

@@ -6,17 +6,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.OrdersService;
import com.yuanchu.mom.service.SpecificationsService;
import com.yuanchu.mom.service.StandardService;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * 订单(Order)表服务实现类
@@ -46,13 +46,22 @@
    ManufactureOrderMapper manufactureOrderMapper;

    @Resource
    ManualTechnologyMapper manualTechnologyMapper;

    @Resource
    SpecificationsMapper specificationsMapper;
    ManualTechnologyService manualTechnologyService;

    @Resource
    TechnologyMapper technologyMapper;

    @Resource
    ProductMapper productMapper;

    @Resource
    MbomMapper mbomMapper;

    @Resource
    ManualProductService manualProductService;

    @Resource
    ManualMbomService manualMbomService;


    //查询所有订单列表
@@ -100,17 +109,54 @@
        queryWrapper.eq(Technology::getVersion,version);
        queryWrapper.orderByAsc(Technology::getFather);
        List<Technology> technologyList = technologyMapper.selectList(queryWrapper);
        for (Technology technology : technologyList) {
        List<ManualTechnology> manualTechnologyList = technologyList.stream().map(technology -> {
            ManualTechnology manualTechnology = ManualTechnology.builder()
                    .techname(technology.getName())
                    .techfather(technology.getFather())
                    .deviceGroup(technology.getDeviceGroup())
                    .manufactureOrderId(manufactureOrder.getId())
                    .productionQuota(technology.getProductionQuota())
                    .technologyId(technology.getId())
                    .techname(technology.getName()) //工艺
                    .techfather(technology.getFather()) //工序
                    .deviceGroup(technology.getDeviceGroup()) //生产设备组
                    .manufactureOrderId(manufactureOrder.getId()) //生产订单id
                    .productionQuota(technology.getProductionQuota()) //生产效率
                    .technologyId(technology.getId()) //标准bom中工艺路线id
                    .build();
            //新增编制工序表
            manualTechnologyMapper.insert(manualTechnology);
            return manualTechnology;
        }).collect(Collectors.toList());
        /*新增编制工艺表*/
        manualTechnologyService.saveBatch(manualTechnologyList);
        //根据标准bom的工艺路线id查询标准bom中的技术指标
        for (ManualTechnology manualTechnology : manualTechnologyList) {
            List<Product> productList = productMapper.selProByVerSpe(manualTechnology.getTechnologyId());
            List<ManualProduct> manualProducts = new ArrayList<>();
            for (Product product : productList) {
                ManualProduct manualProduct = ManualProduct.builder()
                        .manualTechnologyId(manualTechnology.getId()) //关联 生产订单id
                        .name(product.getName())
                        .father(product.getFather())
                        .unit(product.getUnit())
                        .required(product.getRequired())
                        .internal(product.getInternal())
                        .build();
                manualProducts.add(manualProduct);
            }
            /*新增编制技术指标表*/
            manualProductService.saveBatch(manualProducts);
        }
        //根据标准bom的工艺路线id查询标准bom中的物料清单
        for (ManualTechnology manualTechnology : manualTechnologyList) {
            List<Mbom> mbomList = mbomMapper.selectList(Wrappers.<Mbom>query().eq("technology_id",manualTechnology.getTechnologyId()));
            List<ManualMbom> manualMboms = new ArrayList<>();
            for (Mbom mbom : mbomList) {
                ManualMbom manualMbom = ManualMbom.builder()
                        .manualTechnologyId(manualTechnology.getId()) //关联 生产订单id
                        .name(mbom.getName())
                        .unit(mbom.getUnit())
                        .num(mbom.getNum())
                        .qualityTraceability(mbom.getQualityTraceability())
                        .specifications(mbom.getSpecifications())
                        .build();
                manualMboms.add(manualMbom);
            }
            /*新增编制物料清单表*/
            manualMbomService.saveBatch(manualMboms);
        }
    }

@@ -126,7 +172,7 @@
        //获取规格名称和型号名称
        String[] split = specification.split("-");
        String stName = split[0];
        String spName = split[1];
        String spName = split[1]+split[2];
        //获取规格id
        Standard standard = standardService.getOne(Wrappers.<Standard>query()
                .eq("name", stName)