Merge remote-tracking branch 'origin/master'

cuijian

2025-06-16 ec1bf4658e36a17f971a54007920a44c5378b7dc

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java

@@ -164,8 +164,8 @@
        boolean b = super.updateById(productInfo);
        //同步修改结构树
        ProductMix productMix = productMixService.getById(Long.parseLong(id));
        productMix.setName(productInfo.getProductName());
        productMix.setCode(productInfo.getProductNo());
        productMix.setTreeName(productInfo.getProductName());
        productMix.setTreeCode(productInfo.getProductNo());
        productMixService.updateById(productMix);
        if (!b)
            return false;
@@ -422,6 +422,7 @@
     * @param paramId      产品树节点id
     * @param relativeFlag 1 是 2 否
     * @param userIds      添加用户ids
     * todo优化结构，采用mix表进行父子递归查询，分类进行权限分配（单表查询）
     * @return
     */
    @Override
@@ -457,6 +458,7 @@
     * @param paramId       产品树节点id
     * @param relativeFlag  1 是 2 否
     * @param departmentIds 添加部门ids
     * todo优化结构，采用mix表进行父子递归查询，分类进行权限分配（单表查询）
     * @return
     */
    @Override
@@ -492,6 +494,7 @@
     * @param paramId      产品树节点id
     * @param relativeFlag 1 是 2 否
     * @param userIds      移除用户ids
     * todo优化结构，采用mix表进行父子递归查询，分类进行权限分配（单表查询）
     * @return
     */
    @Override
@@ -526,6 +529,7 @@
     * @param paramId       产品树节点id
     * @param relativeFlag  1 是 2 否
     * @param departmentIds 移除部门ids
     * todo优化结构，采用mix表进行父子递归查询，分类进行权限分配（单表查询）
     * @return
     */
    @Override
@@ -1179,31 +1183,37 @@
                        ProductInfo productInfo=this.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(productInfo.getProductName());
                        docInfo.setNodeCode(productInfo.getProductNo());
                        docInfo.setNodeId(productInfo.getProductId());
                        break;
                    case 2:
                        ComponentInfo componentInfo=componentInfoService.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(componentInfo.getComponentName());
                        docInfo.setNodeCode(componentInfo.getComponentCode());
                        docInfo.setNodeId(componentInfo.getComponentId());
                        break;
                    case 3:
                        PartsInfo partsInfo=partsInfoService.getById(docInfo.getAttributionId());
                        docInfo.setNodeCode(partsInfo.getPartsCode());
                        docInfo.setNodeName(partsInfo.getPartsName());
                        docInfo.setNodeId(partsInfo.getPartsId());
                        break;
                    case 4:
                        ProcessSpecVersion processSpecVersion=processSpecVersionService.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(processSpecVersion.getProcessSpecVersionName());
                        docInfo.setNodeCode(processSpecVersion.getProcessSpecVersionCode());
                        docInfo.setNodeId(processSpecVersion.getId());
                        break;
                    case 5:
                        ProcessStream processStream=processStreamService.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(processStream.getProcessName());
                        docInfo.setNodeCode(processStream.getProcessCode());
                        docInfo.setNodeId(processStream.getProcessId());
                        break;
                    case 6:
                        WorkStep workStep=workStepService.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(workStep.getStepName());
                        docInfo.setNodeCode(workStep.getStepName());
                        docInfo.setNodeId(workStep.getId());
                        break;
                }
            });
@@ -1225,11 +1235,13 @@
                    ProcessStream processStream=processStreamService.getById(deviceType.getAttributionId());
                    docInfo.setNodeName(processStream.getProcessName());
                    docInfo.setNodeCode(processStream.getProcessCode());
                    docInfo.setNodeId(processStream.getProcessId());
                }else {
                    //工步下的设备类
                    WorkStep workStep=workStepService.getById(deviceType.getAttributionId());
                    docInfo.setNodeName(workStep.getStepName());
                    docInfo.setNodeCode(workStep.getStepName());
                    docInfo.setNodeId(workStep.getId());
                }
            });
        }