Changes11

Fixiaobai

2023-11-12 17eb62f9d9cb2706296ea35f241dd8aafbebd6f2

Changes11

 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java

@@ -255,6 +255,12 @@
    @ApiModelProperty(value = "是否原材料检")
    private Integer testRuleType;

    @Alias("域")
    private String  domainNo;

    @Alias("域描述")
    private String domainName;

    @Alias("是否设备备件")
    private String isEquipment;


 mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java

@@ -551,6 +551,8 @@
            no.add(rawList.get(1));
            part.setPartName(rawList.get(2));
            part.setDescription(rawList.get(3));
            part.setDomainNo(rawList.get(4));
            part.setDomainName(rawList.get(5));
            part.setMaterialType(rawList.get(6));
            part.setUnit(rawList.get(8));
            part.setAssets(rawList.get(16));

 mes-basic/src/main/resources/mapper/PartMapper.xml

@@ -52,6 +52,8 @@
        <result property="examiner" column="examiner"/>
        <result property="prodName" column="prod_name"/>
        <result property="partPitch" column="part_pitch"/>
        <result property="domainNo" column="domain_no"/>
        <result property="domainName" column="domain_name"/>
    </resultMap>

    <sql id="partPage">

 mes-technology/src/main/java/com/chinaztt/mes/technology/entity/Structure.java

@@ -130,6 +130,7 @@
    @ApiModelProperty(value = "是否同步ifs")
    private Boolean ifsSync;


    private String sharpenerNo;

    private String caveNum;

 mes-technology/src/main/java/com/chinaztt/mes/technology/excel/StructureData.java

@@ -28,6 +28,9 @@
    @ExcelProperty(value = "消耗工序")
    private String operationName;

    @ExcelProperty(value = "数量")
    private String totalNUm;

    @ExcelProperty(value = "模具编号")
    private String sharpenerNo;


 mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/StructureServiceImpl.java

@@ -55,6 +55,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;

@@ -85,6 +86,8 @@
    private NumberGenerator<Structure> numberGenerator;
    private DictUtils dictUtils;
    private IfsFeignClient ifsFeignClient;
    @Autowired
    private PlatformTransactionManager transactionManager;

    private RedisTemplate redisTemplate;
    @Autowired
@@ -269,6 +272,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importExcel(List<StructureData> list) {
        list.forEach(System.out::println);
        String key = "syncStructure_lock" + SecurityUtils.getUser().getId();
        if (redisTemplate.hasKey(key)) {
            throw new RuntimeException("有导入任务正在处理");
@@ -302,6 +306,16 @@
                structure.setBomTypeDb("M");
                structure.setIfsSync(false);
                structure.setAlternativeNo("*");
                structure.setSharpenerNo(data.getSharpenerNo());
                structure.setCaveNum(data.getCaveNum());
                structure.setGramWeight(data.getGramWeight());
                structure.setMoldingCycle(data.getMoldingCycle());
                structure.setMachine(data.getMachine());
                structure.setScale(data.getScale());
                structure.setDryingTime(data.getDryingTime());
                structure.setDryingTemperature(data.getDryingTemperature());
                structure.setPackingInfo(data.getPackingInfo());
                structure.setCustom(data.getCustom());
                baseMapper.insert(structure);
            }
            List<Part> childParts = partMapper.selectList(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, data.getSonPartNo()));
@@ -319,7 +333,7 @@
            QueryWrapper<StructureComponent> queryWrapper = new QueryWrapper<>();
            queryWrapper.lambda().select(StructureComponent::getLineItemNo).eq(StructureComponent::getStructureId,structure.getId()).orderByDesc(StructureComponent::getLineItemNo);
            List<StructureComponent> structureComponents = structureComponentMapper.selectList(queryWrapper);
            component.setQpa(new BigDecimal(1));// todo: 产品结构导入数量,还缺一个行号
            component.setQpa(new BigDecimal(data.getTotalNUm()));// todo: 产品结构导入数量,还缺一个行号
            Console.log("值===》"+structureComponents);
            if(structureComponents.size()<1){
                component.setLineItemNo(1);