Merge remote-tracking branch 'origin/main'

This commit is contained in:
zhy 2025-06-25 04:18:32 +08:00
commit 8f323c5038

View File

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