Merge remote-tracking branch 'origin/main'

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java

@@ -309,10 +309,9 @@ public class ProcessBomServiceImpl implements ProcessBomService {
                 }
 
                 if (o.getSpec() == null || o.getSpec().trim().equals("") ){
-                    if (!o.getType().equals("1")){
+                    if (!type.equals("1")){
                         processBomDetailDO.setSpec("A");//规格
                     }
-
                 }else {
                     processBomDetailDO.setSpec(o.getSpec());
                 }