Changes

Fixiaobai

2023-11-06 18e377d51d098c1a27ced15e808ad148d34af7ad

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

@@ -184,6 +184,18 @@
      bomComp.setPlanningMethod(structureTree.getPlanningMethod());
      bomComp.setColor(structureTree.getColor());
      bomComp.setOperationId(structureTree.getOperationId());

      bomComp.setSharpenerNo(structureTree.getSharpenerNo());
      bomComp.setCaveNum(structureTree.getCaveNum());
      bomComp.setGramWeight(structureTree.getGramWeight());
      bomComp.setGateGramWeight(structureTree.getGateGramWeight());
      bomComp.setMoldingCycle(structureTree.getMoldingCycle());
      bomComp.setMachine(structureTree.getMachine());
      bomComp.setScale(structureTree.getScale());
      bomComp.setDryingTime(structureTree.getDryingTime());
      bomComp.setDryingTemperature(structureTree.getDryingTemperature());
      bomComp.setPackingInfo(structureTree.getPackingInfo());

      bomComponentMapper.insert(bomComp);
      saveChildren(structureTree.getChildren(), bomComp.getId(), bom, structureTree.getPartId());
   }
@@ -227,6 +239,18 @@
         bomComp.setOperationId(child.getOperationId());
         bomComp.setPlanningMethod(child.getPlanningMethod());
         bomComp.setDiscNum(child.getDiscNum());

         bomComp.setSharpenerNo(child.getSharpenerNo());
         bomComp.setCaveNum(child.getCaveNum());
         bomComp.setGramWeight(child.getGramWeight());
         bomComp.setGateGramWeight(child.getGateGramWeight());
         bomComp.setMoldingCycle(child.getMoldingCycle());
         bomComp.setMachine(child.getMachine());
         bomComp.setScale(child.getScale());
         bomComp.setDryingTime(child.getDryingTime());
         bomComp.setDryingTemperature(child.getDryingTemperature());
         bomComp.setPackingInfo(child.getPackingInfo());

         bomComponentMapper.insert(bomComp);
         saveChildren(child.getChildren(), bomComp.getId(), bom, child.getPartId());
      }
@@ -496,6 +520,18 @@
      child.setStructureId(structure.getId());
      child.setPartId(component.getPartId());
      child.setColor(component.getColor());

      child.setSharpenerNo(component.getSharpenerNo());
      child.setCaveNum(component.getCaveNum());
      child.setGramWeight(component.getGramWeight());
      child.setGateGramWeight(component.getGateGramWeight());
      child.setMoldingCycle(component.getMoldingCycle());
      child.setMachine(component.getMachine());
      child.setScale(component.getScale());
      child.setDryingTime(component.getDryingTime());
      child.setDryingTemperature(component.getDryingTemperature());
      child.setPackingInfo(component.getPackingInfo());

      child.setPartNo(part.getPartNo());
      child.setPartName(part.getPartName());
      child.setExpand(true);
@@ -531,6 +567,18 @@
      List<Structure> structures = getRootNodes(partId, version, alternativeNo, bomType);
      if (CollectionUtil.isNotEmpty(structures)) {
         for (Structure structure : structures) {

            parent.setSharpenerNo(structure.getSharpenerNo());
            parent.setCaveNum(structure.getCaveNum());
            parent.setGramWeight(structure.getGramWeight());
            parent.setGateGramWeight(structure.getGateGramWeight());
            parent.setMoldingCycle(structure.getMoldingCycle());
            parent.setMachine(structure.getMachine());
            parent.setScale(structure.getScale());
            parent.setDryingTime(structure.getDryingTime());
            parent.setDryingTemperature(structure.getDryingTemperature());
            parent.setPackingInfo(structure.getPackingInfo());

            // 查询BOM子节点
            List<StructureComponent> components = structureComponentMapper.selectList(Wrappers.<StructureComponent>lambdaQuery().
                  eq(StructureComponent::getStructureId, structure.getId())