Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2025-07-04 8aef97f783e250740a4d7c5bdb2e2692eb2625f9

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -326,9 +326,9 @@
                    String processName = flowCardMapper.getProcessName(processSub);
                    if (processName.equals("stepC") || processName.equals("stepD")) {//工艺是否包含夹胶中空
                        itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
                                String.valueOf(compound != null
                                        ? compound //同架层
                                        : flowCard.getTechnologyNumber()),//正常层
                                String.valueOf("null".equals(compound)
                                        ? flowCard.getTechnologyNumber()//正常层
                                        : compound ),//同架层
                                flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));

                        if (compound == null
@@ -353,9 +353,9 @@
                            itemmap.put("detailList", detailList);
                        } else {
                            itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
                                    String.valueOf(flashback != null
                                            ? compound //同架层
                                            : flowCard.getTechnologyNumber()),//正常层
                                    String.valueOf("null".equals(compound)
                                            ? flowCard.getTechnologyNumber()//正常层
                                            : compound ),//同架层
                                    flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId()));
                            if (compound == null
                                    || "null".equals(compound)