Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

cnf

2025-05-09 af3455bc13c0ed48f4e3fa1b1614f601df24f12c

 StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs

@@ -36,7 +36,6 @@
                        return 1;
                    break;
                case "2":
                case "4":
                    if (InsertOrUpdateDepartment(db, entity)) // 插入或更新部门
                        return 1;
                    break;
@@ -148,7 +147,8 @@
            ParentId = Convert.ToDecimal(department.FParentID),
            FDOCUMENTSTATUS = department.FDocumentStatus,
            Company = "1000",
            Factory = "1000"
            Factory = "1000",
            Type=department.Type,
        };
    }

@@ -192,7 +192,6 @@
                            throw new NotImplementedException("删除失败");
                        break;
                    case "2":
                    case "4":
                        if (!InsertOrUpdateDepartmentBatch(db,
                                departmentGroup.Value)) // 批量插入或更新部门
                            throw new NotImplementedException("同步失败");