每日排产计划修改

Lius

2024-12-31 c8673cbde4538b109e43042dc93cf33c46dca37e

每日排产计划修改

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java

@@ -105,6 +105,7 @@

    /**
     * 导出list
     *
     * @param mdcEquipment
     * @return
     */
@@ -112,6 +113,7 @@

    /**
     * 查询单表数据
     *
     * @param tableName
     * @return
     */
@@ -120,8 +122,18 @@

    /**
     * 根据id获取设备信息
     *
     * @param id
     * @return
     */
    MdcEquipmentDetailedDto findById(@Param("id") String id);

    /**
     * 根据产线id查询设备id集合
     *
     * @param productionId
     * @return
     */
    List<String> queryIdsByProduction(@Param("productionId") String productionId);

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml

@@ -276,4 +276,15 @@
            t1.id = #{ id }
    </select>

    <!--根据产线id查询设备id集合-->
    <select id="queryIdsByProduction" resultType="java.lang.String">
        SELECT
            me.equipment_id
        FROM
            mdc_equipment me
            LEFT JOIN mdc_production_equipment mpe ON me.id = mpe.equipment_id
        WHERE
            mpe.production_id = #{ productionId }
    </select>

</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductDayScheduleServiceImpl.java

@@ -12,10 +12,10 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * @author Lius
@@ -29,6 +29,8 @@

    @Resource
    private MdcEquipmentMapper mdcEquipmentMapper;

    private final List<String> equipments = Stream.of("5045-7110", "5045-7115", "5045-7118").collect(Collectors.toList());


    @Override
@@ -50,8 +52,19 @@
        map.put("5899-8061", "1818119019862515714");
        for (ProductDayschedule c : list) {
            if (map.containsKey(c.getEquipmentId())) {
                List<String> productionIds = Arrays.asList(map.get(c.getEquipmentId()).split(","));
                List<String> equipmentList = mdcEquipmentMapper.queryIdsByProductions(productionIds);
                String productionId = map.get(c.getEquipmentId());
                List<String> equipmentList = new ArrayList<>();
                if ("5899-8060".equals(c.getEquipmentId()) && "后传动箱壳体".equals(c.getProductName())) {
                    // 3.8.11号机 后传动箱壳体
                    equipmentList = equipments;
                } else if ("5899-8060".equals(c.getEquipmentId()) && "传动箱壳体".equals(c.getProductName())) {
                    // 除 3.8.11号机之外 传动箱壳体
                    List<String> queryIdsByProduction = mdcEquipmentMapper.queryIdsByProduction(productionId);
                    equipmentList = queryIdsByProduction.stream().filter(equipment -> !equipments.contains(equipment)).collect(Collectors.toList());
                } else {
                    equipmentList = mdcEquipmentMapper.queryIdsByProduction(productionId);
                }

                if (equipmentList != null && !equipmentList.isEmpty()) {
                    for (String equipmentId : equipmentList) {
                        MdcProductDayschedule mdc = new MdcProductDayschedule();